Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x

Browse Source 
Closes gh-29172
This commit is contained in:
Stephane Nicoll
2021-12-25 09:55:24 +01:00
parent b141827641 ff40f9f539
commit 8ee0640cc0
1 changed files with 4 additions and 4 deletions
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,17 +34,17 @@ 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.2"); return Arrays.asList("7.2", "7.3.3");
} }
if (isJava16()) { if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.2"); return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3");
} }
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.2"); return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3");
} }
public static String currentOrMinimumCompatible() { public static String currentOrMinimumCompatible() {
if (isJava17()) { if (isJava17()) {
return "7.3.2"; return "7.3.3";
} }
if (isJava16()) { if (isJava16()) {
return "7.0.2"; return "7.0.2";