From 0f5ca030db91de5e13ea69290accbf86f4465641 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 18 Mar 2020 15:09:14 +0100 Subject: [PATCH] Polish "Add Java 14 CI" See gh-20413 --- .../boot/gradle/junit/GradleCompatibilityExtension.java | 5 ++++- .../boot/gradle/plugin/SpringBootPluginIntegrationTests.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java index 6133378ea7c..bf7f115b670 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java @@ -42,7 +42,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio private static final List GRADLE_VERSIONS; static { - if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) { + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_14)) { + GRADLE_VERSIONS = Arrays.asList("default"); + } + else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) { GRADLE_VERSIONS = Arrays.asList("6.0.1", "6.1.1", "6.2.2", "default"); } else { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java index 056a84b157b..4954d98e289 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java @@ -40,6 +40,7 @@ class SpringBootPluginIntegrationTests { final GradleBuild gradleBuild = new GradleBuild(); + @DisabledForJreRange(min = JRE.JAVA_14) @Test void failFastWithVersionOfGradleLowerThanRequired() { BuildResult result = this.gradleBuild.gradleVersion("5.5.1").buildAndFail();