Commit 0f5ca030 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish "Add Java 14 CI"

See gh-20413
parent 961611aa
...@@ -42,7 +42,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio ...@@ -42,7 +42,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
private static final List<String> GRADLE_VERSIONS; private static final List<String> GRADLE_VERSIONS;
static { 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"); GRADLE_VERSIONS = Arrays.asList("6.0.1", "6.1.1", "6.2.2", "default");
} }
else { else {
......
...@@ -40,6 +40,7 @@ class SpringBootPluginIntegrationTests { ...@@ -40,6 +40,7 @@ class SpringBootPluginIntegrationTests {
final GradleBuild gradleBuild = new GradleBuild(); final GradleBuild gradleBuild = new GradleBuild();
@DisabledForJreRange(min = JRE.JAVA_14)
@Test @Test
void failFastWithVersionOfGradleLowerThanRequired() { void failFastWithVersionOfGradleLowerThanRequired() {
BuildResult result = this.gradleBuild.gradleVersion("5.5.1").buildAndFail(); BuildResult result = this.gradleBuild.gradleVersion("5.5.1").buildAndFail();
......
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