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 '2.5.x' into 2.6.x 

Closes gh-30141
This commit is contained in:
Andy Wilkinson 2022-03-09 18:39:32 +00:00
parent a31135ebfc 5264fb3d1e
commit 382c6972ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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,15 +34,15 @@ 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"); return Arrays.asList("7.3.3", "7.4.1");
} }
if (isJava17()) { if (isJava17()) {
return Arrays.asList("7.2", "7.3.3", "7.4"); return Arrays.asList("7.2", "7.3.3", "7.4.1");
} }
if (isJava16()) { if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4"); return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4.1");
} }
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4"); return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.1");
} }
public static String currentOrMinimumCompatible() { public static String currentOrMinimumCompatible() {