Merge branch 'main' into 4.0.x

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java

@@ -34,7 +34,6 @@
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.tasks.TaskProvider;
 
-import org.springframework.boot.build.DeployedPlugin;
 import org.springframework.boot.build.MavenRepositoryPlugin;
 import org.springframework.boot.build.bom.Library.Group;
 import org.springframework.boot.build.bom.Library.Module;
@@ -55,7 +54,6 @@ public class BomPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		PluginContainer plugins = project.getPlugins();
-		plugins.apply(DeployedPlugin.class);
 		plugins.apply(MavenRepositoryPlugin.class);
 		plugins.apply(JavaPlatformPlugin.class);
 		JavaPlatformExtension javaPlatform = project.getExtensions().getByType(JavaPlatformExtension.class);

buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java

@@ -55,6 +55,7 @@ void libraryModulesAreIncludedInDependencyManagementOfGeneratedPom() throws IOEx
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('ActiveMQ', '5.15.10') {");
@@ -91,6 +92,7 @@ void libraryPluginsAreIncludedInPluginManagementOfGeneratedPom() throws IOExcept
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('Flyway', '6.0.8') {");
@@ -118,6 +120,7 @@ void libraryImportsAreIncludedInDependencyManagementOfGeneratedPom() throws Exce
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('Jackson Bom', '2.10.0') {");
@@ -144,6 +147,7 @@ void moduleExclusionsAreIncludedInDependencyManagementOfGeneratedPom() throws IO
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('MySQL', '8.0.18') {");
@@ -177,6 +181,7 @@ void moduleTypesAreIncludedInDependencyManagementOfGeneratedPom() throws IOExcep
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('Elasticsearch', '7.15.2') {");
@@ -208,6 +213,7 @@ void moduleClassifiersAreIncludedInDependencyManagementOfGeneratedPom() throws I
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('Kafka', '2.7.2') {");
@@ -266,6 +272,7 @@ void libraryNamedSpringBootHasNoVersionProperty() throws IOException {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
+			out.println("    id 'org.springframework.boot.deployed'");
 			out.println("}");
 			out.println("bom {");
 			out.println("    library('Spring Boot', '1.2.3') {");

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -151,7 +151,3 @@ plugins.withType(EclipsePlugin) {
 		}
 	}
 }
-
-toolchain {
-	maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
-}

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

@@ -33,9 +33,12 @@ private GradleVersions() {
 	}
 
 	public static List<String> allCompatible() {
-		if (isJavaVersion(JavaVersion.VERSION_23)) {
+		if (isJavaVersion(JavaVersion.VERSION_24)) {
 			return Arrays.asList(GradleVersion.current().getVersion());
 		}
+		if (isJavaVersion(JavaVersion.VERSION_23)) {
+			return Arrays.asList("8.10", GradleVersion.current().getVersion());
+		}
 		if (isJavaVersion(JavaVersion.VERSION_22)) {
 			return Arrays.asList("8.8", GradleVersion.current().getVersion());
 		}

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

@@ -15,7 +15,6 @@ configurations {
 
 dependencies {
 	app project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository")
-	app project(path: ":spring-boot-project:spring-boot-parent", configuration: "mavenRepository")
 	app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))