Skip to content

Commit 32c184e

Browse files
committed
Revert changes made to work around JDK-8156584
Closes spring-projectsgh-26848
1 parent 253e4b2 commit 32c184e

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616

1717
package org.springframework.boot.build;
1818

19-
import java.io.File;
20-
import java.io.IOException;
21-
import java.io.InputStream;
22-
import java.nio.file.Files;
23-
import java.nio.file.Path;
24-
import java.nio.file.StandardCopyOption;
2519
import java.util.Arrays;
2620
import java.util.Collections;
2721
import java.util.List;
@@ -33,10 +27,8 @@
3327
import io.spring.javaformat.gradle.CheckTask;
3428
import io.spring.javaformat.gradle.FormatTask;
3529
import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
36-
import org.gradle.api.Action;
3730
import org.gradle.api.JavaVersion;
3831
import org.gradle.api.Project;
39-
import org.gradle.api.Task;
4032
import org.gradle.api.artifacts.Configuration;
4133
import org.gradle.api.artifacts.ConfigurationContainer;
4234
import org.gradle.api.artifacts.Dependency;
@@ -164,13 +156,6 @@ private void configureTestConventions(Project project) {
164156
project.getTasks().withType(Test.class, (test) -> {
165157
test.useJUnitPlatform();
166158
test.setMaxHeapSize("1024M");
167-
if (buildingWithJava8(project)) {
168-
CopyJdk8156584SecurityProperties copyJdk8156584SecurityProperties = new CopyJdk8156584SecurityProperties(
169-
project);
170-
test.systemProperty("java.security.properties",
171-
"file:" + test.getWorkingDir().toPath().relativize(copyJdk8156584SecurityProperties.output));
172-
test.doFirst(copyJdk8156584SecurityProperties);
173-
}
174159
project.getTasks().withType(Checkstyle.class, (checkstyle) -> test.mustRunAfter(checkstyle));
175160
project.getTasks().withType(CheckTask.class, (checkFormat) -> test.mustRunAfter(checkFormat));
176161
});
@@ -254,27 +239,4 @@ private void configureToolchain(Project project) {
254239
project.getPlugins().apply(ToolchainPlugin.class);
255240
}
256241

257-
private static final class CopyJdk8156584SecurityProperties implements Action<Task> {
258-
259-
private static final String SECURITY_PROPERTIES_FILE_NAME = "jdk-8156584-security.properties";
260-
261-
private final Path output;
262-
263-
private CopyJdk8156584SecurityProperties(Project project) {
264-
this.output = new File(project.getBuildDir(), SECURITY_PROPERTIES_FILE_NAME).toPath();
265-
}
266-
267-
@Override
268-
public void execute(Task task) {
269-
try (InputStream input = getClass().getClassLoader()
270-
.getResourceAsStream(CopyJdk8156584SecurityProperties.SECURITY_PROPERTIES_FILE_NAME)) {
271-
Files.copy(input, this.output, StandardCopyOption.REPLACE_EXISTING);
272-
}
273-
catch (IOException ex) {
274-
throw new RuntimeException(ex);
275-
}
276-
}
277-
278-
}
279-
280242
}

buildSrc/src/main/resources/jdk-8156584-security.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)