Simplify dependencies arrangement in smoke tests

This commit harmonizes dependencies used in smoke tests, in particular
by using the starters consistently. This serves not only as a validation
but also a showcase of how to use them.

Closes gh-47836

smoke-test/spring-boot-smoke-test-activemq-embedded/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 
 	runtimeOnly("org.apache.activemq:activemq-broker")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-activemq-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-activemq/build.gradle

@@ -24,8 +24,8 @@ description = "Spring Boot ActiveMQ smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-activemq"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-activemq-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-activemq")

smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle

@@ -26,8 +26,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 
 	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle

@@ -24,8 +24,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-actuator-log4j2/build.gradle

@@ -30,8 +30,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":module:spring-boot-webmvc-test"))
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-actuator-noweb/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 
 	implementation(project(":starter:spring-boot-starter-actuator"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle

@@ -26,8 +26,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-actuator/build.gradle

@@ -30,8 +30,9 @@ dependencies {
 
 	runtimeOnly("com.h2database:h2")
 
+	testImplementation(project(":starter:spring-boot-starter-actuator-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
+
 	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }
 

smoke-test/spring-boot-smoke-test-amqp/build.gradle

@@ -24,8 +24,8 @@ description = "Spring Boot AMQP smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-amqp"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-amqp-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")

smoke-test/spring-boot-smoke-test-artemis/build.gradle

@@ -24,8 +24,8 @@ description = "Spring Boot Artemis smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-artemis"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-artemis-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-activemq")

smoke-test/spring-boot-smoke-test-aspectj/build.gradle

@@ -23,7 +23,7 @@ description = "Spring Boot AspectJ smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-aspectj"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-aspectj-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle

@@ -21,8 +21,7 @@ plugins {
 description = "Spring Boot Auto-Configure Classic smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter"))
+	implementation(project(":starter:spring-boot-starter-classic"))
-	implementation(project(":module:spring-boot-autoconfigure-classic"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

smoke-test/spring-boot-smoke-test-batch-jdbc/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 
 	runtimeOnly("org.hsqldb:hsqldb")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-batch-jdbc-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-batch/build.gradle

@@ -23,7 +23,7 @@ description = "Spring Boot Batch smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-batch"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-batch-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -62,9 +62,8 @@ dependencies {
 	infinispan("org.infinispan:infinispan-core")
 	infinispan("org.infinispan:infinispan-jcache")
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-data-redis"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-redis-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")

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

@@ -25,14 +25,10 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-data-cassandra"))
 	implementation(project(":starter:spring-boot-starter-data-cassandra-reactive"))
 
-	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-data-cassandra-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-cassandra-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-cassandra-reactive-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.junit.platform:junit-platform-engine")
-	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-cassandra")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }

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

@@ -25,17 +25,11 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-data-couchbase"))
 	implementation(project(":starter:spring-boot-starter-data-couchbase-reactive"))
 
-	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-reactor"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-couchbase-test"))
-	dockerTestImplementation(project(":module:spring-boot-data-couchbase-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-couchbase-reactive-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("io.projectreactor:reactor-test")
 	dockerTestImplementation("org.apache.httpcomponents.client5:httpclient5")
-	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.junit.platform:junit-platform-engine")
-	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-couchbase")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }

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

@@ -25,16 +25,11 @@ description = "Spring Boot Data Elasticsearch smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-data-elasticsearch"))
 
-	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-data-elasticsearch-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-elasticsearch-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.junit.platform:junit-platform-engine")
-	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
-	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch")
+	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }
 
 tasks.named("compileTestJava") {

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

@@ -26,9 +26,8 @@ dependencies {
 
 	runtimeOnly("com.h2database:h2")
 
-	testImplementation(project(":module:spring-boot-data-jdbc-test"))
+	testImplementation(project(":starter:spring-boot-starter-data-jdbc-test"))
-	testImplementation(project(":module:spring-boot-webmvc-test"))
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -21,16 +21,14 @@ plugins {
 description = "Spring Boot Data JPA smoke test"
 
 dependencies {
+	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-data-jpa"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
-	implementation(project(":starter:spring-boot-starter-actuator"))
 
 	runtimeOnly("com.h2database:h2")
 
-
+	testImplementation(project(":starter:spring-boot-starter-data-jpa-test"))
-	testImplementation(project(":module:spring-boot-data-jpa-test"))
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":module:spring-boot-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -25,7 +25,7 @@ dependencies {
 
 	runtimeOnly("com.unboundid:unboundid-ldapsdk")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-data-ldap-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -25,15 +25,10 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-data-mongodb"))
 	implementation(project(":starter:spring-boot-starter-data-mongodb-reactive"))
 
-	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-data-mongodb-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-mongodb-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-mongodb-reactive-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("io.projectreactor:reactor-test")
-	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.junit.platform:junit-platform-engine")
-	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-mongodb")
 }

smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle

@@ -23,18 +23,16 @@ description = "Spring Boot Data R2DBC with Flyway smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-data-r2dbc"))
+	implementation(project(":starter:spring-boot-starter-flyway"))
 
-	runtimeOnly(project(":module:spring-boot-flyway"))
 	runtimeOnly("org.flywaydb:flyway-database-postgresql")
 	runtimeOnly("org.postgresql:postgresql")
 	runtimeOnly("org.postgresql:r2dbc-postgresql")
-	runtimeOnly("org.springframework:spring-jdbc")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-data-r2dbc-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-r2dbc-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-flyway-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("io.projectreactor:reactor-test")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-postgresql")
 	dockerTestImplementation("org.testcontainers:testcontainers-r2dbc")

smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle

@@ -29,10 +29,9 @@ dependencies {
 	runtimeOnly("org.postgresql:r2dbc-postgresql")
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":module:spring-boot-data-r2dbc-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-data-r2dbc-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-liquibase-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("io.projectreactor:reactor-test")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-postgresql")
 	dockerTestImplementation("org.testcontainers:testcontainers-r2dbc")

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

@@ -21,13 +21,13 @@ plugins {
 description = "Spring Boot Data R2DBC smoke test"
 
 dependencies {
+	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-data-r2dbc"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
-	implementation(project(":starter:spring-boot-starter-actuator"))
 
 	runtimeOnly("io.r2dbc:r2dbc-h2")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-data-r2dbc-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
 }
 

smoke-test/spring-boot-smoke-test-data-rest/build.gradle

@@ -29,8 +29,7 @@ dependencies {
 
 	runtimeOnly(project(":starter:spring-boot-starter-jetty"))
 
-	testImplementation(project(":module:spring-boot-webmvc-test"))
+	testImplementation(project(":starter:spring-boot-starter-data-rest-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 
 	testRuntimeOnly("com.jayway.jsonpath:json-path")
 }

smoke-test/spring-boot-smoke-test-devtools/build.gradle

@@ -31,7 +31,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-flyway/build.gradle

@@ -28,7 +28,7 @@ dependencies {
 
 	runtimeOnly("com.h2database:h2")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-flyway-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -22,15 +22,12 @@ description = "Spring Boot GraphQL smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-graphql"))
-	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-security"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":module:spring-boot-graphql-test"))
-	testImplementation(project(":module:spring-boot-webmvc-test"))
 	testImplementation(project(":module:spring-boot-webtestclient"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-graphql-test"))
-
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testRuntimeOnly("org.springframework:spring-webflux")
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-hateoas/build.gradle

@@ -24,7 +24,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-hateoas"))
 
 	testImplementation(project(":starter:spring-boot-starter-hateoas-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-hibernate/build.gradle

@@ -21,18 +21,17 @@ plugins {
 description = "Spring Boot Hibernate smoke test"
 
 dependencies {
+	implementation(project(":module:spring-boot-hibernate"))
 	implementation(project(":starter:spring-boot-starter-freemarker"))
 	implementation(project(":starter:spring-boot-starter-jdbc"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
-	implementation(project(":module:spring-boot-hibernate"))
 
 	implementation("jakarta.xml.bind:jakarta.xml.bind-api")
 
 	runtimeOnly("com.h2database:h2")
 	runtimeOnly("jakarta.transaction:jakarta.transaction-api")
 
-	testImplementation(project(":module:spring-boot-webmvc-test"))
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-integration/build.gradle

@@ -27,7 +27,7 @@ dependencies {
 	implementation("org.springframework.integration:spring-integration-file")
 	implementation("org.springframework.integration:spring-integration-jmx")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-integration-test"))
 	testImplementation("org.awaitility:awaitility")
 }
 

smoke-test/spring-boot-smoke-test-jackson2-mixed/build.gradle

@@ -25,6 +25,5 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }

smoke-test/spring-boot-smoke-test-jackson2-only/build.gradle

@@ -27,7 +27,6 @@ dependencies {
 		exclude module: 'spring-boot-starter-jackson'
 	}
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test")) {
 		exclude module: 'spring-boot-starter-jackson'
 	}

smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle

@@ -38,7 +38,6 @@ dependencies {
 	runtimeOnly("org.glassfish.web:jakarta.servlet.jsp.jstl")
 
 	testImplementation(project(":starter:spring-boot-starter-jetty"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle

@@ -26,7 +26,6 @@ dependencies {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 
 	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")

smoke-test/spring-boot-smoke-test-jetty/build.gradle

@@ -21,12 +21,11 @@ plugins {
 description = "Spring Boot Jetty smoke test"
 
 dependencies {
+	implementation(project(":starter:spring-boot-starter-jetty"))
 	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
-	implementation(project(":starter:spring-boot-starter-jetty"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-kafka/build.gradle

@@ -35,14 +35,14 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-jackson"))
 	implementation(project(":starter:spring-boot-starter-kafka"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
-	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-kafka-test"))
+	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-kafka")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-kafka-test"))
 	testImplementation("org.awaitility:awaitility")
 	testImplementation("org.springframework.kafka:spring-kafka-test")
 }

smoke-test/spring-boot-smoke-test-liquibase/build.gradle

@@ -27,7 +27,7 @@ dependencies {
 
 	runtimeOnly("com.h2database:h2")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-liquibase-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-oauth2-authorization-server/build.gradle

@@ -24,7 +24,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security-oauth2-authorization-server"))
 
 	testImplementation(project(":starter:spring-boot-starter-security-oauth2-authorization-server-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
 

smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle

@@ -25,7 +25,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-security-oauth2-client-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle

@@ -25,7 +25,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-security-oauth2-resource-server-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("com.squareup.okhttp3:mockwebserver")
 }

smoke-test/spring-boot-smoke-test-parent-context/build.gradle

@@ -21,11 +21,11 @@ plugins {
 description = "Spring Boot parent context smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-integration"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
+	implementation(project(":starter:spring-boot-starter-integration"))
 	implementation("org.springframework.integration:spring-integration-file")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-integration-test"))
 	testImplementation("org.awaitility:awaitility")
 }
 

smoke-test/spring-boot-smoke-test-prometheus/build.gradle

@@ -21,14 +21,13 @@ plugins {
 description = "Spring Boot Prometheus smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation('io.micrometer:micrometer-tracing-bridge-brave')
 
 	runtimeOnly('io.micrometer:micrometer-registry-prometheus')
 
 	testImplementation(project(":module:spring-boot-micrometer-metrics-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-pulsar/build.gradle

@@ -24,9 +24,9 @@ description = "Spring Boot Pulsar smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-pulsar"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
-	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-pulsar-test"))
+	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-pulsar")

smoke-test/spring-boot-smoke-test-quartz/build.gradle

@@ -21,15 +21,15 @@ plugins {
 description = "Spring Boot Quartz smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
-	implementation(project(":starter:spring-boot-starter-quartz"))
 	implementation(project(":starter:spring-boot-starter-jdbc"))
+	implementation(project(":starter:spring-boot-starter-quartz"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 
+	testImplementation(project(":starter:spring-boot-starter-quartz-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.awaitility:awaitility")
 }
 

smoke-test/spring-boot-smoke-test-reactive-oauth2-client/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security-oauth2-client"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-oauth2-client-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle

@@ -24,9 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security-oauth2-resource-server"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
-	testImplementation(project(":starter:spring-boot-starter-security-oauth2-resource-server"))
 	testImplementation(project(":starter:spring-boot-starter-security-oauth2-resource-server-test"))
 	testImplementation("com.squareup.okhttp3:mockwebserver")
 }

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

@@ -25,9 +25,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation("org.springframework.security:spring-security-rsocket")
 
-	testImplementation(project(":module:spring-boot-rsocket-test"))
+	testImplementation(project(":starter:spring-boot-starter-rsocket-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
-	testImplementation("io.projectreactor:reactor-test")
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle

@@ -24,8 +24,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security-saml2"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-security-saml2-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
 

smoke-test/spring-boot-smoke-test-secure-webflux/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
 	testImplementation("io.projectreactor:reactor-test")
 }

smoke-test/spring-boot-smoke-test-secure/build.gradle

@@ -23,7 +23,7 @@ description = "Spring Boot Security smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle

@@ -28,9 +28,9 @@ dependencies {
 
 	runtimeOnly(project(":starter:spring-boot-starter-data-redis-reactive"))
 
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-webclient"))
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-session-data-redis-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-webclient-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")

smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle

@@ -19,7 +19,7 @@ plugins {
 	id "org.springframework.boot.docker-test"
 }
 
-description = "Spring Boot Session Mongodb smoke test"
+description = "Spring Boot Session Redis smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
@@ -28,9 +28,9 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-session-data-redis-test"))
 	dockerTestImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
+	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }

smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle

@@ -29,8 +29,8 @@ dependencies {
 	runtimeOnly(project(":starter:spring-boot-starter-jdbc"))
 	runtimeOnly("com.h2database:h2")
 
+	testImplementation(project(":starter:spring-boot-starter-session-jdbc-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

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

@@ -29,7 +29,6 @@ dependencies {
 
 	testImplementation(project(":starter:spring-boot-starter-data-jpa-test"))
 	testImplementation(project(":starter:spring-boot-starter-restclient-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.htmlunit:htmlunit")
 	testImplementation("org.mockito:mockito-junit-jupiter")

smoke-test/spring-boot-smoke-test-testng/build.gradle

@@ -22,12 +22,9 @@ description = "Spring Boot TestNG smoke test"
 
 dependencies {
 	implementation(platform(project(":platform:spring-boot-dependencies")))
-	implementation(project(":starter:spring-boot-starter"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":core:spring-boot-test"))
+	testImplementation(project(":starter:spring-boot-starter-restclient-test"))
-	testImplementation(project(":module:spring-boot-restclient"))
-	testImplementation(project(":module:spring-boot-restclient-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-test")

smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle

@@ -33,7 +33,6 @@ dependencies {
 	providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl")
 	providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle

@@ -23,7 +23,6 @@ description = "Spring Boot Tomcat multi-connectors smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle

@@ -21,10 +21,9 @@ plugins {
 description = "Spring Boot Tomcat SSL smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-tomcat/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":module:spring-boot-resttestclient"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-freemarker"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-freemarker-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation("jakarta.xml.bind:jakarta.xml.bind-api")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-groovy-templates-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-web-jsp/build.gradle

@@ -30,11 +30,10 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	providedRuntime(project(":module:spring-boot-tomcat-runtime"))
-	providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl")
 	providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")
+	providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl")
 
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-web-method-security/build.gradle

@@ -25,8 +25,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-web-mustache/build.gradle

@@ -24,8 +24,8 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-mustache"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
+	testImplementation(project(":starter:spring-boot-starter-mustache-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 }
 
 tasks.named("compileTestJava") {

smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle

@@ -27,7 +27,7 @@ dependencies {
 
 	runtimeOnly("com.h2database:h2")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-web-secure/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
 	implementation(project(":starter:spring-boot-starter-webmvc"))
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-security-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

smoke-test/spring-boot-smoke-test-web-static/build.gradle

@@ -34,7 +34,6 @@ dependencies {
 	runtimeOnly("org.webjars:bootstrap:3.0.3")
 	runtimeOnly("org.webjars:jquery:2.0.3-1")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webmvc-test"))
 }
 

smoke-test/spring-boot-smoke-test-webflux-coroutines/build.gradle

@@ -28,9 +28,7 @@ dependencies {
 	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
-	testImplementation("io.projectreactor:reactor-test")
 }
 
 architectureCheck {

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

@@ -26,7 +26,6 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
 	testImplementation(project(":module:spring-boot-resttestclient"))
-	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation(project(":starter:spring-boot-starter-webflux-test"))
 	testImplementation("io.projectreactor:reactor-test")
 }

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

@@ -27,8 +27,7 @@ dependencies {
 	runtimeOnly("jaxen:jaxen")
 	runtimeOnly("wsdl4j:wsdl4j")
 
-	testImplementation(project(":starter:spring-boot-starter-test"))
+	testImplementation(project(":starter:spring-boot-starter-webservices-test"))
-	testImplementation(project(":module:spring-boot-webservices-test"))
 }
 
 tasks.named("compileTestJava") {