Skip to content

Commit 0f5ca03

Browse files
committed
Polish "Add Java 14 CI"
See gh-20413
1 parent 961611a commit 0f5ca03

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
4242
private static final List<String> GRADLE_VERSIONS;
4343

4444
static {
45-
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
45+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_14)) {
46+
GRADLE_VERSIONS = Arrays.asList("default");
47+
}
48+
else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
4649
GRADLE_VERSIONS = Arrays.asList("6.0.1", "6.1.1", "6.2.2", "default");
4750
}
4851
else {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class SpringBootPluginIntegrationTests {
4040

4141
final GradleBuild gradleBuild = new GradleBuild();
4242

43+
@DisabledForJreRange(min = JRE.JAVA_14)
4344
@Test
4445
void failFastWithVersionOfGradleLowerThanRequired() {
4546
BuildResult result = this.gradleBuild.gradleVersion("5.5.1").buildAndFail();

0 commit comments

Comments
 (0)