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

Merge branch '2.5.x'

Browse Source 
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
This commit is contained in:
Andy Wilkinson
2021-11-15 12:51:43 +00:00
parent b1ff60c728 0aae9c26da
commit 2d7e0314f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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,12 +35,12 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJava17()) {
return Collections.singletonList("7.2");
return Arrays.asList("7.2", "7.3");
}
if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2");
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3");
}
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2");
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3");
}
public static String currentOrMinimumCompatible() {