mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-30137
This commit is contained in:
commit
a31135ebfc
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -74,7 +74,6 @@ public class ToolchainPlugin implements Plugin<Project> {
|
|||||||
|
|
||||||
private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
|
private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
|
||||||
List<String> jvmArgs = new ArrayList<>();
|
List<String> jvmArgs = new ArrayList<>();
|
||||||
jvmArgs.add("--illegal-access=warn");
|
|
||||||
jvmArgs.addAll(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList()));
|
jvmArgs.addAll(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList()));
|
||||||
project.getTasks().withType(Test.class, (test) -> test.jvmArgs(jvmArgs));
|
project.getTasks().withType(Test.class, (test) -> test.jvmArgs(jvmArgs));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user