Merge branch '2.5.x' into 2.6.x

wilkinsona · wilkinsona · commit 4606e1769671 · 2021-12-02T10:30:51.000Z
Closes gh-28891
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -34,12 +34,12 @@ private GradleVersions() {
 
 	public static List<String> allCompatible() {
 		if (isJava17()) {
-			return Arrays.asList("7.2", "7.3");
+			return Arrays.asList("7.2", "7.3.1");
 		}
 		if (isJava16()) {
-			return Arrays.asList("7.0.2", "7.1", "7.2", "7.3");
+			return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.1");
 		}
-		return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3");
+		return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.1");
 	}
 
 	public static String currentOrMinimumCompatible() {

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ private GradleVersions() {`
`34`	`34`
`35`	`35`	`public static List<String> allCompatible() {`
`36`	`36`	`if (isJava17()) {`
`37`		`- return Arrays.asList("7.2", "7.3");`
	`37`	`+ return Arrays.asList("7.2", "7.3.1");`
`38`	`38`	`}`
`39`	`39`	`if (isJava16()) {`
`40`		`- return Arrays.asList("7.0.2", "7.1", "7.2", "7.3");`
	`40`	`+ return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.1");`
`41`	`41`	`}`
`42`		`- return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3");`
	`42`	`+ return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.1");`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public static String currentOrMinimumCompatible() {`