Merge branch '4.0.x'

wilkinsona · wilkinsona · commit 34c7cfa00c0a · 2026-02-11T14:25:41.000Z
See spring-projectsgh-49192
diff --git a/test-support/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/test-support/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -33,6 +33,9 @@ private GradleVersions() {
 	}
 
 	public static List<String> allCompatible() {
+		if (isJavaVersion(JavaVersion.VERSION_26)) {
+			return Arrays.asList("9.4.0-rc-1");
+		}
 		if (isJavaVersion(JavaVersion.VERSION_25)) {
 			return Arrays.asList("9.0.0", GradleVersion.current().getVersion());
 		}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ private GradleVersions() {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public static List<String> allCompatible() {`
	`36`	`+ if (isJavaVersion(JavaVersion.VERSION_26)) {`
	`37`	`+ return Arrays.asList("9.4.0-rc-1");`
	`38`	`+ }`
`36`	`39`	`if (isJavaVersion(JavaVersion.VERSION_25)) {`
`37`	`40`	`return Arrays.asList("9.0.0", GradleVersion.current().getVersion());`
`38`	`41`	`}`