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.5.x'

Browse Source 
Closes gh-27307
This commit is contained in:
Andy Wilkinson 2021-07-13 15:56:32 +01:00
commit 9ccd6a6f2f
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainExtension.java
View File

@ -17,6 +17,7 @@
package org.springframework.boot.build.toolchain;
import org.gradle.api.Project;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.provider.Property;
import org.gradle.jvm.toolchain.JavaLanguageVersion;
@ -29,10 +30,13 @@ public class ToolchainExtension {
private final Property<JavaLanguageVersion> maximumCompatibleJavaVersion;
private final ListProperty<String> testJvmArgs;
private final JavaLanguageVersion javaVersion;
public ToolchainExtension(Project project) {
this.maximumCompatibleJavaVersion = project.getObjects().property(JavaLanguageVersion.class);
this.testJvmArgs = project.getObjects().listProperty(String.class);
String toolchainVersion = (String) project.findProperty("toolchainVersion");
this.javaVersion = (toolchainVersion != null) ? JavaLanguageVersion.of(toolchainVersion) : null;
}
@ -41,6 +45,10 @@ public class ToolchainExtension {
return this.maximumCompatibleJavaVersion;
}
public ListProperty<String> getTestJvmArgs() {
return this.testJvmArgs;
}
JavaLanguageVersion getJavaVersion() {
return this.javaVersion;
}

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

@ -17,7 +17,6 @@
package org.springframework.boot.build.toolchain;
import java.util.Collections;
import java.util.List;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
@ -56,7 +55,7 @@ public class ToolchainPlugin implements Plugin<Project> {
JavaToolchainSpec toolchainSpec = project.getExtensions().getByType(JavaPluginExtension.class)
.getToolchain();
toolchainSpec.getLanguageVersion().set(toolchain.getJavaVersion());
configureTestToolchain(project);
configureTestToolchain(project, toolchain);
}
}
@ -71,11 +70,9 @@ public class ToolchainPlugin implements Plugin<Project> {
project.getTasks().withType(Test.class, (task) -> task.setEnabled(false));
}
private void configureTestToolchain(Project project) {
project.getTasks().withType(Test.class, (test) -> {
List<String> arguments = Collections.singletonList("--illegal-access=warn");
test.jvmArgs(arguments);
});
private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
project.getTasks().withType(Test.class,
(test) -> test.jvmArgs(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList())));
}
}

4
spring-boot-project/spring-boot/build.gradle
View File

@ -150,3 +150,7 @@ compileTestKotlin {
compileJava {
doLast new org.springframework.boot.build.log4j2.ReproducibleLog4j2PluginsDatAction()
}
toolchain {
testJvmArgs.add("--add-opens=java.base/java.net=ALL-UNNAMED")
}