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

Include 6.9.x in version requirements message 

Fixes gh-26952
This commit is contained in:
Andy Wilkinson 2021-06-21 17:52:03 +01:00
parent 6357e4fffa
commit 07e7398d10
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

@ -99,8 +99,8 @@ public class SpringBootPlugin implements Plugin<Project> {
private void verifyGradleVersion() { private void verifyGradleVersion() {
GradleVersion currentVersion = GradleVersion.current(); GradleVersion currentVersion = GradleVersion.current();
if (currentVersion.compareTo(GradleVersion.version("6.8")) < 0) { if (currentVersion.compareTo(GradleVersion.version("6.8")) < 0) {
throw new GradleException( throw new GradleException("Spring Boot plugin requires Gradle 6.8.x, 6.9.x, or 7.x. "
"Spring Boot plugin requires Gradle 6.8.x or 7.x. " + "The current version is " + currentVersion); + "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

@ -41,8 +41,8 @@ class SpringBootPluginIntegrationTests {
@Test @Test
void failFastWithVersionOfGradle6LowerThanRequired() { void failFastWithVersionOfGradle6LowerThanRequired() {
BuildResult result = this.gradleBuild.gradleVersion("6.7.1").buildAndFail(); BuildResult result = this.gradleBuild.gradleVersion("6.7.1").buildAndFail();
assertThat(result.getOutput()) assertThat(result.getOutput()).contains(
.contains("Spring Boot plugin requires Gradle 6.8.x or 7.x. The current version is Gradle 6.7.1"); "Spring Boot plugin requires Gradle 6.8.x, 6.9.x, or 7.x. The current version is Gradle 6.7.1");
} }
@DisabledForJreRange(min = JRE.JAVA_16) @DisabledForJreRange(min = JRE.JAVA_16)