Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-26520
This commit is contained in:
Andy Wilkinson 2021-05-17 10:35:44 +01:00
commit f7d28567c0
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.build.toolchain;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -57,7 +56,6 @@ public class ToolchainPlugin implements Plugin<Project> {
JavaToolchainSpec toolchainSpec = project.getExtensions().getByType(JavaPluginExtension.class)
.getToolchain();
toolchainSpec.getLanguageVersion().set(toolchain.getJavaVersion());
configureJavaCompileToolchain(project);
configureTestToolchain(project);
}
}
@ -73,15 +71,6 @@ public class ToolchainPlugin implements Plugin<Project> {
project.getTasks().withType(Test.class, (task) -> task.setEnabled(false));
}
private void configureJavaCompileToolchain(Project project) {
project.getTasks().withType(JavaCompile.class, (compile) -> {
compile.getOptions().setFork(true);
// See https://github.com/gradle/gradle/issues/15538
List<String> forkArgs = Arrays.asList("--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED");
compile.getOptions().getForkOptions().getJvmArgs().addAll(forkArgs);
});
}
private void configureTestToolchain(Project project) {
project.getTasks().withType(Test.class, (test) -> {
List<String> arguments = Collections.singletonList("--illegal-access=warn");