Merge branch '3.5.x'

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java

@@ -66,10 +66,18 @@ void packagedApplicationClasspath() throws IOException {
 		copyClasspathApplication();
 		BuildResult result = this.gradleBuild.build("launch");
 		String output = result.getOutput();
-		assertThat(output).containsPattern("1\\. .*classes");
-		assertThat(output).containsPattern("2\\. .*library-1.0-SNAPSHOT.jar");
-		assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar");
-		assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar");
+		if (this.gradleBuild.gradleVersionIsLessThan("9.0.0-rc-1")) {
+			assertThat(output).containsPattern("1\\. .*classes");
+			assertThat(output).containsPattern("2\\. .*library-1.0-SNAPSHOT.jar");
+			assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar");
+			assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar");
+		}
+		else {
+			assertThat(output).containsPattern("1\\. .*classes");
+			assertThat(output).containsPattern("2\\. .*commons-lang3-3.9.jar");
+			assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar");
+			assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar");
+		}
 		assertThat(output).doesNotContain("5. ");
 	}
 
@@ -78,10 +86,18 @@ void explodedApplicationClasspath() throws IOException {
 		copyClasspathApplication();
 		BuildResult result = this.gradleBuild.build("launch");
 		String output = result.getOutput();
-		assertThat(output).containsPattern("1\\. .*classes");
-		assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar");
-		assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar");
-		assertThat(output).containsPattern("4\\. .*commons-lang3-3.9.jar");
+		if (this.gradleBuild.gradleVersionIsLessThan("9.0.0-rc-1")) {
+			assertThat(output).containsPattern("1\\. .*classes");
+			assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar");
+			assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar");
+			assertThat(output).containsPattern("4\\. .*commons-lang3-3.9.jar");
+		}
+		else {
+			assertThat(output).containsPattern("1\\. .*classes");
+			assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar");
+			assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar");
+			assertThat(output).containsPattern("4\\. .*library-1.0-SNAPSHOT.jar");
+		}
 		assertThat(output).doesNotContain("5. ");
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

@@ -34,18 +34,18 @@ private GradleVersions() {
 
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_24)) {
-			return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-milestone-9");
+			return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-1");
 		}
 		if (isJavaVersion(JavaVersion.VERSION_23)) {
-			return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-milestone-9");
+			return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-1");
 		}
 		if (isJavaVersion(JavaVersion.VERSION_22)) {
-			return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-milestone-9");
+			return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-rc-1");
 		}
 		if (isJavaVersion(JavaVersion.VERSION_21)) {
-			return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-milestone-9");
+			return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-rc-1");
 		}
-		return Arrays.asList("7.6.5", "8.4", GradleVersion.current().getVersion(), "9.0.0-milestone-9");
+		return Arrays.asList("7.6.5", "8.4", GradleVersion.current().getVersion(), "9.0.0-rc-1");
 	}
 
 	public static String minimumCompatible() {