mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-29172
This commit is contained in:
commit
8ee0640cc0
@ -34,17 +34,17 @@ public final class GradleVersions {
|
||||
|
||||
public static List<String> allCompatible() {
|
||||
if (isJava17()) {
|
||||
return Arrays.asList("7.2", "7.3.2");
|
||||
return Arrays.asList("7.2", "7.3.3");
|
||||
}
|
||||
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() {
|
||||
if (isJava17()) {
|
||||
return "7.3.2";
|
||||
return "7.3.3";
|
||||
}
|
||||
if (isJava16()) {
|
||||
return "7.0.2";
|
||||
|
Loading…
Reference in New Issue
Block a user