Browse Source

Merge branch '2.6.x' into 2.7.x

Closes gh-28892
pull/28907/head
Andy Wilkinson 4 years ago
parent
commit
a3ecdcf058
  1. 6
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

@ -34,12 +34,12 @@ public final class GradleVersions {
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJava17()) { if (isJava17()) {
return Arrays.asList("7.2", "7.3"); return Arrays.asList("7.2", "7.3.1");
} }
if (isJava16()) { if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3"); return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.1");
} }
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3"); return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.1");
} }
public static String currentOrMinimumCompatible() { public static String currentOrMinimumCompatible() {

Loading…
Cancel
Save