From af60a8a7cfd18882e675be2bca8a64ef4db130e9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 2 Dec 2021 10:29:22 +0000 Subject: [PATCH] Test our Gradle plugin against Gradle 7.3.1 Closes gh-28890 --- .../boot/gradle/junit/GradleCompatibilityExtension.java | 6 +++--- .../boot/gradle/junit/GradleMultiDslExtension.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1fd65a3d5a..3831476e89 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 @@ -48,13 +48,13 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex static { JavaVersion javaVersion = JavaVersion.current(); if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) { - GRADLE_VERSIONS = Arrays.asList("7.2", "7.3"); + GRADLE_VERSIONS = Arrays.asList("7.2", "7.3.1"); } else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { - GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3"); + GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3.1"); } else { - GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3"); + GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3.1"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java index e72ad8a832..4723993081 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java @@ -63,7 +63,7 @@ public class GradleMultiDslExtension implements TestTemplateInvocationContextPro GradleBuild gradleBuild = new GradleBuild(this.dsl); JavaVersion javaVersion = JavaVersion.current(); if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) { - gradleBuild.gradleVersion("7.3"); + gradleBuild.gradleVersion("7.3.1"); } else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { gradleBuild.gradleVersion("7.0.2");