Merge branch '3.0.x' into 3.1.x

Closes gh-37824
spring-projects · Oct 11, 2023 · ac1f7cc · ac1f7cc
2 parents 7506d2d + 5a6cd77
commit ac1f7cc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ort/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/...ort/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.3", "8.4-rc-1");
+			return Arrays.asList("8.1.1", "8.3", "8.4");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4");
 	}
 
 	public static String minimumCompatible() {