Skip to content

Commit eb75bb1

Browse files
Merge branch '3.1.x' into 3.2.x
Closes gh-39513
2 parents 2ef6b42 + 7b5725f commit eb75bb1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ public void apply(Project project) {
123123

124124
private void verifyGradleVersion() {
125125
GradleVersion currentVersion = GradleVersion.current();
126-
if (currentVersion.compareTo(GradleVersion.version("7.4")) < 0) {
127-
throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.4 or later). "
126+
if (currentVersion.compareTo(GradleVersion.version("7.5")) < 0) {
127+
throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.5 or later). "
128128
+ "The current version is " + currentVersion);
129129
}
130130
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class SpringBootPluginIntegrationTests {
4040
@Test
4141
@DisabledForJreRange(min = JRE.JAVA_20)
4242
void failFastWithVersionOfGradle7LowerThanRequired() {
43-
BuildResult result = this.gradleBuild.gradleVersion("7.3.3").buildAndFail();
43+
BuildResult result = this.gradleBuild.gradleVersion("7.4.1").buildAndFail();
4444
assertThat(result.getOutput())
45-
.contains("Spring Boot plugin requires Gradle 7.x (7.4 or later). The current version is Gradle 7.3.3");
45+
.contains("Spring Boot plugin requires Gradle 7.x (7.5 or later). The current version is Gradle 7.4.1");
4646
}
4747

4848
}

0 commit comments

Comments
 (0)