root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-26260
This commit is contained in:
Andy Wilkinson 2021-04-27 17:32:49 +01:00
parent a1138efc5f 912c82e50d
commit 79d27344e0
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View File

@ -147,6 +147,10 @@ class JavaConventions {
project.getTasks().withType(Test.class, (test) -> {
test.useJUnitPlatform();
test.setMaxHeapSize("1024M");
if (buildingWithJava8(project)) {
test.systemProperty("java.security.properties",
getClass().getClassLoader().getResource("jdk-8156584-security.properties"));
}
});
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
@ -159,6 +163,10 @@ class JavaConventions {
}));
}
private boolean buildingWithJava8(Project project) {
return (!project.hasProperty("buildJavaHome")) && JavaVersion.current() == JavaVersion.VERSION_1_8;
}
private boolean isCi() {
return Boolean.parseBoolean(System.getenv("CI"));
}

1
buildSrc/src/main/resources/jdk-8156584-security.properties Normal file
View File

@ -0,0 +1 @@
keystore.pkcs12.keyProtectionAlgorithm=PBEWithHmacSHA256AndAES_256