From 7e90b4951b411c92f4731345e4b92c7aec3d7514 Mon Sep 17 00:00:00 2001 From: Jakob Wanger Date: Sat, 10 Feb 2024 15:20:56 -0500 Subject: [PATCH] Enforce Gradle version to be at least of version 7.5 See gh-39508 Signed-off-by: Jakob Wanger --- .../springframework/boot/gradle/plugin/SpringBootPlugin.java | 4 ++-- .../boot/gradle/plugin/SpringBootPluginIntegrationTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java index 3e78fb3cee..0ff7ca3ac8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java @@ -117,8 +117,8 @@ public class SpringBootPlugin implements Plugin { private void verifyGradleVersion() { GradleVersion currentVersion = GradleVersion.current(); - if (currentVersion.compareTo(GradleVersion.version("7.4")) < 0) { - throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.4 or later). " + if (currentVersion.compareTo(GradleVersion.version("7.5")) < 0) { + throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.5 or later). " + "The current version is " + currentVersion); } } 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 0776f94cc5..59c7cd1b05 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,9 +40,9 @@ class SpringBootPluginIntegrationTests { @Test @DisabledForJreRange(min = JRE.JAVA_20) void failFastWithVersionOfGradle7LowerThanRequired() { - BuildResult result = this.gradleBuild.gradleVersion("7.3.3").buildAndFail(); + BuildResult result = this.gradleBuild.gradleVersion("7.4.1").buildAndFail(); assertThat(result.getOutput()) - .contains("Spring Boot plugin requires Gradle 7.x (7.4 or later). The current version is Gradle 7.3.3"); + .contains("Spring Boot plugin requires Gradle 7.x (7.5 or later). The current version is Gradle 7.4.1"); } }