Browse Source

Exclude GradleBuild tasks on JDK 16 for now

See gh-25523
pull/25709/head
dreis2211 5 years ago committed by Stephane Nicoll
parent
commit
1a803448f0
  1. 2
      buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
  2. 4
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
  3. 4
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

2
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java

@ -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.Project;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.GradleBuild;
import org.gradle.api.tasks.compile.JavaCompile;
import org.gradle.api.tasks.javadoc.Javadoc;
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(Javadoc.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) {

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

@ -6,6 +6,10 @@ plugins { @@ -6,6 +6,10 @@ plugins {
description = "Spring Boot Launch Script Integration Tests"
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
}
configurations {
app
}

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

@ -6,6 +6,10 @@ plugins { @@ -6,6 +6,10 @@ plugins {
description = "Spring Boot Loader Integration Tests"
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
}
configurations {
app
}

Loading…
Cancel
Save