|
16 | 16 |
|
17 | 17 | package org.springframework.boot.build; |
18 | 18 |
|
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; |
25 | 19 | import java.util.Arrays; |
26 | 20 | import java.util.Collections; |
27 | 21 | import java.util.List; |
|
33 | 27 | import io.spring.javaformat.gradle.CheckTask; |
34 | 28 | import io.spring.javaformat.gradle.FormatTask; |
35 | 29 | import io.spring.javaformat.gradle.SpringJavaFormatPlugin; |
36 | | -import org.gradle.api.Action; |
37 | 30 | import org.gradle.api.JavaVersion; |
38 | 31 | import org.gradle.api.Project; |
39 | | -import org.gradle.api.Task; |
40 | 32 | import org.gradle.api.artifacts.Configuration; |
41 | 33 | import org.gradle.api.artifacts.ConfigurationContainer; |
42 | 34 | import org.gradle.api.artifacts.Dependency; |
@@ -164,13 +156,6 @@ private void configureTestConventions(Project project) { |
164 | 156 | project.getTasks().withType(Test.class, (test) -> { |
165 | 157 | test.useJUnitPlatform(); |
166 | 158 | 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 | | - } |
174 | 159 | project.getTasks().withType(Checkstyle.class, (checkstyle) -> test.mustRunAfter(checkstyle)); |
175 | 160 | project.getTasks().withType(CheckTask.class, (checkFormat) -> test.mustRunAfter(checkFormat)); |
176 | 161 | }); |
@@ -254,27 +239,4 @@ private void configureToolchain(Project project) { |
254 | 239 | project.getPlugins().apply(ToolchainPlugin.class); |
255 | 240 | } |
256 | 241 |
|
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 | | - |
280 | 242 | } |
0 commit comments