Merge branch '3.0.x' into 3.1.x

Closes gh-36550

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 @@ public final class GradleVersions {
 	@SuppressWarnings("UnstableApiUsage")
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_20)) {
-			return Arrays.asList("8.1.1", "8.2");
+			return Arrays.asList("8.1.1", "8.2.1");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
 	}
 
 	public static String minimumCompatible() {