Refine spring-boot-test-autoconfigure dependencies

Make `spring-boot-test-autoconfigure` optionally depend on
`spring-boot-autoconfigure` so that it can be an `api` dependency
for `*-test` modules. Also relocate it to core.

See gh-47322

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

@@ -23,12 +23,11 @@ plugins {
 description = "Spring Boot Test AutoConfigure"
 
 dependencies {
-	api(project(":core:spring-boot"))
-	api(project(":core:spring-boot-autoconfigure"))
 	api(project(":core:spring-boot-test"))
 
 	compileOnly("org.mockito:mockito-core")
 
+	optional(project(":core:spring-boot-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

documentation/spring-boot-docs/build.gradle

@@ -83,6 +83,7 @@ dependencies {
 	implementation(project(path: ":cli:spring-boot-cli"))
 	implementation(project(path: ":core:spring-boot-docker-compose"))
 	implementation(project(path: ":core:spring-boot-test"))
+	implementation(project(path: ":core:spring-boot-test-autoconfigure"))
 	implementation(project(path: ":core:spring-boot-testcontainers"))
 	implementation(project(path: ":loader:spring-boot-loader-tools"))
 	implementation(project(path: ":module:spring-boot-actuator"))
@@ -124,7 +125,6 @@ dependencies {
 	implementation(project(path: ":module:spring-boot-restclient"))
 	implementation(project(path: ":module:spring-boot-restclient-test"))
 	implementation(project(path: ":module:spring-boot-security"))
-	implementation(project(path: ":module:spring-boot-test-autoconfigure"))
 	implementation(project(path: ":module:spring-boot-tomcat"))
 	implementation(project(path: ":module:spring-boot-web-server-test"))
 	implementation(project(path: ":module:spring-boot-webclient"))
@@ -232,7 +232,7 @@ dependencies {
 	testRuntimeOnly("com.h2database:h2")
 	testRuntimeOnly("org.springframework:spring-jdbc")
 
-	testSlices(project(path: ":module:spring-boot-test-autoconfigure", configuration: "testSliceMetadata"))
+	testSlices(project(path: ":core:spring-boot-test-autoconfigure", configuration: "testSliceMetadata"))
 }
 
 dokkatoo {

module/spring-boot-cache-test/build.gradle

@@ -24,11 +24,10 @@ plugins {
 description = "Spring Boot Cache Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-cache"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
-	optional(project(":module:spring-boot-test-autoconfigure"))
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 

module/spring-boot-data-cassandra-test/build.gradle

@@ -25,12 +25,10 @@ plugins {
 description = "Spring Boot Data Cassandra Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-cassandra"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-data-commons/build.gradle

@@ -33,9 +33,8 @@ dependencies {
 	optional(project(":module:spring-boot-micrometer-metrics"))
 	optional(project(":module:spring-boot-webmvc"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-jdbc"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webmvc-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))

module/spring-boot-data-couchbase-test/build.gradle

@@ -24,12 +24,10 @@ plugins {
 description = "Spring Boot Data Couchbase Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-couchbase"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-data-elasticsearch-test/build.gradle

@@ -25,14 +25,12 @@ plugins {
 description = "Spring Boot Data Elasticsearch Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-elasticsearch"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
 	optional(project(":module:spring-boot-jackson"))
 	optional(project(":module:spring-boot-jsonb"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-data-jdbc-test/build.gradle

@@ -24,13 +24,11 @@ plugins {
 description = "Spring Boot Data JDBC Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-jdbc"))
 	api(project(":module:spring-boot-jdbc-test"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-data-jpa-test/build.gradle

@@ -24,14 +24,12 @@ plugins {
 description = "Spring Boot Data JPA Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-jpa"))
 	api(project(":module:spring-boot-jdbc-test"))
 	api(project(":module:spring-boot-jpa-test"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-data-ldap-test/build.gradle

@@ -25,12 +25,10 @@ plugins {
 description = "Spring Boot Data LDAP Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-ldap"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-data-mongodb-test/build.gradle

@@ -25,12 +25,10 @@ plugins {
 description = "Spring Boot Data MongoDB Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-mongodb"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-data-neo4j-test/build.gradle

@@ -25,12 +25,10 @@ plugins {
 description = "Spring Boot Data Neo4j Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-neo4j"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-data-r2dbc-test/build.gradle

@@ -24,12 +24,10 @@ plugins {
 description = "Spring Boot Data R2DBC Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-r2dbc"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-jdbc-test"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 

module/spring-boot-data-redis-test/build.gradle

@@ -25,12 +25,10 @@ plugins {
 description = "Spring Boot Data Redis Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-data-redis"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))

module/spring-boot-freemarker/build.gradle

@@ -38,8 +38,8 @@ dependencies {
 	optional("jakarta.servlet:jakarta.servlet-api")
 
 	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-servlet"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))
 

module/spring-boot-graphql-test/build.gradle

@@ -24,14 +24,14 @@ plugins {
 description = "Spring Boot GraphQL Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api("org.springframework.graphql:spring-graphql-test")
 
-	implementation(project(":core:spring-boot-test"))
 	implementation(project(":module:spring-boot-graphql"))
 	implementation(project(":module:spring-boot-jackson"))
 
+	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-json-test"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-validation"))
 	optional(project(":module:spring-boot-webclient"))
 	optional(project(":module:spring-boot-webflux-test"))

module/spring-boot-groovy-templates/build.gradle

@@ -34,8 +34,7 @@ dependencies {
 	optional(project(":module:spring-boot-webmvc-test"))
 	optional("jakarta.servlet:jakarta.servlet-api")
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))
 

module/spring-boot-hateoas/build.gradle

@@ -33,8 +33,7 @@ dependencies {
 
 	optional(project(":core:spring-boot-autoconfigure"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webmvc-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation("jakarta.servlet:jakarta.servlet-api")

module/spring-boot-jdbc-test/build.gradle

@@ -26,12 +26,10 @@ plugins {
 description = "Spring Boot JDBC Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-jdbc"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	dockerTestImplementation(project(":core:spring-boot-docker-compose"))

module/spring-boot-jooq-test/build.gradle

@@ -24,13 +24,11 @@ plugins {
 description = "Spring Boot jOOQ Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-jooq"))
 
-	implementation(project(":core:spring-boot-test"))
-
 	optional(project(":core:spring-boot-testcontainers"))
 	optional(project(":module:spring-boot-jdbc-test"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":module:spring-boot-flyway"))

module/spring-boot-jpa-test/build.gradle

@@ -24,11 +24,10 @@ plugins {
 description = "Spring Boot JPA Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-jpa"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
-	optional(project(":module:spring-boot-test-autoconfigure"))
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 

module/spring-boot-json-test/build.gradle

@@ -25,13 +25,13 @@ plugins {
 description = "Spring Boot JSON Test"
 
 dependencies {
-	implementation(project(":core:spring-boot-test"))
+	api(project(":core:spring-boot-test-autoconfigure"))
 
+	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-gson"))
 	optional(project(":module:spring-boot-jackson"))
 	optional(project(":module:spring-boot-jsonb"))
 	optional(project(":module:spring-boot-kotlin-serialization"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("com.jayway.jsonpath:json-path")
 	optional("org.assertj:assertj-core")
 	optional("org.junit.jupiter:junit-jupiter-api")

module/spring-boot-micrometer-metrics-test/build.gradle

@@ -24,11 +24,10 @@ plugins {
 description = "Spring Boot Micrometer Metrics Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-micrometer-metrics"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-micrometer-tracing-test/build.gradle

@@ -24,11 +24,10 @@ plugins {
 description = "Spring Boot Micrometer Tracing Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-micrometer-tracing"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-mustache/build.gradle

@@ -34,11 +34,10 @@ dependencies {
 	optional("org.springframework:spring-webflux")
 	optional(project(":core:spring-boot-autoconfigure"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-reactor-netty"))
 	testImplementation(project(":module:spring-boot-restclient"))
 	testImplementation(project(":module:spring-boot-reactor-netty"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-tomcat"))
 	testImplementation(project(":module:spring-boot-webflux-test"))
 	testImplementation(project(":module:spring-boot-webmvc-test"))

module/spring-boot-restclient-test/build.gradle

@@ -25,12 +25,12 @@ description = "Spring Boot RestClient Test"
 
 dependencies {
 	api(project(":core:spring-boot"))
+	api(project(":core:spring-boot-test-autoconfigure"))
 
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-jackson"))
 	optional(project(":module:spring-boot-json-test"))
 	optional(project(":module:spring-boot-restclient"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 	optional("org.springframework:spring-test")
 

module/spring-boot-restdocs/build.gradle

@@ -26,9 +26,11 @@ description = "Spring Boot REST Docs"
 
 dependencies {
 	api("org.springframework.restdocs:spring-restdocs-core")
+
+	optional(project(":core:spring-boot-autoconfigure"))
+	optional(project(":core:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-webmvc-test"))
 	optional(project(":module:spring-boot-web-server-test"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.springframework.restdocs:spring-restdocs-mockmvc")
 	optional("org.springframework.restdocs:spring-restdocs-restassured")
 	optional("org.springframework.restdocs:spring-restdocs-webtestclient")

module/spring-boot-rsocket-test/build.gradle

@@ -24,8 +24,11 @@ plugins {
 description = "Spring Boot RSocket Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-rsocket"))
 
+	optional(project(":core:spring-boot-autoconfigure"))
+
 	testImplementation(project(":test-support:spring-boot-test-support"))
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")

module/spring-boot-security-oauth2-client/build.gradle

@@ -37,10 +37,9 @@ dependencies {
 	optional(project(":module:spring-boot-webmvc-test"))
 	optional(project(":module:spring-boot-web-server-test"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-tomcat"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webmvc"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))
 	testImplementation("com.squareup.okhttp3:mockwebserver")

module/spring-boot-security-oauth2-resource-server/build.gradle

@@ -38,10 +38,9 @@ dependencies {
 	optional(project(":module:spring-boot-webmvc-test"))
 	optional("jakarta.servlet:jakarta.servlet-api")
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-actuator-autoconfigure"))
 	testImplementation(project(":module:spring-boot-jackson"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webflux"))
 	testImplementation(project(":module:spring-boot-webmvc"))
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-security-saml2/build.gradle

@@ -33,9 +33,8 @@ dependencies {
 
 	optional(project(":core:spring-boot-autoconfigure"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
     testImplementation(project(":module:spring-boot-actuator-autoconfigure"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webmvc"))
 	testImplementation(project(":module:spring-boot-webmvc-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))

module/spring-boot-security-test/build.gradle

@@ -24,10 +24,11 @@ plugins {
 description = "Spring Boot Security Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-security"))
 	api("org.springframework.security:spring-security-test")
 
-	optional(project(":module:spring-boot-test-autoconfigure"))
+	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-webflux-test"))
 	optional(project(":module:spring-boot-webmvc-test"))
 	optional("org.seleniumhq.selenium:htmlunit3-driver") {

module/spring-boot-security/build.gradle

@@ -27,6 +27,7 @@ description = "Spring Boot Security"
 
 dependencies {
 	api(project(":core:spring-boot"))
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api("org.springframework.security:spring-security-config")
 	api("org.springframework.security:spring-security-web")
 

module/spring-boot-thymeleaf/build.gradle

@@ -42,8 +42,7 @@ dependencies {
 	optional("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
 	optional("jakarta.servlet:jakarta.servlet-api")
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":core:spring-boot-test-autoconfigure"))
-	testImplementation(project(":module:spring-boot-test-autoconfigure"))
 	testImplementation(project(":module:spring-boot-webflux-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))

module/spring-boot-web-server-test/build.gradle

@@ -27,12 +27,11 @@ description = "Spring Boot Web Server Test"
 
 dependencies {
 	api(project(":core:spring-boot"))
+	api(project(":core:spring-boot-test-autoconfigure"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
 	optional(project(":module:spring-boot-http-codec"))
 	optional(project(":module:spring-boot-restclient"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-web-server"))
 	optional(project(":module:spring-boot-webclient"))
 	optional("jakarta.servlet:jakarta.servlet-api")

module/spring-boot-webflux-test/build.gradle

@@ -24,14 +24,13 @@ plugins {
 description = "Spring Boot WebFlux Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-webflux"))
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
 	optional(project(":module:spring-boot-http-codec"))
 	optional(project(":module:spring-boot-jackson"))
 	optional(project(":module:spring-boot-json-test"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-validation"))
 	optional(project(":module:spring-boot-web-server-test"))
 	optional("org.junit.jupiter:junit-jupiter-api")

module/spring-boot-webmvc-test/build.gradle

@@ -25,18 +25,19 @@ plugins {
 description = "Spring Boot Web MVC Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-webmvc"))
 
 	compileOnly("jakarta.servlet:jakarta.servlet-api")
 
-	implementation(project(":core:spring-boot-test"))
 	implementation(project(":module:spring-boot-http-converter"))
 	implementation(project(":module:spring-boot-web-server"))
 	implementation(project(":module:spring-boot-web-server-test"))
 
+	optional(project(":core:spring-boot-autoconfigure"))
+	optional(project(":core:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-jackson"))
 	optional(project(":module:spring-boot-json-test"))
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional(project(":module:spring-boot-validation"))
 	optional(project(":module:spring-boot-webflux"))
 	optional("org.junit.jupiter:junit-jupiter-api")

module/spring-boot-webservices-test/build.gradle

@@ -25,12 +25,11 @@ plugins {
 description = "Spring Boot Web Services Test"
 
 dependencies {
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-webservices"))
 	api("org.springframework.ws:spring-ws-test")
 
-	implementation(project(":core:spring-boot-test"))
+	optional(project(":core:spring-boot-autoconfigure"))
-
-	optional(project(":module:spring-boot-test-autoconfigure"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))

settings.gradle

@@ -75,6 +75,7 @@ include "core:spring-boot-autoconfigure-processor"
 include "core:spring-boot-docker-compose"
 include "core:spring-boot-properties-migrator"
 include "core:spring-boot-test"
+include "core:spring-boot-test-autoconfigure"
 include "core:spring-boot-testcontainers"
 
 include "module:spring-boot-activemq"
@@ -181,7 +182,6 @@ include "module:spring-boot-session-data-redis"
 include "module:spring-boot-session-hazelcast"
 include "module:spring-boot-session-jdbc"
 include "module:spring-boot-sql"
-include "module:spring-boot-test-autoconfigure"
 include "module:spring-boot-thymeleaf"
 include "module:spring-boot-tomcat"
 include "module:spring-boot-tx"

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

@@ -25,8 +25,8 @@ dependencies {
 
 	api(project(":core:spring-boot-test"))
 
+	api(project(":core:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-restclient-test"))
-	api(project(":module:spring-boot-test-autoconfigure"))
 	api(project(":module:spring-boot-web-server-test"))
 
 	api("com.jayway.jsonpath:json-path")