Browse Source

Include 6.9.x in version requirements message

Fixes gh-26952
pull/27157/head
Andy Wilkinson 5 years ago
parent
commit
07e7398d10
  1. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java

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

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

@ -41,8 +41,8 @@ class SpringBootPluginIntegrationTests { @@ -41,8 +41,8 @@ class SpringBootPluginIntegrationTests {
@Test
void failFastWithVersionOfGradle6LowerThanRequired() {
BuildResult result = this.gradleBuild.gradleVersion("6.7.1").buildAndFail();
assertThat(result.getOutput())
.contains("Spring Boot plugin requires Gradle 6.8.x or 7.x. The current version is Gradle 6.7.1");
assertThat(result.getOutput()).contains(
"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)

Loading…
Cancel
Save