Commit 8ac64827 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #25523 from dreis2211

* pr/25523:
  Exclude GradleBuild tasks on JDK 16 for now

Closes gh-25523
parents ff5a6d9a 1a803448
...@@ -22,6 +22,7 @@ import java.util.List; ...@@ -22,6 +22,7 @@ import java.util.List;
import org.gradle.api.Plugin; import org.gradle.api.Plugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.GradleBuild;
import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.compile.JavaCompile;
import org.gradle.api.tasks.javadoc.Javadoc; import org.gradle.api.tasks.javadoc.Javadoc;
import org.gradle.api.tasks.testing.Test; import org.gradle.api.tasks.testing.Test;
...@@ -70,6 +71,7 @@ public class ToolchainPlugin implements Plugin<Project> { ...@@ -70,6 +71,7 @@ public class ToolchainPlugin implements Plugin<Project> {
project.getTasks().withType(JavaCompile.class, (task) -> task.setEnabled(false)); project.getTasks().withType(JavaCompile.class, (task) -> task.setEnabled(false));
project.getTasks().withType(Javadoc.class, (task) -> task.setEnabled(false)); project.getTasks().withType(Javadoc.class, (task) -> task.setEnabled(false));
project.getTasks().withType(Test.class, (task) -> task.setEnabled(false)); project.getTasks().withType(Test.class, (task) -> task.setEnabled(false));
project.getTasks().withType(GradleBuild.class, (task) -> task.setEnabled(false));
} }
private void configureJavaCompileToolchain(Project project, ToolchainExtension toolchain) { private void configureJavaCompileToolchain(Project project, ToolchainExtension toolchain) {
......
...@@ -6,6 +6,10 @@ plugins { ...@@ -6,6 +6,10 @@ plugins {
description = "Spring Boot Launch Script Integration Tests" description = "Spring Boot Launch Script Integration Tests"
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
}
configurations { configurations {
app app
} }
......
...@@ -6,6 +6,10 @@ plugins { ...@@ -6,6 +6,10 @@ plugins {
description = "Spring Boot Loader Integration Tests" description = "Spring Boot Loader Integration Tests"
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
}
configurations { configurations {
app app
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment