Rationalize starters following modularization

Update dependencies and starters following modularization. New
starters have been added for each user-facing module.

Closes gh-46245

documentation/spring-boot-docs/build.gradle

@@ -380,7 +380,7 @@ dependencies {
 	testImplementation(project(":module:spring-boot-actuator-autoconfigure"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 
-	testRuntimeOnly(project(":starter:spring-boot-starter-web"))
+	testRuntimeOnly(project(":starter:spring-boot-starter-webmvc"))
 	testRuntimeOnly("com.h2database:h2")
 	testRuntimeOnly("org.springframework:spring-jdbc")
 

integration-test/spring-boot-sni-integration-tests/build.gradle

@@ -38,7 +38,7 @@ dependencies {
 	app project(path: ":module:spring-boot-webflux", configuration: "mavenRepository")
 
 	intTestImplementation(enforcedPlatform(project(":platform:spring-boot-internal-dependencies")))
-	intTestImplementation(project(":starter:spring-boot-starter-web"))
+	intTestImplementation(project(":starter:spring-boot-starter-webmvc"))
 	intTestImplementation(project(":test-support:spring-boot-test-support"))
 	intTestImplementation(project(":starter:spring-boot-starter-test"))
 	intTestImplementation("org.testcontainers:junit-jupiter")

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

@@ -28,9 +28,7 @@ description = "Spring Boot Data Cassandra"
 dependencies {
 	api(project(":module:spring-boot-cassandra"))
 	api(project(":module:spring-boot-data-commons"))
-	api("org.springframework.data:spring-data-cassandra") {
+	api("org.springframework.data:spring-data-cassandra")
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
 
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-reactor"))

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

@@ -25,11 +25,12 @@ plugins {
 description = "Spring Boot Data Commons"
 
 dependencies {
-	api(project(":module:spring-boot-webmvc"))
+	api(project(":core:spring-boot"))
 	api("org.springframework.data:spring-data-commons")
 
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-metrics"))
+	optional(project(":module:spring-boot-webmvc"))
 
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":module:spring-boot-jdbc"))

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

@@ -27,6 +27,7 @@ description = "Spring Boot Data Couchbase"
 dependencies {
 	api(project(":module:spring-boot-couchbase"))
 	api(project(":module:spring-boot-data-commons"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.data:spring-data-couchbase")
 
 	optional(project(":core:spring-boot-autoconfigure"))

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

@@ -28,6 +28,7 @@ description = "Spring Boot Data Elasticsearch"
 dependencies {
 	api(project(":module:spring-boot-data-commons"))
 	api(project(":module:spring-boot-elasticsearch"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.data:spring-data-elasticsearch")
 
 	optional(project(":core:spring-boot-autoconfigure"))

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

@@ -40,6 +40,7 @@ dependencies {
 
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":module:spring-boot-jdbc"))
+	testImplementation(project(":module:spring-boot-webmvc"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))
 

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

@@ -27,6 +27,7 @@ description = "Spring Boot Data LDAP"
 dependencies {
 	api(project(":module:spring-boot-data-commons"))
 	api(project(":module:spring-boot-ldap"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.data:spring-data-ldap")
 
 	optional(project(":core:spring-boot-autoconfigure"))

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

@@ -25,9 +25,9 @@ plugins {
 description = "Spring Boot Data MongoDB"
 
 dependencies {
-	api(project(":core:spring-boot"))
 	api(project(":module:spring-boot-data-commons"))
 	api(project(":module:spring-boot-mongodb"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.data:spring-data-mongodb")
 
 	compileOnly("com.fasterxml.jackson.core:jackson-annotations")

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

@@ -28,6 +28,7 @@ description = "Spring Boot Data Redis"
 dependencies {
 	api(project(":core:spring-boot"))
 	api(project(":module:spring-boot-data-commons"))
+	api(project(":module:spring-boot-tx"))
 	api("io.lettuce:lettuce-core")
 	api("org.springframework.data:spring-data-redis")
 

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

@@ -27,6 +27,7 @@ description = "Spring Boot Data REST"
 dependencies {
 	api(project(":module:spring-boot-data-commons"))
 	api(project(":module:spring-boot-jackson"))
+	api(project(":module:spring-boot-tx"))
 	api(project(":module:spring-boot-webmvc"))
 	api("org.springframework.data:spring-data-rest-webmvc")
 

module/spring-boot-integration/build.gradle

@@ -25,7 +25,7 @@ plugins {
 description = "Spring Boot Integration"
 
 dependencies {
-	api(project(":core:spring-boot"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.integration:spring-integration-core")
 
 	optional(project(":core:spring-boot-autoconfigure"))

module/spring-boot-pulsar/build.gradle

@@ -26,7 +26,7 @@ plugins {
 description = "Spring Boot Pulsar"
 
 dependencies {
-	api(project(":core:spring-boot"))
+	api(project(":module:spring-boot-tx"))
 	api("org.springframework.pulsar:spring-pulsar")
 
 	optional(project(":core:spring-boot-autoconfigure"))

module/spring-boot-restclient/build.gradle

@@ -26,7 +26,7 @@ description = "Spring Boot RestClient and RestTemplate"
 dependencies {
 	api(project(":core:spring-boot"))
 	api(project(":module:spring-boot-http-client"))
-	
+
 	implementation(project(":module:spring-boot-http-converter"))
 
 	optional(project(":core:spring-boot-autoconfigure"))

platform/spring-boot-dependencies/build.gradle

@@ -2080,7 +2080,9 @@ bom {
 				"spring-boot-starter-aop",
 				"spring-boot-starter-artemis",
 				"spring-boot-starter-batch",
+				"spring-boot-starter-cassandra",
 				"spring-boot-starter-cache",
+				"spring-boot-starter-couchbase",
 				"spring-boot-starter-data-cassandra",
 				"spring-boot-starter-data-cassandra-reactive",
 				"spring-boot-starter-data-couchbase",
@@ -2096,37 +2098,60 @@ bom {
 				"spring-boot-starter-data-redis",
 				"spring-boot-starter-data-redis-reactive",
 				"spring-boot-starter-data-rest",
+				"spring-boot-starter-elasticsearch",
+				"spring-boot-starter-flyway",
 				"spring-boot-starter-freemarker",
 				"spring-boot-starter-graphql",
 				"spring-boot-starter-groovy-templates",
+				"spring-boot-starter-gson",
 				"spring-boot-starter-hateoas",
+				"spring-boot-starter-hazelcast",
 				"spring-boot-starter-integration",
+				"spring-boot-starter-jackson",
 				"spring-boot-starter-jdbc",
 				"spring-boot-starter-jersey",
 				"spring-boot-starter-jetty",
+				"spring-boot-starter-jms",
 				"spring-boot-starter-jooq",
 				"spring-boot-starter-json",
+				"spring-boot-starter-kafka",
+				"spring-boot-starter-ldap",
+				"spring-boot-starter-liquibase",
 				"spring-boot-starter-log4j2",
+				"spring-boot-starter-logback",
 				"spring-boot-starter-logging",
 				"spring-boot-starter-mail",
+				"spring-boot-starter-mongodb",
 				"spring-boot-starter-mustache",
+				"spring-boot-starter-neo4j",
 				"spring-boot-starter-oauth2-authorization-server",
 				"spring-boot-starter-oauth2-client",
 				"spring-boot-starter-oauth2-resource-server",
+				"spring-boot-starter-opentelementy",
 				"spring-boot-starter-pulsar",
 				"spring-boot-starter-pulsar-reactive",
 				"spring-boot-starter-quartz",
+				"spring-boot-starter-r2dbc",
 				"spring-boot-starter-reactor-netty",
+				"spring-boot-starter-restclient",
 				"spring-boot-starter-rsocket",
 				"spring-boot-starter-security",
+				"spring-boot-starter-security-saml2",
+				"spring-boot-starter-sendgrid",
+				"spring-boot-starter-session-data-mongodb",
+				"spring-boot-starter-session-data-redis",
+				"spring-boot-starter-session-hazelcast",
+				"spring-boot-starter-session-jdbc",
 				"spring-boot-starter-test",
 				"spring-boot-starter-thymeleaf",
 				"spring-boot-starter-tomcat",
 				"spring-boot-starter-undertow",
 				"spring-boot-starter-validation",
 				"spring-boot-starter-web",
-				"spring-boot-starter-web-services",
+				"spring-boot-starter-webclient",
 				"spring-boot-starter-webflux",
+				"spring-boot-starter-webmvc",
+				"spring-boot-starter-webservices",
 				"spring-boot-starter-websocket",
 				"spring-boot-test",
 				"spring-boot-test-autoconfigure",

settings.gradle

@@ -178,6 +178,8 @@ include "starter:spring-boot-starter-aop"
 include "starter:spring-boot-starter-artemis"
 include "starter:spring-boot-starter-batch"
 include "starter:spring-boot-starter-cache"
+include "starter:spring-boot-starter-cassandra"
+include "starter:spring-boot-starter-couchbase"
 include "starter:spring-boot-starter-data-cassandra"
 include "starter:spring-boot-starter-data-cassandra-reactive"
 include "starter:spring-boot-starter-data-couchbase"
@@ -193,39 +195,63 @@ include "starter:spring-boot-starter-data-r2dbc"
 include "starter:spring-boot-starter-data-redis"
 include "starter:spring-boot-starter-data-redis-reactive"
 include "starter:spring-boot-starter-data-rest"
+include "starter:spring-boot-starter-elasticsearch"
+include "starter:spring-boot-starter-flyway"
 include "starter:spring-boot-starter-freemarker"
 include "starter:spring-boot-starter-graphql"
 include "starter:spring-boot-starter-groovy-templates"
+include "starter:spring-boot-starter-gson"
 include "starter:spring-boot-starter-hateoas"
+include "starter:spring-boot-starter-hazelcast"
 include "starter:spring-boot-starter-integration"
+include "starter:spring-boot-starter-jackson"
 include "starter:spring-boot-starter-jdbc"
 include "starter:spring-boot-starter-jersey"
 include "starter:spring-boot-starter-jetty"
+include "starter:spring-boot-starter-jms"
 include "starter:spring-boot-starter-jooq"
 include "starter:spring-boot-starter-json"
+include "starter:spring-boot-starter-kafka"
+include "starter:spring-boot-starter-ldap"
+include "starter:spring-boot-starter-liquibase"
 include "starter:spring-boot-starter-log4j2"
+include "starter:spring-boot-starter-logback"
 include "starter:spring-boot-starter-logging"
 include "starter:spring-boot-starter-mail"
+include "starter:spring-boot-starter-mongodb"
 include "starter:spring-boot-starter-mustache"
+include "starter:spring-boot-starter-neo4j"
 include "starter:spring-boot-starter-oauth2-authorization-server"
 include "starter:spring-boot-starter-oauth2-client"
 include "starter:spring-boot-starter-oauth2-resource-server"
+include "starter:spring-boot-starter-opentelemetry"
 include "starter:spring-boot-starter-parent"
 include "starter:spring-boot-starter-pulsar"
 include "starter:spring-boot-starter-pulsar-reactive"
 include "starter:spring-boot-starter-quartz"
+include "starter:spring-boot-starter-r2dbc"
 include "starter:spring-boot-starter-reactor-netty"
+include "starter:spring-boot-starter-restclient"
 include "starter:spring-boot-starter-rsocket"
 include "starter:spring-boot-starter-security"
+include "starter:spring-boot-starter-security-saml2"
+include "starter:spring-boot-starter-sendgrid"
+include "starter:spring-boot-starter-session-data-mongodb"
+include "starter:spring-boot-starter-session-data-redis"
+include "starter:spring-boot-starter-session-hazelcast"
+include "starter:spring-boot-starter-session-jdbc"
 include "starter:spring-boot-starter-test"
 include "starter:spring-boot-starter-thymeleaf"
 include "starter:spring-boot-starter-tomcat"
 include "starter:spring-boot-starter-undertow"
 include "starter:spring-boot-starter-validation"
 include "starter:spring-boot-starter-web"
-include "starter:spring-boot-starter-web-services"
+include "starter:spring-boot-starter-webclient"
 include "starter:spring-boot-starter-webflux"
+include "starter:spring-boot-starter-webmvc"
+include "starter:spring-boot-starter-webservices"
 include "starter:spring-boot-starter-websocket"
+include "starter:spring-boot-starter-zipkin"
 
 include "loader:spring-boot-jarmode-tools"
 include "loader:spring-boot-loader"

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

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

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

@@ -22,7 +22,7 @@ description = "Spring Boot Actuator Extension smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -29,7 +29,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-log4j2"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

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

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

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-jdbc"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-validation"))
 	implementation("io.micrometer:micrometer-tracing-bridge-brave")
 

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

@@ -60,7 +60,7 @@ dependencies {
 
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-cache"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	infinispan(enforcedPlatform(project(":platform:spring-boot-dependencies")))
 	infinispan("javax.cache:cache-api")

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

@@ -22,7 +22,7 @@ description = "Spring Boot Data JDBC smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-data-jdbc"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 

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

@@ -22,7 +22,7 @@ description = "Spring Boot Data JPA smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-data-jpa"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 
 	runtimeOnly("com.h2database:h2")

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

@@ -28,7 +28,7 @@ configurations {
 dependencies {
 	developmentOnly project(":module:spring-boot-devtools")
 
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -23,7 +23,7 @@ description = "Spring Boot Flyway smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-data-jpa"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly(project(":module:spring-boot-flyway"))
 	runtimeOnly("com.h2database:h2")

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

@@ -22,7 +22,7 @@ description = "Spring Boot GraphQL smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-graphql"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-security"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -22,7 +22,7 @@ description = "Spring Boot Hibernate smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-freemarker"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":module:spring-boot-jdbc"))
 	implementation(project(":module:spring-boot-hibernate"))
 	implementation("jakarta.xml.bind:jakarta.xml.bind-api")

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

@@ -29,7 +29,7 @@ configurations {
 dependencies {
 	compileOnly(project(":starter:spring-boot-starter-jetty"))
 
-	implementation(project(":starter:spring-boot-starter-web")) {
+	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 

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

@@ -22,7 +22,7 @@ description = "Spring Boot Jetty SSL smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-jetty"))
-	implementation(project(":starter:spring-boot-starter-web")) {
+	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 

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

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

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

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":module:spring-boot-liquibase"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-jdbc"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 

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

@@ -22,7 +22,7 @@ description = "Spring Boot OAuth2 Client smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-oauth2-client"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")

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

@@ -22,7 +22,7 @@ description = "Spring Boot OAuth2 Resource Server smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-oauth2-resource-server"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("com.squareup.okhttp3:mockwebserver")

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot profile smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

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

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot Quartz smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	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"))

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

@@ -30,7 +30,7 @@ configurations.all {
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":module:spring-boot-security-saml2"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":module:spring-boot-session-hazelcast"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -24,7 +24,7 @@ dependencies {
 	implementation(project(":module:spring-boot-session-jdbc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	runtimeOnly(project(":starter:spring-boot-starter-jdbc"))
 	runtimeOnly("com.h2database:h2")
 

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

@@ -32,5 +32,5 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-data-mongodb"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 }

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

@@ -32,5 +32,5 @@ dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-data-redis"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 }

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

@@ -22,7 +22,7 @@ description = "Spring Boot Test no Mockito smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 

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

@@ -23,7 +23,7 @@ description = "Spring Boot Test smoke test"
 dependencies {
 	implementation(project(":module:spring-boot-restclient"))
 	implementation(project(":starter:spring-boot-starter-data-jpa"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 

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

@@ -27,7 +27,7 @@ configurations {
 }
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	providedRuntime(project(":starter:spring-boot-starter-tomcat"))
 	providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl")

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

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

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot Tomcat SSL smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -29,7 +29,7 @@ configurations.all {
 }
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-actuator"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot Undertow SSL smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web")) {
+	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 	implementation(project(":starter:spring-boot-starter-undertow"))

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot Undertow smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web")) {
+	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 	implementation(project(":starter:spring-boot-starter-undertow"))

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

@@ -27,7 +27,7 @@ configurations {
 }
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web")) {
+	implementation(project(":starter:spring-boot-starter-webmvc")) {
 		exclude module: "spring-boot-starter-tomcat"
 	}
 

smoke-test/spring-boot-smoke-test-web-application-type/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot web application type smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-webflux"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -22,7 +22,7 @@ description = "Spring Boot web FreeMarker smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-freemarker"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -23,6 +23,7 @@ description = "Spring Boot web Groovy Templates smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-groovy-templates"))
 	implementation(project(":starter:spring-boot-starter-validation"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation("jakarta.xml.bind:jakarta.xml.bind-api")
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -27,7 +27,7 @@ configurations {
 }
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	providedRuntime(project(":starter:spring-boot-starter-tomcat"))
 	providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl")

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

@@ -23,7 +23,7 @@ description = "Spring Boot web method security smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-actuator"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -22,7 +22,7 @@ description = "Spring Boot web Mustache smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-mustache"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 }

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

@@ -22,7 +22,7 @@ description = "Spring Boot web secure custom smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")

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

@@ -23,7 +23,7 @@ description = "Spring Boot web secure JDBC smoke test"
 dependencies {
 	implementation(project(":starter:spring-boot-starter-jdbc"))
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	runtimeOnly("com.h2database:h2")
 

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

@@ -22,7 +22,7 @@ description = "Spring Boot web secure smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-security"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")

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

@@ -27,7 +27,7 @@ configurations {
 }
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 
 	providedRuntime( project(":starter:spring-boot-starter-tomcat"))
 

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

@@ -22,7 +22,7 @@ description = "Spring Boot web Thymeleaf smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-thymeleaf"))
-	implementation(project(":starter:spring-boot-starter-web"))
+	implementation(project(":starter:spring-boot-starter-webmvc"))
 	implementation(project(":starter:spring-boot-starter-validation"))
 
 	testImplementation(project(":starter:spring-boot-starter-test"))

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

@@ -21,7 +21,7 @@ plugins {
 description = "Spring Boot Web Services smoke test"
 
 dependencies {
-	implementation(project(":starter:spring-boot-starter-web-services"))
+	implementation(project(":starter:spring-boot-starter-webservices"))
 	implementation("org.jdom:jdom2")
 
 	runtimeOnly("jaxen:jaxen")

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for JMS messaging using Apache ActiveMQ"
+description = "Starter for using Apache ActiveMQ and JMS"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-jms"))
+
 	api(project(":module:spring-boot-activemq"))
-	api(project(":starter:spring-boot-starter"))
 }

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

@@ -21,11 +21,13 @@ plugins {
 description = "Starter for using Spring Boot's Actuator which provides production ready features to help you monitor and manage your application"
 
 dependencies {
+	api(project(":starter:spring-boot-starter"))
+
 	api(project(":module:spring-boot-actuator-autoconfigure"))
 	api(project(":module:spring-boot-health"))
 	api(project(":module:spring-boot-metrics"))
 	api(project(":module:spring-boot-tracing"))
-	api(project(":starter:spring-boot-starter"))
+
 	api("io.micrometer:micrometer-observation")
 	api("io.micrometer:micrometer-jakarta9")
 }

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

@@ -21,6 +21,7 @@ plugins {
 description = "Starter for using Spring AMQP and Rabbit MQ"
 
 dependencies {
-	api(project(":module:spring-boot-amqp"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-amqp"))
 }

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

@@ -22,6 +22,7 @@ description = "Starter for aspect-oriented programming with Spring AOP and Aspec
 
 dependencies {
 	api(project(":starter:spring-boot-starter"))
+
 	api("org.springframework:spring-aop")
 	api("org.aspectj:aspectjweaver")
 }

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for JMS messaging using Apache Artemis"
+description = "Starter for Apache Artemis and JMS"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-jms"))
+
 	api(project(":module:spring-boot-artemis"))
-	api(project(":starter:spring-boot-starter"))
 }

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

@@ -21,6 +21,7 @@ plugins {
 description = "Starter for using Spring Batch"
 
 dependencies {
-	api(project(":module:spring-boot-batch"))
 	api(project(":starter:spring-boot-starter-jdbc"))
+
+	api(project(":module:spring-boot-batch"))
 }

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for using Spring Framework's caching support"
+description = "Starter for using Spring's caching support"
 
 dependencies {
-	api(project(":module:spring-boot-cache"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-cache"))
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Cassandra distributed database"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-cassandra"))
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Couchbase document-oriented database"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-couchbase"))
+}

starter/spring-boot-starter-data-cassandra-reactive/build.gradle

@@ -21,8 +21,8 @@ plugins {
 description = "Starter for using Cassandra distributed database and Spring Data Cassandra Reactive"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-cassandra"))
+
 	api(project(":module:spring-boot-data-cassandra"))
 	api(project(":module:spring-boot-reactor"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-cassandra/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Cassandra distributed database and Spring Data Cassandra"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-cassandra"))
+
 	api(project(":module:spring-boot-data-cassandra"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-couchbase-reactive/build.gradle

@@ -21,8 +21,8 @@ plugins {
 description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase Reactive"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-couchbase"))
+
 	api(project(":module:spring-boot-data-couchbase"))
 	api(project(":module:spring-boot-reactor"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-couchbase/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-couchbase"))
+
 	api(project(":module:spring-boot-data-couchbase"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-elasticsearch/build.gradle

@@ -21,9 +21,9 @@ plugins {
 description = "Starter for using Elasticsearch search and analytics engine and Spring Data Elasticsearch"
 
 dependencies {
-	api(project(":module:spring-boot-data-elasticsearch"))
+	api(project(":starter:spring-boot-starter-elasticsearch"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 
-	runtimeOnly(project(":starter:spring-boot-starter-json"))
+	api(project(":module:spring-boot-data-elasticsearch"))
+
+	runtimeOnly(project(":starter:spring-boot-starter-jackson"))
 }

starter/spring-boot-starter-data-jdbc/build.gradle

@@ -21,6 +21,7 @@ plugins {
 description = "Starter for using Spring Data JDBC"
 
 dependencies {
-	api(project(":module:spring-boot-data-jdbc"))
 	api(project(":starter:spring-boot-starter-jdbc"))
+
+	api(project(":module:spring-boot-data-jdbc"))
 }

starter/spring-boot-starter-data-jpa/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Spring Data JPA with Hibernate"
 
 dependencies {
-	api(project(":module:spring-boot-data-jpa"))
-	api(project(":starter:spring-boot-starter"))
 	api(project(":starter:spring-boot-starter-jdbc"))
+
+	api(project(":module:spring-boot-data-jpa"))
 }

starter/spring-boot-starter-data-ldap/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Spring Data LDAP"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-ldap"))
+
 	api(project(":module:spring-boot-data-ldap"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-mongodb-reactive/build.gradle

@@ -21,9 +21,10 @@ plugins {
 description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB Reactive"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-mongodb"))
+
 	api(project(":module:spring-boot-data-mongodb"))
 	api(project(":module:spring-boot-reactor"))
-	api(project(":module:spring-boot-tx"))
+
-	api(project(":starter:spring-boot-starter"))
 	api("org.mongodb:mongodb-driver-reactivestreams")
 }

starter/spring-boot-starter-data-mongodb/build.gradle

@@ -21,8 +21,7 @@ plugins {
 description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-mongodb"))
+
 	api(project(":module:spring-boot-data-mongodb"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
-	api("org.mongodb:mongodb-driver-sync")
 }

starter/spring-boot-starter-data-neo4j/build.gradle

@@ -21,6 +21,7 @@ plugins {
 description = "Starter for using Neo4j graph database and Spring Data Neo4j"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-neo4j"))
+
 	api(project(":module:spring-boot-data-neo4j"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-r2dbc/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Spring Data R2DBC"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-r2dbc"))
+
 	api(project(":module:spring-boot-data-r2dbc"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-redis-reactive/build.gradle

@@ -21,8 +21,8 @@ plugins {
 description = "Starter for using Redis key-value data store with Spring Data Redis reactive and the Lettuce client"
 
 dependencies {
+	api(project(":starter:spring-boot-starter"))
+
 	api(project(":module:spring-boot-data-redis"))
 	api(project(":module:spring-boot-reactor"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter"))
 }

starter/spring-boot-starter-data-redis/build.gradle

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Redis key-value data store with Spring Data Redis and the Lettuce client"
 
 dependencies {
-	api(project(":module:spring-boot-data-redis"))
-	api(project(":module:spring-boot-tx"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-data-redis"))
 }

starter/spring-boot-starter-data-rest/build.gradle

@@ -21,8 +21,7 @@ plugins {
 description = "Starter for exposing Spring Data repositories over REST using Spring Data REST and Spring MVC"
 
 dependencies {
-	api(project(":module:spring-boot-data-commons"))
+	api(project(":starter:spring-boot-starter-webmvc"))
+
 	api(project(":module:spring-boot-data-rest"))
-	api(project(":module:spring-boot-tx"))
-	api(project(":starter:spring-boot-starter-web"))
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Elasticsearch search and analytics engine"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-elasticsearch"))
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Flyway database migrations"
+
+dependencies {
+	api(project(":starter:spring-boot-starter-jdbc"))
+
+	api(project(":module:spring-boot-flyway"))
+}

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for building MVC web applications using FreeMarker views"
+description = "Starter for using FreeMarker"
 
 dependencies {
-	api(project(":module:spring-boot-freemarker"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-freemarker"))
 }

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

@@ -18,10 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for building GraphQL applications with Spring GraphQL"
+description = "Starter using Spring GraphQL"
 
 dependencies {
-	api(project(":module:spring-boot-graphql"))
-	api(project(":starter:spring-boot-starter"))
 	api(project(":starter:spring-boot-starter-json"))
+
+	api(project(":module:spring-boot-graphql"))
 }

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for building MVC web applications using Groovy Templates views"
+description = "Starter for using Groovy Templates"
 
 dependencies {
+	api(project(":starter:spring-boot-starter"))
+
 	api(project(":module:spring-boot-groovy-templates"))
-	api(project(":starter:spring-boot-starter-web"))
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using GSON"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-gson"))
+}

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

@@ -18,9 +18,10 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for building hypermedia-based RESTful web application with Spring MVC and Spring HATEOAS"
+description = "Starter for using Spring HATEOS to build hypermedia-based RESTful Spring MVC web applications"
 
 dependencies {
+	api(project(":starter:spring-boot-starter-webmvc"))
+
 	api(project(":module:spring-boot-hateoas"))
-	api(project(":starter:spring-boot-starter-web"))
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Hazelcast"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-hazelcast"))
+}

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

@@ -21,7 +21,7 @@ plugins {
 description = "Starter for using Spring Integration"
 
 dependencies {
-	api(project(":module:spring-boot-integration"))
-	api(project(":module:spring-boot-tx"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-integration"))
 }

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+	id "org.springframework.boot.starter"
+}
+
+description = "Starter for using Jackson"
+
+dependencies {
+	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-jackson"))
+
+	api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
+	api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	api("com.fasterxml.jackson.module:jackson-module-parameter-names")
+}

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

@@ -21,8 +21,9 @@ plugins {
 description = "Starter for using JDBC with the HikariCP connection pool"
 
 dependencies {
-	api(project(":module:spring-boot-jdbc"))
-	api(project(":module:spring-boot-tx"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-jdbc"))
+
 	api("com.zaxxer:HikariCP")
 }

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

@@ -18,13 +18,15 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for building RESTful web applications using JAX-RS and Jersey. An alternative to spring-boot-starter-web"
+description = "Starter for using JAX-RS and Jersey"
 
 dependencies {
-	api(project(":module:spring-boot-jersey"))
 	api(project(":starter:spring-boot-starter-json"))
 	api(project(":starter:spring-boot-starter-tomcat"))
 	api(project(":starter:spring-boot-starter-validation"))
+
+	api(project(":module:spring-boot-jersey"))
+
 	api("org.glassfish.jersey.ext:jersey-bean-validation") {
 		exclude group: "jakarta.el", module: "jakarta.el-api"
 	}

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

@@ -18,11 +18,13 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for using Jetty as the embedded servlet container. An alternative to spring-boot-starter-tomcat"
+description = "Starter for using Jetty as the embedded servlet container"
 
 dependencies {
-	api(project(":module:spring-boot-jetty"))
 	api(project(":starter:spring-boot-starter"))
+
+	api(project(":module:spring-boot-jetty"))
+
 	api("jakarta.servlet:jakarta.servlet-api")
 	api("jakarta.websocket:jakarta.websocket-api")
 	api("jakarta.websocket:jakarta.websocket-client-api")