diff --git a/integration-test/spring-boot-server-integration-tests/build.gradle b/integration-test/spring-boot-server-integration-tests/build.gradle index 4e71605c392..677a4007b4a 100644 --- a/integration-test/spring-boot-server-integration-tests/build.gradle +++ b/integration-test/spring-boot-server-integration-tests/build.gradle @@ -35,7 +35,7 @@ dependencies { testRepository(project(path: ":build-plugin:spring-boot-gradle-plugin", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter-jetty", configuration: "mavenRepository")) - testRepository(project(path: ":starter:spring-boot-starter-json", configuration: "mavenRepository")) + testRepository(project(path: ":starter:spring-boot-starter-jackson", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter-parent", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter-tomcat", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter-undertow", configuration: "mavenRepository")) diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle new file mode 100644 index 00000000000..df9ee7ae997 --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle @@ -0,0 +1,28 @@ +/* + * 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 "java" +} + +description = "Spring Boot Auto-Configure Classic smoke test" + +dependencies { + implementation(project(":starter:spring-boot-starter")) + implementation(project(":module:spring-boot-autoconfigure-classic")) + + testImplementation(project(":starter:spring-boot-starter-test")) +} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java new file mode 100644 index 00000000000..18d641e1224 --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java @@ -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. + */ + +package smoketest.autoconfigureclassic; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SampleAutoConfigureClassicApplication implements CommandLineRunner { + + @Override + public void run(String... args) throws Exception { + System.out.println("Auto-Configure Classic!"); + } + + public static void main(String[] args) { + SpringApplication.run(SampleAutoConfigureClassicApplication.class, args); + } + +} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties new file mode 100644 index 00000000000..bfd3a3a2ac8 --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties @@ -0,0 +1,6 @@ +test.name=Phil +sample.name=Andy + +spring.profiles.validate=false +spring.profiles.active=a+very(silly)!name + diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg new file mode 100644 index 00000000000..f196fed2c3f Binary files /dev/null and b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg differ diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt new file mode 100644 index 00000000000..2634c44793a --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt @@ -0,0 +1 @@ +${Ansi.GREEN} :: Sample application build with Spring Boot${spring-boot.formatted-version} ::${Ansi.DEFAULT} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java new file mode 100644 index 00000000000..a514859ec57 --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java @@ -0,0 +1,41 @@ +/* + * 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. + */ + +package smoketest.autoconfigureclassic; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link SampleAutoConfigureClassicApplication}. + * + * @author Phillip Webb + */ +@ExtendWith(OutputCaptureExtension.class) +class SampleAutoConfigureClassicApplicationTests { + + @Test + void testApplicationRuns(CapturedOutput output) { + SampleAutoConfigureClassicApplication.main(new String[0]); + assertThat(output).contains("Auto-Configure Classic!"); + } + +} diff --git a/smoke-test/spring-boot-smoke-test-kafka/build.gradle b/smoke-test/spring-boot-smoke-test-kafka/build.gradle index e307ca81b97..70b0f7cd4e5 100644 --- a/smoke-test/spring-boot-smoke-test-kafka/build.gradle +++ b/smoke-test/spring-boot-smoke-test-kafka/build.gradle @@ -32,7 +32,7 @@ configurations.all { } dependencies { - implementation(project(":starter:spring-boot-starter-json")) + implementation(project(":starter:spring-boot-starter-jackson")) implementation(project(":starter:spring-boot-starter-kafka")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) diff --git a/starter/spring-boot-starter-activemq/build.gradle b/starter/spring-boot-starter-activemq/build.gradle index 2e7dd65d607..0748f1bbf7b 100644 --- a/starter/spring-boot-starter-activemq/build.gradle +++ b/starter/spring-boot-starter-activemq/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Apache ActiveMQ and JMS" dependencies { - api(project(":starter:spring-boot-starter-jms")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-activemq")) + api(project(":module:spring-boot-jms")) } diff --git a/starter/spring-boot-starter-artemis/build.gradle b/starter/spring-boot-starter-artemis/build.gradle index 296e59c728c..af7e5f2d36d 100644 --- a/starter/spring-boot-starter-artemis/build.gradle +++ b/starter/spring-boot-starter-artemis/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for Apache Artemis and JMS" dependencies { - api(project(":starter:spring-boot-starter-jms")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-artemis")) + api(project(":module:spring-boot-jms")) } diff --git a/starter/spring-boot-starter-batch/build.gradle b/starter/spring-boot-starter-batch/build.gradle index fe449e1ae96..3d0a7be3060 100644 --- a/starter/spring-boot-starter-batch/build.gradle +++ b/starter/spring-boot-starter-batch/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Batch" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) api(project(":module:spring-boot-batch")) + api(project(":module:spring-boot-jdbc")) } diff --git a/starter/spring-boot-starter-data-cassandra-reactive/build.gradle b/starter/spring-boot-starter-data-cassandra-reactive/build.gradle index 049a13e9fef..dea6f65424d 100644 --- a/starter/spring-boot-starter-data-cassandra-reactive/build.gradle +++ b/starter/spring-boot-starter-data-cassandra-reactive/build.gradle @@ -21,8 +21,9 @@ plugins { description = "Starter for using Cassandra distributed database and Spring Data Cassandra Reactive" dependencies { - api(project(":starter:spring-boot-starter-cassandra")) - api(project(":starter:spring-boot-starter-reactor")) + api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-cassandra")) api(project(":module:spring-boot-data-cassandra")) + api(project(":module:spring-boot-reactor")) } diff --git a/starter/spring-boot-starter-data-cassandra/build.gradle b/starter/spring-boot-starter-data-cassandra/build.gradle index 765226b4ad1..90e2c194b39 100644 --- a/starter/spring-boot-starter-data-cassandra/build.gradle +++ b/starter/spring-boot-starter-data-cassandra/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Cassandra distributed database and Spring Data Cassandra" dependencies { - api(project(":starter:spring-boot-starter-cassandra")) + api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-cassandra")) api(project(":module:spring-boot-data-cassandra")) } diff --git a/starter/spring-boot-starter-data-couchbase-reactive/build.gradle b/starter/spring-boot-starter-data-couchbase-reactive/build.gradle index 7edfb2ff234..6c2b35dfaf5 100644 --- a/starter/spring-boot-starter-data-couchbase-reactive/build.gradle +++ b/starter/spring-boot-starter-data-couchbase-reactive/build.gradle @@ -21,8 +21,9 @@ plugins { description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase Reactive" dependencies { - api(project(":starter:spring-boot-starter-couchbase")) - api(project(":starter:spring-boot-starter-reactor")) + api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-couchbase")) api(project(":module:spring-boot-data-couchbase")) + api(project(":module:spring-boot-reactor")) } diff --git a/starter/spring-boot-starter-data-couchbase/build.gradle b/starter/spring-boot-starter-data-couchbase/build.gradle index 970176741e3..11b2ae3b6ea 100644 --- a/starter/spring-boot-starter-data-couchbase/build.gradle +++ b/starter/spring-boot-starter-data-couchbase/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase" dependencies { - api(project(":starter:spring-boot-starter-couchbase")) + api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-couchbase")) api(project(":module:spring-boot-data-couchbase")) } diff --git a/starter/spring-boot-starter-data-elasticsearch/build.gradle b/starter/spring-boot-starter-data-elasticsearch/build.gradle index d7694b5cfdb..6207172ccf3 100644 --- a/starter/spring-boot-starter-data-elasticsearch/build.gradle +++ b/starter/spring-boot-starter-data-elasticsearch/build.gradle @@ -21,9 +21,10 @@ plugins { description = "Starter for using Elasticsearch search and analytics engine and Spring Data Elasticsearch" dependencies { - api(project(":starter:spring-boot-starter-elasticsearch")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-elasticsearch")) + api(project(":module:spring-boot-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 2ee20886257..d40b1ca72f6 100644 --- a/starter/spring-boot-starter-data-jdbc/build.gradle +++ b/starter/spring-boot-starter-data-jdbc/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Data JDBC" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) api(project(":module:spring-boot-data-jdbc")) + api(project(":module:spring-boot-jdbc")) } diff --git a/starter/spring-boot-starter-data-jpa/build.gradle b/starter/spring-boot-starter-data-jpa/build.gradle index f030cbb1fb9..e11b7f57f70 100644 --- a/starter/spring-boot-starter-data-jpa/build.gradle +++ b/starter/spring-boot-starter-data-jpa/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Data JPA with Hibernate" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) api(project(":module:spring-boot-data-jpa")) + api(project(":module:spring-boot-jdbc")) } diff --git a/starter/spring-boot-starter-data-ldap/build.gradle b/starter/spring-boot-starter-data-ldap/build.gradle index 4cbff161451..96c9c038759 100644 --- a/starter/spring-boot-starter-data-ldap/build.gradle +++ b/starter/spring-boot-starter-data-ldap/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Spring Data LDAP" dependencies { - api(project(":starter:spring-boot-starter-ldap")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-ldap")) + api(project(":module:spring-boot-ldap")) } diff --git a/starter/spring-boot-starter-data-mongodb-reactive/build.gradle b/starter/spring-boot-starter-data-mongodb-reactive/build.gradle index ef15dcc7aa8..bafdcf4744f 100644 --- a/starter/spring-boot-starter-data-mongodb-reactive/build.gradle +++ b/starter/spring-boot-starter-data-mongodb-reactive/build.gradle @@ -21,10 +21,11 @@ plugins { description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB Reactive" dependencies { - api(project(":starter:spring-boot-starter-mongodb")) - api(project(":starter:spring-boot-starter-reactor")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-mongodb")) + api(project(":module:spring-boot-mongodb")) + api(project(":module:spring-boot-reactor")) 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 0c8c0294658..66764c454a0 100644 --- a/starter/spring-boot-starter-data-mongodb/build.gradle +++ b/starter/spring-boot-starter-data-mongodb/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB" dependencies { - api(project(":starter:spring-boot-starter-mongodb")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-mongodb")) + api(project(":module:spring-boot-mongodb")) } diff --git a/starter/spring-boot-starter-data-neo4j/build.gradle b/starter/spring-boot-starter-data-neo4j/build.gradle index 53689c02b63..0e924fa801c 100644 --- a/starter/spring-boot-starter-data-neo4j/build.gradle +++ b/starter/spring-boot-starter-data-neo4j/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using Neo4j graph database and Spring Data Neo4j" dependencies { - api(project(":starter:spring-boot-starter-neo4j")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-neo4j")) + api(project(":module:spring-boot-neo4j")) } diff --git a/starter/spring-boot-starter-data-r2dbc/build.gradle b/starter/spring-boot-starter-data-r2dbc/build.gradle index 247d5699db4..811a4cfa2b4 100644 --- a/starter/spring-boot-starter-data-r2dbc/build.gradle +++ b/starter/spring-boot-starter-data-r2dbc/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Data R2DBC" dependencies { - api(project(":starter:spring-boot-starter-r2dbc")) + api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-data-r2dbc")) + api(project(":module:spring-boot-r2dbc")) + api(project(":module:spring-boot-reactor")) } diff --git a/starter/spring-boot-starter-data-redis-reactive/build.gradle b/starter/spring-boot-starter-data-redis-reactive/build.gradle index c323598573a..2632fc8b795 100644 --- a/starter/spring-boot-starter-data-redis-reactive/build.gradle +++ b/starter/spring-boot-starter-data-redis-reactive/build.gradle @@ -22,7 +22,7 @@ description = "Starter for using Redis key-value data store with Spring Data Red dependencies { api(project(":starter:spring-boot-starter")) - api(project(":starter:spring-boot-starter-reactor")) api(project(":module:spring-boot-data-redis")) + api(project(":module:spring-boot-reactor")) } diff --git a/starter/spring-boot-starter-data-rest/build.gradle b/starter/spring-boot-starter-data-rest/build.gradle index 2ccb92931d9..2cbb009e68d 100644 --- a/starter/spring-boot-starter-data-rest/build.gradle +++ b/starter/spring-boot-starter-data-rest/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for exposing Spring Data repositories over REST using Spring Data REST and Spring MVC" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-webmvc")) + api(project(":starter:spring-boot-starter-jackson")) api(project(":module:spring-boot-data-rest")) } diff --git a/starter/spring-boot-starter-flyway/build.gradle b/starter/spring-boot-starter-flyway/build.gradle index 767c072f010..bb7a3093b90 100644 --- a/starter/spring-boot-starter-flyway/build.gradle +++ b/starter/spring-boot-starter-flyway/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Flyway database migrations" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) api(project(":module:spring-boot-flyway")) + api(project(":module:spring-boot-jdbc")) } diff --git a/starter/spring-boot-starter-graphql/build.gradle b/starter/spring-boot-starter-graphql/build.gradle index 5e35ce921ec..9368b123a92 100644 --- a/starter/spring-boot-starter-graphql/build.gradle +++ b/starter/spring-boot-starter-graphql/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter using Spring GraphQL" dependencies { - api(project(":starter:spring-boot-starter-json")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-jackson")) api(project(":module:spring-boot-graphql")) } diff --git a/starter/spring-boot-starter-hateoas/build.gradle b/starter/spring-boot-starter-hateoas/build.gradle index a81746c1a21..511808643cd 100644 --- a/starter/spring-boot-starter-hateoas/build.gradle +++ b/starter/spring-boot-starter-hateoas/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring HATEOS to build hypermedia-based RESTful Spring MVC web applications" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-webmvc")) api(project(":module:spring-boot-hateoas")) diff --git a/starter/spring-boot-starter-jersey/build.gradle b/starter/spring-boot-starter-jersey/build.gradle index 0973f7264d4..3f9ad6363be 100644 --- a/starter/spring-boot-starter-jersey/build.gradle +++ b/starter/spring-boot-starter-jersey/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for using JAX-RS and Jersey" dependencies { - api(project(":starter:spring-boot-starter-json")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-jackson")) api(project(":starter:spring-boot-starter-tomcat")) api(project(":starter:spring-boot-starter-validation")) diff --git a/starter/spring-boot-starter-jooq/build.gradle b/starter/spring-boot-starter-jooq/build.gradle index 54df72908d0..4ca2c3fd466 100644 --- a/starter/spring-boot-starter-jooq/build.gradle +++ b/starter/spring-boot-starter-jooq/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using jOOQ to access SQL databases with JDBC" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) api(project(":module:spring-boot-jooq")) + api(project(":module:spring-boot-jdbc")) } diff --git a/starter/spring-boot-starter-json/build.gradle b/starter/spring-boot-starter-json/build.gradle index 399dfb1c249..bacf691aadd 100644 --- a/starter/spring-boot-starter-json/build.gradle +++ b/starter/spring-boot-starter-json/build.gradle @@ -21,5 +21,11 @@ plugins { description = "Starter for reading and writing JSON" dependencies { - api(project(":starter:spring-boot-starter-jackson")) + 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-jsonb/build.gradle b/starter/spring-boot-starter-jsonb/build.gradle index 657f1d1a8d4..fca3c7c7115 100644 --- a/starter/spring-boot-starter-jsonb/build.gradle +++ b/starter/spring-boot-starter-jsonb/build.gradle @@ -21,5 +21,7 @@ plugins { description = "Starter for JSON-B" dependencies { + api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-jsonb")) } diff --git a/starter/spring-boot-starter-liquibase/build.gradle b/starter/spring-boot-starter-liquibase/build.gradle index f42481b8dd9..179e89d1897 100644 --- a/starter/spring-boot-starter-liquibase/build.gradle +++ b/starter/spring-boot-starter-liquibase/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Liquibase database migrations" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) + api(project(":module:spring-boot-jdbc")) api(project(":module:spring-boot-liquibase")) } diff --git a/starter/spring-boot-starter-logging/build.gradle b/starter/spring-boot-starter-logging/build.gradle index 2283acf088b..82bc9f84a89 100644 --- a/starter/spring-boot-starter-logging/build.gradle +++ b/starter/spring-boot-starter-logging/build.gradle @@ -21,5 +21,7 @@ plugins { description = "Starter for logging default logging" dependencies { - api(project(":starter:spring-boot-starter-logback")) + 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-oauth2-authorization-server/build.gradle b/starter/spring-boot-starter-oauth2-authorization-server/build.gradle index 94d9b1d3186..b7140a35438 100644 --- a/starter/spring-boot-starter-oauth2-authorization-server/build.gradle +++ b/starter/spring-boot-starter-oauth2-authorization-server/build.gradle @@ -21,5 +21,9 @@ plugins { description = "Starter for using Spring Authorization Server features (deprecated in favor of spring-boot-starter-security-oauth2-authorization-server)" dependencies { - api(project(":starter:spring-boot-starter-security-oauth2-authorization-server")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-security")) + 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 84a3a58b5ed..935b1a5ea08 100644 --- a/starter/spring-boot-starter-oauth2-client/build.gradle +++ b/starter/spring-boot-starter-oauth2-client/build.gradle @@ -21,5 +21,10 @@ plugins { description = "Starter for using Spring Security's OAuth2/OpenID Connect client features (deprecated in favor of spring-boot-starter-security-oauth2-client)" dependencies { - api(project(":starter:spring-boot-starter-security-oauth2-client")) + api(project(":starter:spring-boot-starter")) + 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 93964073b1f..021250c8c46 100644 --- a/starter/spring-boot-starter-oauth2-resource-server/build.gradle +++ b/starter/spring-boot-starter-oauth2-resource-server/build.gradle @@ -21,5 +21,8 @@ plugins { description = "Starter for using Spring Security's OAuth2 resource server features (deprecated in favor of spring-boot-starter-security-oauth2-resource-server)" dependencies { - api(project(":starter:spring-boot-starter-security-oauth2-resource-server")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-security")) + + api(project(":module:spring-boot-security-oauth2-resource-server")) } diff --git a/starter/spring-boot-starter-pulsar-reactive/build.gradle b/starter/spring-boot-starter-pulsar-reactive/build.gradle index 3c75e9985de..80fcfbc0524 100644 --- a/starter/spring-boot-starter-pulsar-reactive/build.gradle +++ b/starter/spring-boot-starter-pulsar-reactive/build.gradle @@ -24,6 +24,7 @@ dependencies { api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-pulsar")) + api(project(":module:spring-boot-reactor")) api("org.springframework.pulsar:spring-pulsar-reactive") } diff --git a/starter/spring-boot-starter-r2dbc/build.gradle b/starter/spring-boot-starter-r2dbc/build.gradle index a388259be59..77b719ac828 100644 --- a/starter/spring-boot-starter-r2dbc/build.gradle +++ b/starter/spring-boot-starter-r2dbc/build.gradle @@ -24,4 +24,5 @@ dependencies { api(project(":starter:spring-boot-starter")) api(project(":module:spring-boot-r2dbc")) + api(project(":module:spring-boot-reactor")) } diff --git a/starter/spring-boot-starter-reactor-netty/build.gradle b/starter/spring-boot-starter-reactor-netty/build.gradle index bb4ea2b2087..062b3102b37 100644 --- a/starter/spring-boot-starter-reactor-netty/build.gradle +++ b/starter/spring-boot-starter-reactor-netty/build.gradle @@ -23,5 +23,6 @@ description = "Starter for Reactor Netty" dependencies { api(project(":starter:spring-boot-starter")) + api(project(":module:spring-boot-reactor")) 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 index 8e545001aae..ae31cfc1aa9 100644 --- a/starter/spring-boot-starter-restclient/build.gradle +++ b/starter/spring-boot-starter-restclient/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter using Spring's blocking HTTP clients (RestClient, RestTemplate and HTTP Service Clients)" dependencies { + api(project(":starter:spring-boot-starter")) 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 a014c185f13..76643254379 100644 --- a/starter/spring-boot-starter-rsocket/build.gradle +++ b/starter/spring-boot-starter-rsocket/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for building RSocket clients and servers" dependencies { - api(project(":starter:spring-boot-starter-json")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-jackson")) api(project(":starter:spring-boot-starter-reactor-netty")) api(project(":module:spring-boot-rsocket")) diff --git a/starter/spring-boot-starter-security-oauth2-authorization-server/build.gradle b/starter/spring-boot-starter-security-oauth2-authorization-server/build.gradle index 4ee9a9d300e..454dcd95ae4 100644 --- a/starter/spring-boot-starter-security-oauth2-authorization-server/build.gradle +++ b/starter/spring-boot-starter-security-oauth2-authorization-server/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring Authorization Server features" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-security")) api(project(":starter:spring-boot-starter-webmvc")) diff --git a/starter/spring-boot-starter-security-oauth2-client/build.gradle b/starter/spring-boot-starter-security-oauth2-client/build.gradle index 8901557d5b0..a548b88e053 100644 --- a/starter/spring-boot-starter-security-oauth2-client/build.gradle +++ b/starter/spring-boot-starter-security-oauth2-client/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring Security's OAuth2/OpenID Connect client features" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-security")) api(project(":module:spring-boot-security-oauth2-client")) diff --git a/starter/spring-boot-starter-security-oauth2-resource-server/build.gradle b/starter/spring-boot-starter-security-oauth2-resource-server/build.gradle index 969ba089208..ef9a152a2ef 100644 --- a/starter/spring-boot-starter-security-oauth2-resource-server/build.gradle +++ b/starter/spring-boot-starter-security-oauth2-resource-server/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring Security's OAuth2 resource server features" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-security")) api(project(":module:spring-boot-security-oauth2-resource-server")) diff --git a/starter/spring-boot-starter-security-saml2/build.gradle b/starter/spring-boot-starter-security-saml2/build.gradle index 5833570042e..3ac5645ead8 100644 --- a/starter/spring-boot-starter-security-saml2/build.gradle +++ b/starter/spring-boot-starter-security-saml2/build.gradle @@ -29,6 +29,7 @@ configurations.all { } dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-security")) api(project(":module:spring-boot-security-saml2")) diff --git a/starter/spring-boot-starter-session-data-mongodb/build.gradle b/starter/spring-boot-starter-session-data-mongodb/build.gradle index 3ecb2f5d4c7..97841704b0a 100644 --- a/starter/spring-boot-starter-session-data-mongodb/build.gradle +++ b/starter/spring-boot-starter-session-data-mongodb/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Session with Spring Data MongoDB" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-data-mongodb")) api(project(":module:spring-boot-session-data-mongodb")) + api(project(":module:spring-boot-data-mongodb")) } diff --git a/starter/spring-boot-starter-session-data-redis/build.gradle b/starter/spring-boot-starter-session-data-redis/build.gradle index b1e36fe3931..c36ab34a636 100644 --- a/starter/spring-boot-starter-session-data-redis/build.gradle +++ b/starter/spring-boot-starter-session-data-redis/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Session with Spring Data Redis" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-data-redis")) + api(project(":module:spring-boot-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 index d7b06ccd725..9ee29c51280 100644 --- a/starter/spring-boot-starter-session-hazelcast/build.gradle +++ b/starter/spring-boot-starter-session-hazelcast/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Session with Hazelcast" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-hazelcast")) api(project(":module:spring-boot-session-hazelcast")) + api(project(":module:spring-boot-hazelcast")) } diff --git a/starter/spring-boot-starter-session-jdbc/build.gradle b/starter/spring-boot-starter-session-jdbc/build.gradle index 975f14d1ba7..ff55dbbcce1 100644 --- a/starter/spring-boot-starter-session-jdbc/build.gradle +++ b/starter/spring-boot-starter-session-jdbc/build.gradle @@ -21,7 +21,9 @@ plugins { description = "Starter for using Spring Session with JDBC" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jdbc")) + api(project(":module:spring-boot-jdbc")) api(project(":module:spring-boot-session-jdbc")) } diff --git a/starter/spring-boot-starter-web-services/build.gradle b/starter/spring-boot-starter-web-services/build.gradle index 4ce5ac1771b..b14449f2a61 100644 --- a/starter/spring-boot-starter-web-services/build.gradle +++ b/starter/spring-boot-starter-web-services/build.gradle @@ -21,5 +21,11 @@ plugins { description = "Starter for using Spring Web Services (deprecated in favor of spring-boot-starter-webservices)" dependencies { - api(project(":starter:spring-boot-starter-webservices")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-webmvc")) + + api(project(":module:spring-boot-webservices")) + + api("com.sun.xml.messaging.saaj:saaj-impl") + api("jakarta.xml.ws:jakarta.xml.ws-api") } diff --git a/starter/spring-boot-starter-web/build.gradle b/starter/spring-boot-starter-web/build.gradle index c7dfdd1576f..c707efd5792 100644 --- a/starter/spring-boot-starter-web/build.gradle +++ b/starter/spring-boot-starter-web/build.gradle @@ -21,5 +21,9 @@ plugins { description = "Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container (deprecated in favor of spring-boot-starter-webmvc)" dependencies { - api(project(":starter:spring-boot-starter-webmvc")) + api(project(":starter:spring-boot-starter-jackson")) + 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-webclient/build.gradle b/starter/spring-boot-starter-webclient/build.gradle index 6c356cba1ce..1f31e1981e0 100644 --- a/starter/spring-boot-starter-webclient/build.gradle +++ b/starter/spring-boot-starter-webclient/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter using Spring's reactive HTTP clients (WebClient and HTTP Service Clients)" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-jackson")) api(project(":module:spring-boot-webclient")) diff --git a/starter/spring-boot-starter-webflux/build.gradle b/starter/spring-boot-starter-webflux/build.gradle index ad2db679c00..0d2aa49eef1 100644 --- a/starter/spring-boot-starter-webflux/build.gradle +++ b/starter/spring-boot-starter-webflux/build.gradle @@ -21,7 +21,8 @@ plugins { description = "Starter for building WebFlux applications using Spring Framework's Reactive Web support and Reactor Netty" dependencies { - api(project(":starter:spring-boot-starter-json")) + api(project(":starter:spring-boot-starter")) + api(project(":starter:spring-boot-starter-jackson")) 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 index ca4184f8738..52f83bef352 100644 --- a/starter/spring-boot-starter-webmvc/build.gradle +++ b/starter/spring-boot-starter-webmvc/build.gradle @@ -21,7 +21,8 @@ plugins { 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")) + api(project(":starter:spring-boot-starter-jackson")) api(project(":starter:spring-boot-starter-tomcat")) api(project(":module:spring-boot-http-converter")) diff --git a/starter/spring-boot-starter-webservices/build.gradle b/starter/spring-boot-starter-webservices/build.gradle index fbcd6569788..57c2d956294 100644 --- a/starter/spring-boot-starter-webservices/build.gradle +++ b/starter/spring-boot-starter-webservices/build.gradle @@ -21,6 +21,7 @@ plugins { description = "Starter for using Spring Web Services" dependencies { + api(project(":starter:spring-boot-starter")) api(project(":starter:spring-boot-starter-webmvc")) api(project(":module:spring-boot-webservices")) diff --git a/starter/spring-boot-starter-websocket/build.gradle b/starter/spring-boot-starter-websocket/build.gradle index 6c217a7f41a..d500e3827b0 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")) api(project(":starter:spring-boot-starter-webmvc")) api(project(":module:spring-boot-websocket"))