-
Notifications
You must be signed in to change notification settings - Fork 40.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25171 from dreis2211
* gh-25171: Polish "Allow the project to be built with Java 16" Allow the project to be built with Java 16 Closes gh-25171
- Loading branch information
Showing
9 changed files
with
166 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* Copyright 2012-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.build.toolchain; | ||
|
||
import org.gradle.api.Project; | ||
import org.gradle.api.provider.Property; | ||
import org.gradle.jvm.toolchain.JavaLanguageVersion; | ||
|
||
/** | ||
* DSL extension for {@link ToolchainPlugin}. | ||
* | ||
* @author Christoph Dreis | ||
*/ | ||
public class ToolchainExtension { | ||
|
||
private final Property<JavaLanguageVersion> maximumCompatibleJavaVersion; | ||
|
||
private final JavaLanguageVersion javaVersion; | ||
|
||
public ToolchainExtension(Project project) { | ||
this.maximumCompatibleJavaVersion = project.getObjects().property(JavaLanguageVersion.class); | ||
String toolchainVersion = (String) project.findProperty("toolchainVersion"); | ||
this.javaVersion = (toolchainVersion != null) ? JavaLanguageVersion.of(toolchainVersion) : null; | ||
} | ||
|
||
public Property<JavaLanguageVersion> getMaximumCompatibleJavaVersion() { | ||
return this.maximumCompatibleJavaVersion; | ||
} | ||
|
||
JavaLanguageVersion getJavaVersion() { | ||
return this.javaVersion; | ||
} | ||
|
||
} |
93 changes: 93 additions & 0 deletions
93
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
/* | ||
* Copyright 2012-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.build.toolchain; | ||
|
||
import java.util.Arrays; | ||
import java.util.List; | ||
|
||
import org.gradle.api.Plugin; | ||
import org.gradle.api.Project; | ||
import org.gradle.api.plugins.JavaPluginExtension; | ||
import org.gradle.api.tasks.compile.JavaCompile; | ||
import org.gradle.api.tasks.javadoc.Javadoc; | ||
import org.gradle.api.tasks.testing.Test; | ||
import org.gradle.jvm.toolchain.JavaLanguageVersion; | ||
import org.gradle.jvm.toolchain.JavaToolchainSpec; | ||
|
||
/** | ||
* {@link Plugin} for customizing Gradle's toolchain support. | ||
* | ||
* @author Christoph Dreis | ||
*/ | ||
public class ToolchainPlugin implements Plugin<Project> { | ||
|
||
@Override | ||
public void apply(Project project) { | ||
configureToolchain(project); | ||
} | ||
|
||
private void configureToolchain(Project project) { | ||
ToolchainExtension toolchain = project.getExtensions().create("toolchain", ToolchainExtension.class, project); | ||
JavaLanguageVersion toolchainVersion = toolchain.getJavaVersion(); | ||
if (toolchainVersion != null) { | ||
project.afterEvaluate((evaluated) -> configure(evaluated, toolchain)); | ||
} | ||
} | ||
|
||
private void configure(Project project, ToolchainExtension toolchain) { | ||
if (!isJavaVersionSupported(toolchain, toolchain.getJavaVersion())) { | ||
disableToolchainTasks(project); | ||
} | ||
else { | ||
JavaToolchainSpec toolchainSpec = project.getExtensions().getByType(JavaPluginExtension.class) | ||
.getToolchain(); | ||
toolchainSpec.getLanguageVersion().set(toolchain.getJavaVersion()); | ||
configureJavaCompileToolchain(project, toolchain); | ||
configureTestToolchain(project, toolchain); | ||
} | ||
} | ||
|
||
public boolean isJavaVersionSupported(ToolchainExtension toolchain, JavaLanguageVersion toolchainVersion) { | ||
return toolchain.getMaximumCompatibleJavaVersion().map((version) -> version.canCompileOrRun(toolchainVersion)) | ||
.getOrElse(true); | ||
} | ||
|
||
private void disableToolchainTasks(Project project) { | ||
project.getTasks().withType(JavaCompile.class, (task) -> task.setEnabled(false)); | ||
project.getTasks().withType(Javadoc.class, (task) -> task.setEnabled(false)); | ||
project.getTasks().withType(Test.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<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, ToolchainExtension toolchain) { | ||
project.getTasks().withType(Test.class, (test) -> { | ||
// See https://github.com/spring-projects/spring-ldap/issues/570 | ||
List<String> arguments = Arrays.asList("--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED", | ||
"--illegal-access=warn"); | ||
test.jvmArgs(arguments); | ||
}); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...t/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonbTesterTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters