mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.4.x'
See gh-26261
This commit is contained in:
commit
1be8c8fda9
@ -21,6 +21,7 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@ -154,14 +155,13 @@ class JavaConventions {
|
||||
project.getTasks().withType(Test.class, (test) -> {
|
||||
test.useJUnitPlatform();
|
||||
test.setMaxHeapSize("1024M");
|
||||
CopyJdk8156584SecurityProperties copyJdk8156584SecurityProperties = new CopyJdk8156584SecurityProperties(
|
||||
project);
|
||||
if (buildingWithJava8(project)) {
|
||||
CopyJdk8156584SecurityProperties copyJdk8156584SecurityProperties = new CopyJdk8156584SecurityProperties(
|
||||
project);
|
||||
test.systemProperty("java.security.properties",
|
||||
"file:" + test.getWorkingDir().toPath().relativize(copyJdk8156584SecurityProperties.output));
|
||||
test.setDebug(true);
|
||||
test.doFirst(copyJdk8156584SecurityProperties);
|
||||
}
|
||||
test.doFirst(copyJdk8156584SecurityProperties);
|
||||
});
|
||||
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
|
||||
.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
|
||||
@ -251,7 +251,7 @@ class JavaConventions {
|
||||
public void execute(Task task) {
|
||||
try (InputStream input = getClass().getClassLoader()
|
||||
.getResourceAsStream(CopyJdk8156584SecurityProperties.SECURITY_PROPERTIES_FILE_NAME)) {
|
||||
Files.copy(input, this.output);
|
||||
Files.copy(input, this.output, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
catch (IOException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
|
Loading…
Reference in New Issue
Block a user