From 6179b997103080ef80c77c6bde01722570509c63 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Fri, 14 May 2021 16:01:03 +0200 Subject: [PATCH] Remove add-opens workaround in ToolchainPlugin See gh-26465 --- .../boot/build/toolchain/ToolchainPlugin.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java index ea2b29f41d..1e8010a9f5 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java @@ -16,7 +16,6 @@ package org.springframework.boot.build.toolchain; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -58,8 +57,7 @@ public class ToolchainPlugin implements Plugin { JavaToolchainSpec toolchainSpec = project.getExtensions().getByType(JavaPluginExtension.class) .getToolchain(); toolchainSpec.getLanguageVersion().set(toolchain.getJavaVersion()); - configureJavaCompileToolchain(project, toolchain); - configureTestToolchain(project, toolchain); + configureTestToolchain(project); } } @@ -75,16 +73,7 @@ public class ToolchainPlugin implements Plugin { project.getTasks().withType(GradleBuild.class, (task) -> task.setEnabled(false)); } - private void configureJavaCompileToolchain(Project project, ToolchainExtension toolchain) { - project.getTasks().withType(JavaCompile.class, (compile) -> { - compile.getOptions().setFork(true); - // See https://github.com/gradle/gradle/issues/15538 - List 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, ToolchainExtension toolchain) { + private void configureTestToolchain(Project project) { project.getTasks().withType(Test.class, (test) -> { List arguments = Collections.singletonList("--illegal-access=warn"); test.jvmArgs(arguments);