root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x 

Closes gh-39513
This commit is contained in:
Scott Frederick 2024-02-11 14:32:35 -06:00
parent 2ef6b42432 7b5725ffaa
commit eb75bb1339
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,8 @@ public class SpringBootPlugin implements Plugin<Project> {
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);
}
}

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

@ -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");
}
}