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

Merge branch '2.5.x' 

Closes gh-27650
This commit is contained in:
Andy Wilkinson 2021-08-12 15:46:24 +01:00
parent 1f80ce47e3 119fb6948d
commit 1966d1650b
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

@ -35,17 +35,17 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJava17()) {
return Collections.singletonList("7.2-rc-2");
return Collections.singletonList("7.2-rc-3");
}
if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2-rc-2");
return Arrays.asList("7.0.2", "7.1", "7.2-rc-3");
}
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2-rc-2");
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2-rc-3");
}
public static String currentOrMinimumCompatible() {
if (isJava17()) {
return "7.2-rc-2";
return "7.2-rc-3";
}
if (isJava16()) {
return "7.0.2";