Merge branch '3.4.x'

Closes gh-44760

Author: snicoll

settings.gradle

@@ -37,8 +37,18 @@ settings.gradle.projectsLoaded {
 	}
 }
 
+include "spring-boot-project:spring-boot"
+include "spring-boot-project:spring-boot-actuator"
+include "spring-boot-project:spring-boot-actuator-autoconfigure"
+include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-dependencies"
+include "spring-boot-project:spring-boot-devtools"
+include "spring-boot-project:spring-boot-docker-compose"
+include "spring-boot-project:spring-boot-docs"
 include "spring-boot-project:spring-boot-parent"
+include "spring-boot-project:spring-boot-test"
+include "spring-boot-project:spring-boot-test-autoconfigure"
+include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-tools:spring-boot-antlib"
 include "spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor"
 include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"
@@ -56,24 +66,14 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
 include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
-include "spring-boot-project:spring-boot"
-include "spring-boot-project:spring-boot-autoconfigure"
-include "spring-boot-project:spring-boot-actuator"
-include "spring-boot-project:spring-boot-actuator-autoconfigure"
-include "spring-boot-project:spring-boot-docker-compose"
-include "spring-boot-project:spring-boot-devtools"
-include "spring-boot-project:spring-boot-docs"
-include "spring-boot-project:spring-boot-test"
-include "spring-boot-project:spring-boot-testcontainers"
-include "spring-boot-project:spring-boot-test-autoconfigure"
+include "spring-boot-system-tests:spring-boot-deployment-tests"
+include "spring-boot-system-tests:spring-boot-image-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
-include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-classic-tests"
+include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-sni-tests"
-include "spring-boot-system-tests:spring-boot-deployment-tests"
-include "spring-boot-system-tests:spring-boot-image-tests"
 
 file("${rootDir}/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
 	include "spring-boot-project:spring-boot-starters:${it.name}"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -10,8 +10,8 @@ plugins {
 description = "Spring Boot Actuator AutoConfigure"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	implementation("com.fasterxml.jackson.core:jackson-databind")

spring-boot-project/spring-boot-actuator/build.gradle

@@ -91,9 +91,9 @@ dependencies {
 	optional("org.springframework.security:spring-security-web")
 	optional("org.springframework.session:spring-session-core")
 
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("io.micrometer:micrometer-observation-test")

spring-boot-project/spring-boot-autoconfigure/build.gradle

@@ -233,8 +233,8 @@ dependencies {
 	optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
 	optional("redis.clients:jedis")
 
-	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
 	testImplementation("ch.qos.logback:logback-classic")
 	testImplementation("commons-fileupload:commons-fileupload")

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -2022,9 +2022,6 @@ bom {
 		group("org.springframework.boot") {
 			modules = [
 				"spring-boot",
-				"spring-boot-test",
-				"spring-boot-test-autoconfigure",
-				"spring-boot-testcontainers",
 				"spring-boot-actuator",
 				"spring-boot-actuator-autoconfigure",
 				"spring-boot-autoconfigure",
@@ -2057,10 +2054,10 @@ bom {
 				"spring-boot-starter-data-ldap",
 				"spring-boot-starter-data-mongodb",
 				"spring-boot-starter-data-mongodb-reactive",
+				"spring-boot-starter-data-neo4j",
 				"spring-boot-starter-data-r2dbc",
 				"spring-boot-starter-data-redis",
 				"spring-boot-starter-data-redis-reactive",
-				"spring-boot-starter-data-neo4j",
 				"spring-boot-starter-data-rest",
 				"spring-boot-starter-freemarker",
 				"spring-boot-starter-graphql",
@@ -2091,9 +2088,12 @@ bom {
 				"spring-boot-starter-undertow",
 				"spring-boot-starter-validation",
 				"spring-boot-starter-web",
+				"spring-boot-starter-web-services",
 				"spring-boot-starter-webflux",
 				"spring-boot-starter-websocket",
-				"spring-boot-starter-web-services"
+				"spring-boot-test",
+				"spring-boot-test-autoconfigure",
+				"spring-boot-testcontainers"
 			]
 			plugins = [
 				"spring-boot-maven-plugin"

spring-boot-project/spring-boot-docs/build.gradle

@@ -50,17 +50,17 @@ plugins.withType(EclipsePlugin) {
 }
 
 dependencies {
-	autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
 
 	configurationProperties(project(path: ":spring-boot-project:spring-boot", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata"))
-	configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
 
@@ -70,13 +70,13 @@ dependencies {
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure"))
+	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-docker-compose"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-testcontainers"))
-	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation("ch.qos.logback:logback-classic")
 	implementation("com.redis:testcontainers-redis")
 	implementation("com.zaxxer:HikariCP")