Merge branch '3.2.x' into 3.3.x

wilkinsona · wilkinsona · commit 8617c981cfcb · 2024-07-12T07:31:58.000+01:00
Closes gh-41455
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
@@ -35,9 +35,9 @@ private GradleVersions() {
 	@SuppressWarnings("UnstableApiUsage")
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_20)) {
-			return Arrays.asList("8.1.1", "8.8");
+			return Arrays.asList("8.1.1", "8.9");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.9");
 	}
 
 	public static String minimumCompatible() {

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ private GradleVersions() {`
`35`	`35`	`@SuppressWarnings("UnstableApiUsage")`
`36`	`36`	`public static List<String> allCompatible() {`
`37`	`37`	`if (isJavaVersion(JavaVersion.VERSION_20)) {`
`38`		`- return Arrays.asList("8.1.1", "8.8");`
	`38`	`+ return Arrays.asList("8.1.1", "8.9");`
`39`	`39`	`}`
`40`		`- return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8");`
	`40`	`+ return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.9");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public static String minimumCompatible() {`