From 9a6c1c531d77a32f1d2cdbf668f0d3d4c781b915 Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 24 Dec 2021 00:33:15 +0900 Subject: [PATCH] Test our Gradle plugin against Gradle 7.3.3 See gh-29161 --- .../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 c938d7db9b9..c68eb732a7e 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.2"); + GRADLE_VERSIONS = Arrays.asList("7.2", "7.3.3"); } else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { - GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3.2"); + GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3.3"); } else { - GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3.2"); + GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3.3"); } } 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 18e0f6d99b7..22b6715aab7 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.2"); + gradleBuild.gradleVersion("7.3.3"); } else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { gradleBuild.gradleVersion("7.0.2");