mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.3.x' into 2.4.x
Closes gh-26260
This commit is contained in:
commit
79d27344e0
@ -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"));
|
||||
}
|
||||
|
@ -0,0 +1 @@
|
||||
keystore.pkcs12.keyProtectionAlgorithm=PBEWithHmacSHA256AndAES_256
|
Loading…
Reference in New Issue
Block a user