Merge branch '2.3.x'

Closes gh-21669

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

@@ -23,12 +23,11 @@ dependencies {
 	api(platform(project(":spring-boot-project:spring-boot-dependencies")))
 	api(project(":spring-boot-project:spring-boot-actuator"))
 
-	implementation(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot"))
-	implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure"))
+
 	implementation("com.fasterxml.jackson.core:jackson-databind")
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-	implementation("org.springframework:spring-core")
-	implementation("org.springframework:spring-context")
 
 	optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
 	optional("ch.qos.logback:logback-classic")

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

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

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

@@ -16,9 +16,8 @@ configurations {
 
 dependencies {
 	api(platform(project(":spring-boot-project:spring-boot-dependencies")))
-
+	api(project(":spring-boot-project:spring-boot"))
-	implementation(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure"))
-	implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	intTestDependencies(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 

spring-boot-project/spring-boot-properties-migrator/build.gradle

@@ -9,9 +9,8 @@ description = "Spring Boot Properties Migrator"
 
 dependencies {
 	api(platform(project(":spring-boot-project:spring-boot-dependencies")))
-
+	api(project(":spring-boot-project:spring-boot"))
-	implementation(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
-	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation("org.junit.jupiter:junit-jupiter")

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

@@ -10,10 +10,9 @@ description = "Spring Boot Test AutoConfigure"
 
 dependencies {
 	api(platform(project(":spring-boot-project:spring-boot-dependencies")))
-
+	api(project(":spring-boot-project:spring-boot"))
-	implementation(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-test"))
-	implementation(project(":spring-boot-project:spring-boot-test"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure"))
-	implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
 	optional("javax.json.bind:javax.json.bind-api")

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

@@ -11,8 +11,7 @@ description = "Spring Boot Test"
 
 dependencies {
 	api(platform(project(":spring-boot-project:spring-boot-dependencies")))
-
+	api(project(":spring-boot-project:spring-boot"))
-	implementation(project(":spring-boot-project:spring-boot"))
 
 	optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
 	optional("com.fasterxml.jackson.core:jackson-databind")