From 5e90415880fb0059d60baed32870221d3ca49e8a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 22 Jul 2025 11:24:46 +0100 Subject: [PATCH] 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 | 2 +- .../build.gradle | 2 +- .../spring-boot-data-cassandra/build.gradle | 4 +-- module/spring-boot-data-commons/build.gradle | 3 +- .../spring-boot-data-couchbase/build.gradle | 1 + .../build.gradle | 1 + module/spring-boot-data-jpa/build.gradle | 1 + module/spring-boot-data-ldap/build.gradle | 1 + module/spring-boot-data-mongodb/build.gradle | 2 +- module/spring-boot-data-redis/build.gradle | 1 + module/spring-boot-data-rest/build.gradle | 1 + module/spring-boot-integration/build.gradle | 2 +- module/spring-boot-pulsar/build.gradle | 2 +- module/spring-boot-restclient/build.gradle | 2 +- .../spring-boot-dependencies/build.gradle | 27 +++++++++++++- settings.gradle | 28 ++++++++++++++- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-smoke-test-cache/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-smoke-test-jetty/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-smoke-test-test/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-smoke-test-war/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 1 + .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-activemq/build.gradle | 5 +-- .../spring-boot-starter-actuator/build.gradle | 4 ++- starter/spring-boot-starter-amqp/build.gradle | 3 +- starter/spring-boot-starter-aop/build.gradle | 1 + .../spring-boot-starter-artemis/build.gradle | 5 +-- .../spring-boot-starter-batch/build.gradle | 3 +- .../spring-boot-starter-cache/build.gradle | 5 +-- .../build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ .../build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 8 ++--- .../build.gradle | 3 +- .../spring-boot-starter-data-jpa/build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 5 +-- .../build.gradle | 5 ++- .../build.gradle | 3 +- .../build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 4 +-- .../build.gradle | 5 ++- .../build.gradle | 27 ++++++++++++++ .../spring-boot-starter-flyway/build.gradle | 27 ++++++++++++++ .../build.gradle | 5 +-- .../spring-boot-starter-graphql/build.gradle | 6 ++-- .../build.gradle | 5 +-- starter/spring-boot-starter-gson/build.gradle | 27 ++++++++++++++ .../spring-boot-starter-hateoas/build.gradle | 5 +-- .../build.gradle | 27 ++++++++++++++ .../build.gradle | 4 +-- .../spring-boot-starter-jackson/build.gradle | 31 ++++++++++++++++ starter/spring-boot-starter-jdbc/build.gradle | 5 +-- .../spring-boot-starter-jersey/build.gradle | 6 ++-- .../spring-boot-starter-jetty/build.gradle | 6 ++-- starter/spring-boot-starter-jms/build.gradle | 27 ++++++++++++++ starter/spring-boot-starter-jooq/build.gradle | 5 +-- starter/spring-boot-starter-json/build.gradle | 10 ++---- .../spring-boot-starter-kafka/build.gradle | 27 ++++++++++++++ starter/spring-boot-starter-ldap/build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ .../spring-boot-starter-log4j2/build.gradle | 2 +- .../spring-boot-starter-logback/build.gradle | 27 ++++++++++++++ .../spring-boot-starter-logging/build.gradle | 6 ++-- starter/spring-boot-starter-mail/build.gradle | 1 + .../spring-boot-starter-mongodb/build.gradle | 29 +++++++++++++++ .../spring-boot-starter-mustache/build.gradle | 5 +-- .../spring-boot-starter-neo4j/build.gradle | 27 ++++++++++++++ .../build.gradle | 5 +-- .../build.gradle | 4 ++- .../build.gradle | 3 +- .../build.gradle | 27 ++++++++++++++ .../build.gradle | 4 +-- .../spring-boot-starter-pulsar/build.gradle | 4 +-- .../spring-boot-starter-quartz/build.gradle | 4 +-- .../spring-boot-starter-r2dbc/build.gradle | 27 ++++++++++++++ .../build.gradle | 5 +-- .../build.gradle | 27 ++++++++++++++ .../spring-boot-starter-rsocket/build.gradle | 5 +-- .../build.gradle | 35 +++++++++++++++++++ .../spring-boot-starter-security/build.gradle | 4 ++- .../spring-boot-starter-sendgrid/build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ .../build.gradle | 27 ++++++++++++++ starter/spring-boot-starter-test/build.gradle | 5 ++- .../build.gradle | 5 +-- .../spring-boot-starter-tomcat/build.gradle | 6 ++-- .../spring-boot-starter-undertow/build.gradle | 6 ++-- .../build.gradle | 3 +- starter/spring-boot-starter-web/build.gradle | 6 +--- .../build.gradle | 29 +++++++++++++++ .../spring-boot-starter-webflux/build.gradle | 6 ++-- .../spring-boot-starter-webmvc/build.gradle | 29 +++++++++++++++ .../build.gradle | 4 ++- .../build.gradle | 3 +- .../spring-boot-starter-zipkin/build.gradle | 27 ++++++++++++++ starter/spring-boot-starter/build.gradle | 6 ++-- .../build.gradle | 2 +- .../build.gradle | 2 +- 146 files changed, 976 insertions(+), 171 deletions(-) create mode 100644 starter/spring-boot-starter-cassandra/build.gradle create mode 100644 starter/spring-boot-starter-couchbase/build.gradle create mode 100644 starter/spring-boot-starter-elasticsearch/build.gradle create mode 100644 starter/spring-boot-starter-flyway/build.gradle create mode 100644 starter/spring-boot-starter-gson/build.gradle create mode 100644 starter/spring-boot-starter-hazelcast/build.gradle create mode 100644 starter/spring-boot-starter-jackson/build.gradle create mode 100644 starter/spring-boot-starter-jms/build.gradle create mode 100644 starter/spring-boot-starter-kafka/build.gradle create mode 100644 starter/spring-boot-starter-ldap/build.gradle create mode 100644 starter/spring-boot-starter-liquibase/build.gradle create mode 100644 starter/spring-boot-starter-logback/build.gradle create mode 100644 starter/spring-boot-starter-mongodb/build.gradle create mode 100644 starter/spring-boot-starter-neo4j/build.gradle create mode 100644 starter/spring-boot-starter-opentelemetry/build.gradle create mode 100644 starter/spring-boot-starter-r2dbc/build.gradle create mode 100644 starter/spring-boot-starter-restclient/build.gradle create mode 100644 starter/spring-boot-starter-security-saml2/build.gradle create mode 100644 starter/spring-boot-starter-sendgrid/build.gradle create mode 100644 starter/spring-boot-starter-session-data-mongodb/build.gradle create mode 100644 starter/spring-boot-starter-session-data-redis/build.gradle create mode 100644 starter/spring-boot-starter-session-hazelcast/build.gradle create mode 100644 starter/spring-boot-starter-session-jdbc/build.gradle create mode 100644 starter/spring-boot-starter-webclient/build.gradle create mode 100644 starter/spring-boot-starter-webmvc/build.gradle rename starter/{spring-boot-starter-web-services => spring-boot-starter-webservices}/build.gradle (94%) create mode 100644 starter/spring-boot-starter-zipkin/build.gradle diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index 64b9f8a93f7..2aea0f47ca2 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/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") diff --git a/integration-test/spring-boot-sni-integration-tests/build.gradle b/integration-test/spring-boot-sni-integration-tests/build.gradle index 6d44ec95e37..9318080e804 100644 --- a/integration-test/spring-boot-sni-integration-tests/build.gradle +++ b/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") diff --git a/module/spring-boot-data-cassandra/build.gradle b/module/spring-boot-data-cassandra/build.gradle index 33217aa0cbc..4c57667c70f 100644 --- a/module/spring-boot-data-cassandra/build.gradle +++ b/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") { - exclude group: "org.slf4j", module: "jcl-over-slf4j" - } + api("org.springframework.data:spring-data-cassandra") optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-reactor")) diff --git a/module/spring-boot-data-commons/build.gradle b/module/spring-boot-data-commons/build.gradle index e79c1ed4fb4..92c60680bd6 100644 --- a/module/spring-boot-data-commons/build.gradle +++ b/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")) diff --git a/module/spring-boot-data-couchbase/build.gradle b/module/spring-boot-data-couchbase/build.gradle index 14ea229e72b..94732958ba3 100644 --- a/module/spring-boot-data-couchbase/build.gradle +++ b/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")) diff --git a/module/spring-boot-data-elasticsearch/build.gradle b/module/spring-boot-data-elasticsearch/build.gradle index 3d45ea1880c..0a358304f5e 100644 --- a/module/spring-boot-data-elasticsearch/build.gradle +++ b/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")) diff --git a/module/spring-boot-data-jpa/build.gradle b/module/spring-boot-data-jpa/build.gradle index d359544d4c4..94870cf4716 100644 --- a/module/spring-boot-data-jpa/build.gradle +++ b/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"))) diff --git a/module/spring-boot-data-ldap/build.gradle b/module/spring-boot-data-ldap/build.gradle index b5b54ada0e8..eda46105666 100644 --- a/module/spring-boot-data-ldap/build.gradle +++ b/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")) diff --git a/module/spring-boot-data-mongodb/build.gradle b/module/spring-boot-data-mongodb/build.gradle index 78f9e7c4c00..0acd10980e8 100644 --- a/module/spring-boot-data-mongodb/build.gradle +++ b/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") diff --git a/module/spring-boot-data-redis/build.gradle b/module/spring-boot-data-redis/build.gradle index 61bad09f3e1..28b566304df 100644 --- a/module/spring-boot-data-redis/build.gradle +++ b/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") diff --git a/module/spring-boot-data-rest/build.gradle b/module/spring-boot-data-rest/build.gradle index 6390522a663..f68814f360b 100644 --- a/module/spring-boot-data-rest/build.gradle +++ b/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") diff --git a/module/spring-boot-integration/build.gradle b/module/spring-boot-integration/build.gradle index 371754e7fc3..4305a9c7bfb 100644 --- a/module/spring-boot-integration/build.gradle +++ b/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")) diff --git a/module/spring-boot-pulsar/build.gradle b/module/spring-boot-pulsar/build.gradle index 98cd6b8342b..81382c4d72f 100644 --- a/module/spring-boot-pulsar/build.gradle +++ b/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")) diff --git a/module/spring-boot-restclient/build.gradle b/module/spring-boot-restclient/build.gradle index 9b46728c236..35d3638d7fc 100644 --- a/module/spring-boot-restclient/build.gradle +++ b/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")) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index a4e3cff53ec..5a2d819a176 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/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", diff --git a/settings.gradle b/settings.gradle index 17162136dc0..e64cba20aff 100644 --- a/settings.gradle +++ b/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" diff --git a/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle index d7edc7379d2..46cdbf1feea 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle index e32c32725a5..c1f1112d055 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle +++ b/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")) } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-actuator-log4j2/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-log4j2/build.gradle index 84bbdb52b24..b3c21152168 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-log4j2/build.gradle +++ b/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")) } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle index fc68d5c01e8..bd691a9c6e3 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle +++ b/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")) } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-actuator/build.gradle b/smoke-test/spring-boot-smoke-test-actuator/build.gradle index 96031a24be0..3b0bdd9caf9 100644 --- a/smoke-test/spring-boot-smoke-test-actuator/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-cache/build.gradle b/smoke-test/spring-boot-smoke-test-cache/build.gradle index bada4c4cd78..a2566d53c7a 100644 --- a/smoke-test/spring-boot-smoke-test-cache/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-data-jdbc/build.gradle b/smoke-test/spring-boot-smoke-test-data-jdbc/build.gradle index fd58bb2f612..0a9b52e031e 100644 --- a/smoke-test/spring-boot-smoke-test-data-jdbc/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-data-jpa/build.gradle b/smoke-test/spring-boot-smoke-test-data-jpa/build.gradle index d4c8d55f512..720b6d5291f 100644 --- a/smoke-test/spring-boot-smoke-test-data-jpa/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-devtools/build.gradle b/smoke-test/spring-boot-smoke-test-devtools/build.gradle index 3fd729bf88f..c89a5acd63e 100644 --- a/smoke-test/spring-boot-smoke-test-devtools/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-flyway/build.gradle b/smoke-test/spring-boot-smoke-test-flyway/build.gradle index 417a56d4b2c..3681a190741 100644 --- a/smoke-test/spring-boot-smoke-test-flyway/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-graphql/build.gradle b/smoke-test/spring-boot-smoke-test-graphql/build.gradle index 26966f511d7..3abeb6cd928 100644 --- a/smoke-test/spring-boot-smoke-test-graphql/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-hibernate/build.gradle b/smoke-test/spring-boot-smoke-test-hibernate/build.gradle index 034ef28dab9..562aa2e5457 100644 --- a/smoke-test/spring-boot-smoke-test-hibernate/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle index 5ebff34cfb1..f4a2cf5696e 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle +++ b/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" } diff --git a/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle index a6bca3db2e8..124e681f55f 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle +++ b/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" } diff --git a/smoke-test/spring-boot-smoke-test-jetty/build.gradle b/smoke-test/spring-boot-smoke-test-jetty/build.gradle index 962a4d895da..f1cb4f35b51 100644 --- a/smoke-test/spring-boot-smoke-test-jetty/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-liquibase/build.gradle b/smoke-test/spring-boot-smoke-test-liquibase/build.gradle index 74b6017109c..dba44c04f7b 100644 --- a/smoke-test/spring-boot-smoke-test-liquibase/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle b/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle index 87a0afd39f1..cb0035428aa 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle b/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle index eb3366c121c..9df202da9ac 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-profile/build.gradle b/smoke-test/spring-boot-smoke-test-profile/build.gradle index 04f44328780..a4777174ff8 100644 --- a/smoke-test/spring-boot-smoke-test-profile/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-prometheus/build.gradle b/smoke-test/spring-boot-smoke-test-prometheus/build.gradle index c7a5477cb65..af5deeb8549 100644 --- a/smoke-test/spring-boot-smoke-test-prometheus/build.gradle +++ b/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') diff --git a/smoke-test/spring-boot-smoke-test-quartz/build.gradle b/smoke-test/spring-boot-smoke-test-quartz/build.gradle index f0d14cdb030..4186cdd69a5 100644 --- a/smoke-test/spring-boot-smoke-test-quartz/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle b/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle index 8f7c11582d4..9cc665bfc3e 100644 --- a/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle b/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle index b568c92af12..fa12b83db5b 100644 --- a/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle b/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle index c13cb094754..66c22365029 100644 --- a/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/build.gradle b/smoke-test/spring-boot-smoke-test-session-mongo/build.gradle index 55f19593fa7..7fa99ca1901 100644 --- a/smoke-test/spring-boot-smoke-test-session-mongo/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-session-redis/build.gradle b/smoke-test/spring-boot-smoke-test-session-redis/build.gradle index 1c5139ae797..81cd415fc44 100644 --- a/smoke-test/spring-boot-smoke-test-session-redis/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-test-nomockito/build.gradle b/smoke-test/spring-boot-smoke-test-test-nomockito/build.gradle index 84b2e8dc060..a5decdf8cec 100644 --- a/smoke-test/spring-boot-smoke-test-test-nomockito/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-test/build.gradle b/smoke-test/spring-boot-smoke-test-test/build.gradle index 4b62a504f10..912ba082c9e 100644 --- a/smoke-test/spring-boot-smoke-test-test/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle index 4cb48a27ceb..f3da4014e5a 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle index f847f4f257e..1af3f953315 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle index fe238dba91b..beab0607b6b 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-tomcat11-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat11-ssl/build.gradle index 42d583f92ce..19ae3ff565a 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat11-ssl/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-undertow-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-undertow-ssl/build.gradle index a1259c91170..647e9a8dc39 100644 --- a/smoke-test/spring-boot-smoke-test-undertow-ssl/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-undertow/build.gradle b/smoke-test/spring-boot-smoke-test-undertow/build.gradle index 24d58df2dac..5b53abe0fab 100644 --- a/smoke-test/spring-boot-smoke-test-undertow/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-war/build.gradle b/smoke-test/spring-boot-smoke-test-war/build.gradle index 8eea270c0d8..7f4d213a49b 100644 --- a/smoke-test/spring-boot-smoke-test-war/build.gradle +++ b/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" } diff --git a/smoke-test/spring-boot-smoke-test-web-application-type/build.gradle b/smoke-test/spring-boot-smoke-test-web-application-type/build.gradle index 37c4bed32e6..3d40e01d4a7 100644 --- a/smoke-test/spring-boot-smoke-test-web-application-type/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle b/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle index a89c6961812..d8c63cbd3a1 100644 --- a/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle b/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle index 87cc87a31bc..b22ee57377a 100644 --- a/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle index 8755eda89c4..003c2d3fd20 100644 --- a/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle b/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle index 753290b4712..12c16125749 100644 --- a/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle b/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle index ed7f22bbf76..f2869cf744a 100644 --- a/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle +++ b/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")) } diff --git a/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle index 31e788f1ea1..82c1c322766 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle index 37ec740b2e9..9cddd70693b 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-web-secure/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure/build.gradle index d8303ab6b2e..109c36c516e 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/build.gradle +++ b/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") diff --git a/smoke-test/spring-boot-smoke-test-web-static/build.gradle b/smoke-test/spring-boot-smoke-test-web-static/build.gradle index 994b559c94a..d508abda5cb 100644 --- a/smoke-test/spring-boot-smoke-test-web-static/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle b/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle index 17ba32a6434..226e2ee75d9 100644 --- a/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle +++ b/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")) diff --git a/smoke-test/spring-boot-smoke-test-webservices/build.gradle b/smoke-test/spring-boot-smoke-test-webservices/build.gradle index d1d37f07970..3714ef97fc2 100644 --- a/smoke-test/spring-boot-smoke-test-webservices/build.gradle +++ b/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") diff --git a/starter/spring-boot-starter-activemq/build.gradle b/starter/spring-boot-starter-activemq/build.gradle index 7a4531b44a8..2e7dd65d607 100644 --- a/starter/spring-boot-starter-activemq/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-actuator/build.gradle b/starter/spring-boot-starter-actuator/build.gradle index 8105a6a6e7c..9be1981a380 100644 --- a/starter/spring-boot-starter-actuator/build.gradle +++ b/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") } diff --git a/starter/spring-boot-starter-amqp/build.gradle b/starter/spring-boot-starter-amqp/build.gradle index cbf623fe290..bd8d7c906e1 100644 --- a/starter/spring-boot-starter-amqp/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-aop/build.gradle b/starter/spring-boot-starter-aop/build.gradle index f72a39acf6b..076b60b883e 100644 --- a/starter/spring-boot-starter-aop/build.gradle +++ b/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") } diff --git a/starter/spring-boot-starter-artemis/build.gradle b/starter/spring-boot-starter-artemis/build.gradle index 84056becdd0..296e59c728c 100644 --- a/starter/spring-boot-starter-artemis/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-batch/build.gradle b/starter/spring-boot-starter-batch/build.gradle index a0b2ae204e6..fe449e1ae96 100644 --- a/starter/spring-boot-starter-batch/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-cache/build.gradle b/starter/spring-boot-starter-cache/build.gradle index 26446dd0267..ba759f00a25 100644 --- a/starter/spring-boot-starter-cache/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-cassandra/build.gradle b/starter/spring-boot-starter-cassandra/build.gradle new file mode 100644 index 00000000000..209c66a6343 --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-couchbase/build.gradle b/starter/spring-boot-starter-couchbase/build.gradle new file mode 100644 index 00000000000..8f8861a8a40 --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-data-cassandra-reactive/build.gradle b/starter/spring-boot-starter-data-cassandra-reactive/build.gradle index 97e7e6b5bae..5a37f2833f5 100644 --- a/starter/spring-boot-starter-data-cassandra-reactive/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-cassandra/build.gradle b/starter/spring-boot-starter-data-cassandra/build.gradle index f8dbc515dd5..765226b4ad1 100644 --- a/starter/spring-boot-starter-data-cassandra/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-couchbase-reactive/build.gradle b/starter/spring-boot-starter-data-couchbase-reactive/build.gradle index 7ea5c5a5906..e9b6772773c 100644 --- a/starter/spring-boot-starter-data-couchbase-reactive/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-couchbase/build.gradle b/starter/spring-boot-starter-data-couchbase/build.gradle index bd68132ad71..970176741e3 100644 --- a/starter/spring-boot-starter-data-couchbase/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-elasticsearch/build.gradle b/starter/spring-boot-starter-data-elasticsearch/build.gradle index 0b0cd0d7f3f..d7694b5cfdb 100644 --- a/starter/spring-boot-starter-data-elasticsearch/build.gradle +++ b/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(":module:spring-boot-tx")) - api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-elasticsearch")) - runtimeOnly(project(":starter:spring-boot-starter-json")) + api(project(":module:spring-boot-data-elasticsearch")) + + runtimeOnly(project(":starter:spring-boot-starter-jackson")) } diff --git a/starter/spring-boot-starter-data-jdbc/build.gradle b/starter/spring-boot-starter-data-jdbc/build.gradle index 3178e000ee0..2ee20886257 100644 --- a/starter/spring-boot-starter-data-jdbc/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-jpa/build.gradle b/starter/spring-boot-starter-data-jpa/build.gradle index 728a9c78299..f030cbb1fb9 100644 --- a/starter/spring-boot-starter-data-jpa/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-ldap/build.gradle b/starter/spring-boot-starter-data-ldap/build.gradle index ab82a9083a9..4cbff161451 100644 --- a/starter/spring-boot-starter-data-ldap/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-mongodb-reactive/build.gradle b/starter/spring-boot-starter-data-mongodb-reactive/build.gradle index 29b5afd4819..e328eb102dd 100644 --- a/starter/spring-boot-starter-data-mongodb-reactive/build.gradle +++ b/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") } diff --git a/starter/spring-boot-starter-data-mongodb/build.gradle b/starter/spring-boot-starter-data-mongodb/build.gradle index c8dcebb8340..0c8c0294658 100644 --- a/starter/spring-boot-starter-data-mongodb/build.gradle +++ b/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") } diff --git a/starter/spring-boot-starter-data-neo4j/build.gradle b/starter/spring-boot-starter-data-neo4j/build.gradle index 87442fd8377..53689c02b63 100644 --- a/starter/spring-boot-starter-data-neo4j/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-r2dbc/build.gradle b/starter/spring-boot-starter-data-r2dbc/build.gradle index 2160d079dc8..247d5699db4 100644 --- a/starter/spring-boot-starter-data-r2dbc/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-redis-reactive/build.gradle b/starter/spring-boot-starter-data-redis-reactive/build.gradle index 566ae2a1948..2632fc8b795 100644 --- a/starter/spring-boot-starter-data-redis-reactive/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-redis/build.gradle b/starter/spring-boot-starter-data-redis/build.gradle index 30c359add23..06f6436c4a8 100644 --- a/starter/spring-boot-starter-data-redis/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-data-rest/build.gradle b/starter/spring-boot-starter-data-rest/build.gradle index 4355cfbdce5..2ccb92931d9 100644 --- a/starter/spring-boot-starter-data-rest/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-elasticsearch/build.gradle b/starter/spring-boot-starter-elasticsearch/build.gradle new file mode 100644 index 00000000000..737e82723fa --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-flyway/build.gradle b/starter/spring-boot-starter-flyway/build.gradle new file mode 100644 index 00000000000..767c072f010 --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-freemarker/build.gradle b/starter/spring-boot-starter-freemarker/build.gradle index 16d09f9214e..09f6a737c34 100644 --- a/starter/spring-boot-starter-freemarker/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-graphql/build.gradle b/starter/spring-boot-starter-graphql/build.gradle index da30e8ba537..5e35ce921ec 100644 --- a/starter/spring-boot-starter-graphql/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-groovy-templates/build.gradle b/starter/spring-boot-starter-groovy-templates/build.gradle index aa4d6f4ed61..5e4d3a33fb9 100644 --- a/starter/spring-boot-starter-groovy-templates/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-gson/build.gradle b/starter/spring-boot-starter-gson/build.gradle new file mode 100644 index 00000000000..9e3adf53865 --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-hateoas/build.gradle b/starter/spring-boot-starter-hateoas/build.gradle index e23ff6fb711..a81746c1a21 100644 --- a/starter/spring-boot-starter-hateoas/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-hazelcast/build.gradle b/starter/spring-boot-starter-hazelcast/build.gradle new file mode 100644 index 00000000000..6fc5d20f84f --- /dev/null +++ b/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")) +} diff --git a/starter/spring-boot-starter-integration/build.gradle b/starter/spring-boot-starter-integration/build.gradle index be84c34bd0d..efe1e966ab4 100644 --- a/starter/spring-boot-starter-integration/build.gradle +++ b/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")) } diff --git a/starter/spring-boot-starter-jackson/build.gradle b/starter/spring-boot-starter-jackson/build.gradle new file mode 100644 index 00000000000..69363ab9dee --- /dev/null +++ b/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") +} diff --git a/starter/spring-boot-starter-jdbc/build.gradle b/starter/spring-boot-starter-jdbc/build.gradle index 3e8efbbd316..4996055226e 100644 --- a/starter/spring-boot-starter-jdbc/build.gradle +++ b/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") } diff --git a/starter/spring-boot-starter-jersey/build.gradle b/starter/spring-boot-starter-jersey/build.gradle index 7a9a84623bf..0973f7264d4 100644 --- a/starter/spring-boot-starter-jersey/build.gradle +++ b/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" } diff --git a/starter/spring-boot-starter-jetty/build.gradle b/starter/spring-boot-starter-jetty/build.gradle index 28a2ae2de41..980e59dfa8e 100644 --- a/starter/spring-boot-starter-jetty/build.gradle +++ b/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") diff --git a/starter/spring-boot-starter-jms/build.gradle b/starter/spring-boot-starter-jms/build.gradle new file mode 100644 index 00000000000..877f26b1955 --- /dev/null +++ b/starter/spring-boot-starter-jms/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 JMS" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-jms")) +} diff --git a/starter/spring-boot-starter-jooq/build.gradle b/starter/spring-boot-starter-jooq/build.gradle index fa88d6c914b..54df72908d0 100644 --- a/starter/spring-boot-starter-jooq/build.gradle +++ b/starter/spring-boot-starter-jooq/build.gradle @@ -18,9 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using jOOQ to access SQL databases with JDBC. An alternative to spring-boot-starter-data-jpa or spring-boot-starter-jdbc" +description = "Starter for using jOOQ to access SQL databases with JDBC" dependencies { - api(project(":module:spring-boot-jooq")) api(project(":starter:spring-boot-starter-jdbc")) + + api(project(":module:spring-boot-jooq")) } diff --git a/starter/spring-boot-starter-json/build.gradle b/starter/spring-boot-starter-json/build.gradle index c5759cc6167..399dfb1c249 100644 --- a/starter/spring-boot-starter-json/build.gradle +++ b/starter/spring-boot-starter-json/build.gradle @@ -18,14 +18,8 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for reading and writing json" +description = "Starter for reading and writing JSON" dependencies { - api(project(":module:spring-boot-jackson")) - api(project(":starter:spring-boot-starter")) - api("org.springframework:spring-web") - api("com.fasterxml.jackson.core:jackson-databind") - 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") + api(project(":starter:spring-boot-starter-jackson")) } diff --git a/starter/spring-boot-starter-kafka/build.gradle b/starter/spring-boot-starter-kafka/build.gradle new file mode 100644 index 00000000000..2278fb3f43e --- /dev/null +++ b/starter/spring-boot-starter-kafka/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 Kafka" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-kafka")) +} diff --git a/starter/spring-boot-starter-ldap/build.gradle b/starter/spring-boot-starter-ldap/build.gradle new file mode 100644 index 00000000000..24be6f0b692 --- /dev/null +++ b/starter/spring-boot-starter-ldap/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 LDAP" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-ldap")) +} diff --git a/starter/spring-boot-starter-liquibase/build.gradle b/starter/spring-boot-starter-liquibase/build.gradle new file mode 100644 index 00000000000..f42481b8dd9 --- /dev/null +++ b/starter/spring-boot-starter-liquibase/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 Liquibase database migrations" + +dependencies { + api(project(":starter:spring-boot-starter-jdbc")) + + api(project(":module:spring-boot-liquibase")) +} diff --git a/starter/spring-boot-starter-log4j2/build.gradle b/starter/spring-boot-starter-log4j2/build.gradle index 5311ecad907..20b4b8c495f 100644 --- a/starter/spring-boot-starter-log4j2/build.gradle +++ b/starter/spring-boot-starter-log4j2/build.gradle @@ -18,7 +18,7 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using Log4j2 for logging. An alternative to spring-boot-starter-logging" +description = "Starter for using Log4j2" dependencies { api("org.apache.logging.log4j:log4j-slf4j2-impl") diff --git a/starter/spring-boot-starter-logback/build.gradle b/starter/spring-boot-starter-logback/build.gradle new file mode 100644 index 00000000000..77403ab2b60 --- /dev/null +++ b/starter/spring-boot-starter-logback/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 logging using Logback" + +dependencies { + api("ch.qos.logback:logback-classic") + api("org.apache.logging.log4j:log4j-to-slf4j") + api("org.slf4j:jul-to-slf4j") +} diff --git a/starter/spring-boot-starter-logging/build.gradle b/starter/spring-boot-starter-logging/build.gradle index a5511f7a7bf..2283acf088b 100644 --- a/starter/spring-boot-starter-logging/build.gradle +++ b/starter/spring-boot-starter-logging/build.gradle @@ -18,10 +18,8 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for logging using Logback. Default logging starter" +description = "Starter for logging default logging" dependencies { - api("ch.qos.logback:logback-classic") - api("org.apache.logging.log4j:log4j-to-slf4j") - api("org.slf4j:jul-to-slf4j") + api(project(":starter:spring-boot-starter-logback")) } diff --git a/starter/spring-boot-starter-mail/build.gradle b/starter/spring-boot-starter-mail/build.gradle index acbaa8bb418..818dd0bbe19 100644 --- a/starter/spring-boot-starter-mail/build.gradle +++ b/starter/spring-boot-starter-mail/build.gradle @@ -22,5 +22,6 @@ description = "Starter for using Java Mail and Spring Framework's email sending dependencies { api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-mail")) } diff --git a/starter/spring-boot-starter-mongodb/build.gradle b/starter/spring-boot-starter-mongodb/build.gradle new file mode 100644 index 00000000000..71b65ed5c43 --- /dev/null +++ b/starter/spring-boot-starter-mongodb/build.gradle @@ -0,0 +1,29 @@ +/* + * 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 MongoDB document-oriented database" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-mongodb")) + + api("org.mongodb:mongodb-driver-sync") +} diff --git a/starter/spring-boot-starter-mustache/build.gradle b/starter/spring-boot-starter-mustache/build.gradle index def4880d83c..039beb6ce81 100644 --- a/starter/spring-boot-starter-mustache/build.gradle +++ b/starter/spring-boot-starter-mustache/build.gradle @@ -18,9 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for building web applications using Mustache views" +description = "Starter for using Mustache" dependencies { - api(project(":module:spring-boot-mustache")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-mustache")) } diff --git a/starter/spring-boot-starter-neo4j/build.gradle b/starter/spring-boot-starter-neo4j/build.gradle new file mode 100644 index 00000000000..b3789a81ede --- /dev/null +++ b/starter/spring-boot-starter-neo4j/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 Neo4j graph database" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-neo4j")) +} diff --git a/starter/spring-boot-starter-oauth2-authorization-server/build.gradle b/starter/spring-boot-starter-oauth2-authorization-server/build.gradle index 1769f26a0ff..4ee9a9d300e 100644 --- a/starter/spring-boot-starter-oauth2-authorization-server/build.gradle +++ b/starter/spring-boot-starter-oauth2-authorization-server/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Spring Authorization Server features" dependencies { - api(project(":module:spring-boot-security-oauth2-authorization-server")) api(project(":starter:spring-boot-starter-security")) - api(project(":starter:spring-boot-starter-web")) + api(project(":starter:spring-boot-starter-webmvc")) + + api(project(":module:spring-boot-security-oauth2-authorization-server")) } diff --git a/starter/spring-boot-starter-oauth2-client/build.gradle b/starter/spring-boot-starter-oauth2-client/build.gradle index ad82b7a5b3c..8901557d5b0 100644 --- a/starter/spring-boot-starter-oauth2-client/build.gradle +++ b/starter/spring-boot-starter-oauth2-client/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Security's OAuth2/OpenID Connect client features" dependencies { - api(project(":module:spring-boot-security-oauth2-client")) api(project(":starter:spring-boot-starter-security")) + + api(project(":module:spring-boot-security-oauth2-client")) + api("org.springframework.security:spring-security-oauth2-jose") } diff --git a/starter/spring-boot-starter-oauth2-resource-server/build.gradle b/starter/spring-boot-starter-oauth2-resource-server/build.gradle index 8753b2a43fa..969ba089208 100644 --- a/starter/spring-boot-starter-oauth2-resource-server/build.gradle +++ b/starter/spring-boot-starter-oauth2-resource-server/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring Security's OAuth2 resource server features" dependencies { - api(project(":module:spring-boot-security-oauth2-resource-server")) api(project(":starter:spring-boot-starter-security")) + + api(project(":module:spring-boot-security-oauth2-resource-server")) } diff --git a/starter/spring-boot-starter-opentelemetry/build.gradle b/starter/spring-boot-starter-opentelemetry/build.gradle new file mode 100644 index 00000000000..325e96e28ef --- /dev/null +++ b/starter/spring-boot-starter-opentelemetry/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 OpenTelemetry" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-opentelemetry")) +} diff --git a/starter/spring-boot-starter-pulsar-reactive/build.gradle b/starter/spring-boot-starter-pulsar-reactive/build.gradle index e03e441692d..3c75e9985de 100644 --- a/starter/spring-boot-starter-pulsar-reactive/build.gradle +++ b/starter/spring-boot-starter-pulsar-reactive/build.gradle @@ -21,9 +21,9 @@ plugins { description = "Starter for using Spring for Apache Pulsar Reactive" dependencies { - api(project(":module:spring-boot-pulsar")) - api(project(":module:spring-boot-tx")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-pulsar")) api("org.springframework.pulsar:spring-pulsar-reactive") } diff --git a/starter/spring-boot-starter-pulsar/build.gradle b/starter/spring-boot-starter-pulsar/build.gradle index e1347e4b754..c69e2d858fb 100644 --- a/starter/spring-boot-starter-pulsar/build.gradle +++ b/starter/spring-boot-starter-pulsar/build.gradle @@ -21,9 +21,9 @@ plugins { description = "Starter for using Spring for Apache Pulsar" dependencies { - api(project(":module:spring-boot-pulsar")) - api(project(":module:spring-boot-tx")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-pulsar")) } checkRuntimeClasspathForConflicts { diff --git a/starter/spring-boot-starter-quartz/build.gradle b/starter/spring-boot-starter-quartz/build.gradle index 9672d64b6ce..59bb30fe968 100644 --- a/starter/spring-boot-starter-quartz/build.gradle +++ b/starter/spring-boot-starter-quartz/build.gradle @@ -21,7 +21,7 @@ plugins { description = "Starter for using the Quartz scheduler" dependencies { - api(project(":module:spring-boot-quartz")) - api(project(":module:spring-boot-tx")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-quartz")) } diff --git a/starter/spring-boot-starter-r2dbc/build.gradle b/starter/spring-boot-starter-r2dbc/build.gradle new file mode 100644 index 00000000000..a388259be59 --- /dev/null +++ b/starter/spring-boot-starter-r2dbc/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 R2DBC" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-r2dbc")) +} diff --git a/starter/spring-boot-starter-reactor-netty/build.gradle b/starter/spring-boot-starter-reactor-netty/build.gradle index 09ecdb14705..bb4ea2b2087 100644 --- a/starter/spring-boot-starter-reactor-netty/build.gradle +++ b/starter/spring-boot-starter-reactor-netty/build.gradle @@ -18,9 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using Reactor Netty as the embedded reactive HTTP server." +description = "Starter for Reactor Netty" dependencies { - api(project(":module:spring-boot-reactor-netty")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-reactor-netty")) } diff --git a/starter/spring-boot-starter-restclient/build.gradle b/starter/spring-boot-starter-restclient/build.gradle new file mode 100644 index 00000000000..8e545001aae --- /dev/null +++ b/starter/spring-boot-starter-restclient/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 using Spring's blocking HTTP clients (RestClient, RestTemplate and HTTP Service Clients)" + +dependencies { + api(project(":starter:spring-boot-starter-jackson")) + + api(project(":module:spring-boot-restclient")) +} diff --git a/starter/spring-boot-starter-rsocket/build.gradle b/starter/spring-boot-starter-rsocket/build.gradle index e1861a71ac5..a014c185f13 100644 --- a/starter/spring-boot-starter-rsocket/build.gradle +++ b/starter/spring-boot-starter-rsocket/build.gradle @@ -21,10 +21,11 @@ plugins { description = "Starter for building RSocket clients and servers" dependencies { - api(project(":module:spring-boot-rsocket")) - api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-json")) api(project(":starter:spring-boot-starter-reactor-netty")) + + api(project(":module:spring-boot-rsocket")) + api("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor") api("io.rsocket:rsocket-transport-netty") } diff --git a/starter/spring-boot-starter-security-saml2/build.gradle b/starter/spring-boot-starter-security-saml2/build.gradle new file mode 100644 index 00000000000..5833570042e --- /dev/null +++ b/starter/spring-boot-starter-security-saml2/build.gradle @@ -0,0 +1,35 @@ +/* + * 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 Spring Security with SAML2" + +configurations.all { + resolutionStrategy.eachDependency { + if (it.requested.group == 'org.opensaml') { + it.useVersion '4.0.1' + } + } +} + +dependencies { + api(project(":starter:spring-boot-starter-security")) + + api(project(":module:spring-boot-security-saml2")) +} diff --git a/starter/spring-boot-starter-security/build.gradle b/starter/spring-boot-starter-security/build.gradle index fc158776418..5f4aba496d5 100644 --- a/starter/spring-boot-starter-security/build.gradle +++ b/starter/spring-boot-starter-security/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Security" dependencies { - api(project(":module:spring-boot-security")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-security")) + api("org.springframework:spring-aop") } diff --git a/starter/spring-boot-starter-sendgrid/build.gradle b/starter/spring-boot-starter-sendgrid/build.gradle new file mode 100644 index 00000000000..8ebd601ecfa --- /dev/null +++ b/starter/spring-boot-starter-sendgrid/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 Spring Session with Sendgrid" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-sendgrid")) +} diff --git a/starter/spring-boot-starter-session-data-mongodb/build.gradle b/starter/spring-boot-starter-session-data-mongodb/build.gradle new file mode 100644 index 00000000000..3ecb2f5d4c7 --- /dev/null +++ b/starter/spring-boot-starter-session-data-mongodb/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 Spring Session with Spring Data MongoDB" + +dependencies { + api(project(":starter:spring-boot-starter-data-mongodb")) + + api(project(":module:spring-boot-session-data-mongodb")) +} diff --git a/starter/spring-boot-starter-session-data-redis/build.gradle b/starter/spring-boot-starter-session-data-redis/build.gradle new file mode 100644 index 00000000000..b1e36fe3931 --- /dev/null +++ b/starter/spring-boot-starter-session-data-redis/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 Spring Session with Spring Data Redis" + +dependencies { + api(project(":starter:spring-boot-starter-data-redis")) + + api(project(":module:spring-boot-session-data-redis")) +} diff --git a/starter/spring-boot-starter-session-hazelcast/build.gradle b/starter/spring-boot-starter-session-hazelcast/build.gradle new file mode 100644 index 00000000000..d7b06ccd725 --- /dev/null +++ b/starter/spring-boot-starter-session-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 Spring Session with Hazelcast" + +dependencies { + api(project(":starter:spring-boot-starter-hazelcast")) + + api(project(":module:spring-boot-session-hazelcast")) +} diff --git a/starter/spring-boot-starter-session-jdbc/build.gradle b/starter/spring-boot-starter-session-jdbc/build.gradle new file mode 100644 index 00000000000..975f14d1ba7 --- /dev/null +++ b/starter/spring-boot-starter-session-jdbc/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 Spring Session with JDBC" + +dependencies { + api(project(":starter:spring-boot-starter-jdbc")) + + api(project(":module:spring-boot-session-jdbc")) +} diff --git a/starter/spring-boot-starter-test/build.gradle b/starter/spring-boot-starter-test/build.gradle index 7649af51be9..2b77b4c36eb 100644 --- a/starter/spring-boot-starter-test/build.gradle +++ b/starter/spring-boot-starter-test/build.gradle @@ -21,7 +21,10 @@ plugins { description = "Starter for testing Spring Boot applications with libraries including JUnit Jupiter, Hamcrest and Mockito" dependencies { + api(project(":starter:spring-boot-starter")) + api(project(":core:spring-boot-test")) + api(project(":module:spring-boot-http-client")) { transitive = false } @@ -37,7 +40,7 @@ dependencies { api(project(":module:spring-boot-webclient")) { transitive = false } - api(project(":starter:spring-boot-starter")) + api("com.jayway.jsonpath:json-path") api("jakarta.xml.bind:jakarta.xml.bind-api") api("net.minidev:json-smart") diff --git a/starter/spring-boot-starter-thymeleaf/build.gradle b/starter/spring-boot-starter-thymeleaf/build.gradle index 3968cf55433..0199b372e44 100644 --- a/starter/spring-boot-starter-thymeleaf/build.gradle +++ b/starter/spring-boot-starter-thymeleaf/build.gradle @@ -18,9 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for building MVC web applications using Thymeleaf views" +description = "Starter for using Thymeleaf" dependencies { - api(project(":module:spring-boot-thymeleaf")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-thymeleaf")) } diff --git a/starter/spring-boot-starter-tomcat/build.gradle b/starter/spring-boot-starter-tomcat/build.gradle index 5c3a0838847..641bd549fba 100644 --- a/starter/spring-boot-starter-tomcat/build.gradle +++ b/starter/spring-boot-starter-tomcat/build.gradle @@ -18,11 +18,13 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using Tomcat as the embedded servlet container. Default servlet container starter used by spring-boot-starter-web" +description = "Starter for using Tomcat" dependencies { - api(project(":module:spring-boot-tomcat")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-tomcat")) + api("jakarta.annotation:jakarta.annotation-api") api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-websocket") { diff --git a/starter/spring-boot-starter-undertow/build.gradle b/starter/spring-boot-starter-undertow/build.gradle index b27108c6de9..df9cba4387a 100644 --- a/starter/spring-boot-starter-undertow/build.gradle +++ b/starter/spring-boot-starter-undertow/build.gradle @@ -18,11 +18,13 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using Undertow as the embedded servlet container. An alternative to spring-boot-starter-tomcat" +description = "Starter for using Undertow" dependencies { - api(project(":module:spring-boot-undertow")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-undertow")) + api("io.undertow:undertow-servlet") api("io.undertow:undertow-websockets-jsr") api("org.apache.tomcat.embed:tomcat-embed-el") diff --git a/starter/spring-boot-starter-validation/build.gradle b/starter/spring-boot-starter-validation/build.gradle index 58d751b903f..287965876e5 100644 --- a/starter/spring-boot-starter-validation/build.gradle +++ b/starter/spring-boot-starter-validation/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Java Bean Validation with Hibernate Validator" dependencies { - api(project(":module:spring-boot-validation")) api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-validation")) } diff --git a/starter/spring-boot-starter-web/build.gradle b/starter/spring-boot-starter-web/build.gradle index e25579fa1e2..b6b1d7de1e1 100644 --- a/starter/spring-boot-starter-web/build.gradle +++ b/starter/spring-boot-starter-web/build.gradle @@ -21,9 +21,5 @@ plugins { description = "Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container" dependencies { - api(project(":module:spring-boot-http-converter")) - api(project(":module:spring-boot-webmvc")) - api(project(":starter:spring-boot-starter")) - api(project(":starter:spring-boot-starter-json")) - api(project(":starter:spring-boot-starter-tomcat")) + api(project(":starter:spring-boot-starter-webmvc")) } diff --git a/starter/spring-boot-starter-webclient/build.gradle b/starter/spring-boot-starter-webclient/build.gradle new file mode 100644 index 00000000000..6c356cba1ce --- /dev/null +++ b/starter/spring-boot-starter-webclient/build.gradle @@ -0,0 +1,29 @@ +/* + * 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 using Spring's reactive HTTP clients (WebClient and HTTP Service Clients)" + +dependencies { + api(project(":starter:spring-boot-starter-jackson")) + + api(project(":module:spring-boot-webclient")) + + implementation("io.projectreactor.netty:reactor-netty-http") +} diff --git a/starter/spring-boot-starter-webflux/build.gradle b/starter/spring-boot-starter-webflux/build.gradle index 650854a9596..ad2db679c00 100644 --- a/starter/spring-boot-starter-webflux/build.gradle +++ b/starter/spring-boot-starter-webflux/build.gradle @@ -18,11 +18,11 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for building WebFlux applications using Spring Framework's Reactive Web support" +description = "Starter for building WebFlux applications using Spring Framework's Reactive Web support and Reactor Netty" dependencies { - api(project(":module:spring-boot-webflux")) - api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-json")) api(project(":starter:spring-boot-starter-reactor-netty")) + + api(project(":module:spring-boot-webflux")) } diff --git a/starter/spring-boot-starter-webmvc/build.gradle b/starter/spring-boot-starter-webmvc/build.gradle new file mode 100644 index 00000000000..ca4184f8738 --- /dev/null +++ b/starter/spring-boot-starter-webmvc/build.gradle @@ -0,0 +1,29 @@ +/* + * 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 building web, including RESTful, applications using Spring MVC and Tomcat" + +dependencies { + api(project(":starter:spring-boot-starter-json")) + api(project(":starter:spring-boot-starter-tomcat")) + + api(project(":module:spring-boot-http-converter")) + api(project(":module:spring-boot-webmvc")) +} diff --git a/starter/spring-boot-starter-web-services/build.gradle b/starter/spring-boot-starter-webservices/build.gradle similarity index 94% rename from starter/spring-boot-starter-web-services/build.gradle rename to starter/spring-boot-starter-webservices/build.gradle index 4a70d8a7c05..fbcd6569788 100644 --- a/starter/spring-boot-starter-web-services/build.gradle +++ b/starter/spring-boot-starter-webservices/build.gradle @@ -21,8 +21,10 @@ plugins { description = "Starter for using Spring Web Services" dependencies { + api(project(":starter:spring-boot-starter-webmvc")) + api(project(":module:spring-boot-webservices")) - api(project(":starter:spring-boot-starter-web")) + api("com.sun.xml.messaging.saaj:saaj-impl") api("jakarta.xml.ws:jakarta.xml.ws-api") } diff --git a/starter/spring-boot-starter-websocket/build.gradle b/starter/spring-boot-starter-websocket/build.gradle index de436aae010..6c217a7f41a 100644 --- a/starter/spring-boot-starter-websocket/build.gradle +++ b/starter/spring-boot-starter-websocket/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for building WebSocket applications using Spring Framework's MVC WebSocket support" dependencies { + api(project(":starter:spring-boot-starter-webmvc")) + api(project(":module:spring-boot-websocket")) - api(project(":starter:spring-boot-starter-web")) } diff --git a/starter/spring-boot-starter-zipkin/build.gradle b/starter/spring-boot-starter-zipkin/build.gradle new file mode 100644 index 00000000000..61d09609396 --- /dev/null +++ b/starter/spring-boot-starter-zipkin/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 Zipkin" + +dependencies { + api(project(":starter:spring-boot-starter")) + + api(project(":module:spring-boot-zipkin")) +} diff --git a/starter/spring-boot-starter/build.gradle b/starter/spring-boot-starter/build.gradle index 07e81289d80..e633db93d49 100644 --- a/starter/spring-boot-starter/build.gradle +++ b/starter/spring-boot-starter/build.gradle @@ -21,10 +21,10 @@ plugins { description = "Core starter, including auto-configuration support, logging and YAML" dependencies { - api(project(":core:spring-boot")) - api(project(":core:spring-boot-autoconfigure")) api(project(":starter:spring-boot-starter-logging")) + + api(project(":core:spring-boot-autoconfigure")) + api("jakarta.annotation:jakarta.annotation-api") - api("org.springframework:spring-core") api("org.yaml:snakeyaml") } diff --git a/system-test/spring-boot-deployment-system-tests/build.gradle b/system-test/spring-boot-deployment-system-tests/build.gradle index dcb3634a887..8d7e02846e6 100644 --- a/system-test/spring-boot-deployment-system-tests/build.gradle +++ b/system-test/spring-boot-deployment-system-tests/build.gradle @@ -34,7 +34,7 @@ configurations.all { dependencies { compileOnly("jakarta.servlet:jakarta.servlet-api") - implementation(project(":starter:spring-boot-starter-web")) { + implementation(project(":starter:spring-boot-starter-webmvc")) { exclude group: "org.hibernate.validator" exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" } diff --git a/system-test/spring-boot-image-system-tests/build.gradle b/system-test/spring-boot-image-system-tests/build.gradle index be0e6310131..35eeb0f2148 100644 --- a/system-test/spring-boot-image-system-tests/build.gradle +++ b/system-test/spring-boot-image-system-tests/build.gradle @@ -46,7 +46,7 @@ dependencies { app project(path: ":build-plugin:spring-boot-gradle-plugin", configuration: "mavenRepository") app project(path: ":starter:spring-boot-starter-web", configuration: "mavenRepository") - implementation(project(":starter:spring-boot-starter-web")) { + implementation(project(":starter:spring-boot-starter-webmvc")) { exclude group: "org.hibernate.validator" }