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

Merge branch '2.6.x' into 2.7.x 

Closes gh-33343
This commit is contained in:
Andy Wilkinson 2022-11-24 11:29:24 +00:00
parent 2778e3c6e2 ebfbf4a412
commit abcbac92ef
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,17 +34,16 @@ public final class GradleVersions {
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJava18()) { if (isJava18()) {
return Arrays.asList("7.3.3", "7.4.2", GradleVersion.current().getVersion(), "7.6-rc-3"); return Arrays.asList("7.3.3", "7.4.2", GradleVersion.current().getVersion());
} }
if (isJava17()) { if (isJava17()) {
return Arrays.asList("7.2", "7.3.3", "7.4.2", GradleVersion.current().getVersion(), "7.6-rc-3"); return Arrays.asList("7.2", "7.3.3", "7.4.2", GradleVersion.current().getVersion());
} }
if (isJava16()) { if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4.2", GradleVersion.current().getVersion(), return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4.2", GradleVersion.current().getVersion());
"7.6-rc-3");
} }
return Arrays.asList("6.8.3", "6.9.3", "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.2", return Arrays.asList("6.8.3", "6.9.3", "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.2",
GradleVersion.current().getVersion(), "7.6-rc-3"); GradleVersion.current().getVersion());
} }
public static String minimumCompatible() { public static String minimumCompatible() {