From 4b2d358384bb2a203a232e45ecfe6415037ce682 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 26 Sep 2025 14:38:25 -0700 Subject: [PATCH] Refine spring-boot-test-autoconfigure dependencies Make `spring-boot-test-autoconfigure` optionally depend on `spring-boot-autoconfigure` so that it can be an `api` dependency for `*-test` modules. Also relocate it to core. See gh-47322 --- {module => core}/spring-boot-test-autoconfigure/build.gradle | 3 +-- .../OnFailureConditionReportContextCustomizerFactory.java | 0 .../boot/test/autoconfigure/OverrideAutoConfiguration.java | 0 .../OverrideAutoConfigurationContextCustomizerFactory.java | 0 .../test/autoconfigure/TestSliceTestContextBootstrapper.java | 0 .../boot/test/autoconfigure/package-info.java | 0 .../resources/META-INF/spring-configuration-metadata.json | 0 .../src/main/resources/META-INF/spring.factories | 0 .../test/autoconfigure/ExampleSpringBootApplication.java | 0 .../springframework/boot/test/autoconfigure/ExampleTest.java | 0 .../boot/test/autoconfigure/ExampleTestConfig.java | 0 .../test/autoconfigure/ExampleTestContextBootstrapper.java | 0 ...tsContextCustomizerFactoryWithAutoConfigurationTests.java | 0 ...nFailureConditionReportContextCustomizerFactoryTests.java | 0 ...errideAutoConfigurationContextCustomizerFactoryTests.java | 0 ...verrideAutoConfigurationEnabledFalseIntegrationTests.java | 0 ...OverrideAutoConfigurationEnabledTrueIntegrationTests.java | 0 .../OverrideAutoConfigurationSpringBootApplication.java | 0 documentation/spring-boot-docs/build.gradle | 4 ++-- module/spring-boot-cache-test/build.gradle | 5 ++--- module/spring-boot-data-cassandra-test/build.gradle | 4 +--- module/spring-boot-data-commons/build.gradle | 3 +-- module/spring-boot-data-couchbase-test/build.gradle | 4 +--- module/spring-boot-data-elasticsearch-test/build.gradle | 4 +--- module/spring-boot-data-jdbc-test/build.gradle | 4 +--- module/spring-boot-data-jpa-test/build.gradle | 4 +--- module/spring-boot-data-ldap-test/build.gradle | 4 +--- module/spring-boot-data-mongodb-test/build.gradle | 4 +--- module/spring-boot-data-neo4j-test/build.gradle | 4 +--- module/spring-boot-data-r2dbc-test/build.gradle | 4 +--- module/spring-boot-data-redis-test/build.gradle | 4 +--- module/spring-boot-freemarker/build.gradle | 2 +- module/spring-boot-graphql-test/build.gradle | 4 ++-- module/spring-boot-groovy-templates/build.gradle | 3 +-- module/spring-boot-hateoas/build.gradle | 3 +-- module/spring-boot-jdbc-test/build.gradle | 4 +--- module/spring-boot-jooq-test/build.gradle | 4 +--- module/spring-boot-jpa-test/build.gradle | 5 ++--- module/spring-boot-json-test/build.gradle | 4 ++-- module/spring-boot-micrometer-metrics-test/build.gradle | 5 ++--- module/spring-boot-micrometer-tracing-test/build.gradle | 5 ++--- module/spring-boot-mustache/build.gradle | 3 +-- module/spring-boot-restclient-test/build.gradle | 2 +- module/spring-boot-restdocs/build.gradle | 4 +++- module/spring-boot-rsocket-test/build.gradle | 3 +++ module/spring-boot-security-oauth2-client/build.gradle | 3 +-- .../spring-boot-security-oauth2-resource-server/build.gradle | 3 +-- module/spring-boot-security-saml2/build.gradle | 3 +-- module/spring-boot-security-test/build.gradle | 3 ++- module/spring-boot-security/build.gradle | 1 + module/spring-boot-thymeleaf/build.gradle | 3 +-- module/spring-boot-web-server-test/build.gradle | 5 ++--- module/spring-boot-webflux-test/build.gradle | 5 ++--- module/spring-boot-webmvc-test/build.gradle | 5 +++-- module/spring-boot-webservices-test/build.gradle | 5 ++--- settings.gradle | 2 +- starter/spring-boot-starter-test/build.gradle | 2 +- 57 files changed, 57 insertions(+), 89 deletions(-) rename {module => core}/spring-boot-test-autoconfigure/build.gradle (93%) rename {module => core}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactory.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/package-info.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json (100%) rename {module => core}/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleSpringBootApplication.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTest.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestContextBootstrapper.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactoryTests.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactoryTests.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledFalseIntegrationTests.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledTrueIntegrationTests.java (100%) rename {module => core}/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationSpringBootApplication.java (100%) diff --git a/module/spring-boot-test-autoconfigure/build.gradle b/core/spring-boot-test-autoconfigure/build.gradle similarity index 93% rename from module/spring-boot-test-autoconfigure/build.gradle rename to core/spring-boot-test-autoconfigure/build.gradle index 903aaab5ae4..c63889f7526 100644 --- a/module/spring-boot-test-autoconfigure/build.gradle +++ b/core/spring-boot-test-autoconfigure/build.gradle @@ -23,12 +23,11 @@ plugins { description = "Spring Boot Test AutoConfigure" dependencies { - api(project(":core:spring-boot")) - api(project(":core:spring-boot-autoconfigure")) api(project(":core:spring-boot-test")) compileOnly("org.mockito:mockito-core") + optional(project(":core:spring-boot-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactory.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactory.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactory.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactory.java diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/package-info.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/package-info.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/package-info.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/package-info.java diff --git a/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json b/core/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json rename to core/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/core/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories similarity index 100% rename from module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories rename to core/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleSpringBootApplication.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleSpringBootApplication.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleSpringBootApplication.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleSpringBootApplication.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTest.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTest.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTest.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTest.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestContextBootstrapper.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestContextBootstrapper.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestContextBootstrapper.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestContextBootstrapper.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactoryTests.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactoryTests.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactoryTests.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OnFailureConditionReportContextCustomizerFactoryTests.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactoryTests.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactoryTests.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactoryTests.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactoryTests.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledFalseIntegrationTests.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledFalseIntegrationTests.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledFalseIntegrationTests.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledFalseIntegrationTests.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledTrueIntegrationTests.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledTrueIntegrationTests.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledTrueIntegrationTests.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationEnabledTrueIntegrationTests.java diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationSpringBootApplication.java b/core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationSpringBootApplication.java similarity index 100% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationSpringBootApplication.java rename to core/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/override/OverrideAutoConfigurationSpringBootApplication.java diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index 5bf08fc7560..b7ab36cb805 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/documentation/spring-boot-docs/build.gradle @@ -83,6 +83,7 @@ dependencies { implementation(project(path: ":cli:spring-boot-cli")) implementation(project(path: ":core:spring-boot-docker-compose")) implementation(project(path: ":core:spring-boot-test")) + implementation(project(path: ":core:spring-boot-test-autoconfigure")) implementation(project(path: ":core:spring-boot-testcontainers")) implementation(project(path: ":loader:spring-boot-loader-tools")) implementation(project(path: ":module:spring-boot-actuator")) @@ -124,7 +125,6 @@ dependencies { implementation(project(path: ":module:spring-boot-restclient")) implementation(project(path: ":module:spring-boot-restclient-test")) implementation(project(path: ":module:spring-boot-security")) - implementation(project(path: ":module:spring-boot-test-autoconfigure")) implementation(project(path: ":module:spring-boot-tomcat")) implementation(project(path: ":module:spring-boot-web-server-test")) implementation(project(path: ":module:spring-boot-webclient")) @@ -232,7 +232,7 @@ dependencies { testRuntimeOnly("com.h2database:h2") testRuntimeOnly("org.springframework:spring-jdbc") - testSlices(project(path: ":module:spring-boot-test-autoconfigure", configuration: "testSliceMetadata")) + testSlices(project(path: ":core:spring-boot-test-autoconfigure", configuration: "testSliceMetadata")) } dokkatoo { diff --git a/module/spring-boot-cache-test/build.gradle b/module/spring-boot-cache-test/build.gradle index 52a3fed17b9..9863c2fe499 100644 --- a/module/spring-boot-cache-test/build.gradle +++ b/module/spring-boot-cache-test/build.gradle @@ -24,11 +24,10 @@ plugins { description = "Spring Boot Cache Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-cache")) - implementation(project(":core:spring-boot-test")) - - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-cassandra-test/build.gradle b/module/spring-boot-data-cassandra-test/build.gradle index f2714b65a16..cb3e0d21368 100644 --- a/module/spring-boot-data-cassandra-test/build.gradle +++ b/module/spring-boot-data-cassandra-test/build.gradle @@ -25,12 +25,10 @@ plugins { description = "Spring Boot Data Cassandra Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-cassandra")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-data-commons/build.gradle b/module/spring-boot-data-commons/build.gradle index 71bb3107f86..7a2cde511cc 100644 --- a/module/spring-boot-data-commons/build.gradle +++ b/module/spring-boot-data-commons/build.gradle @@ -33,9 +33,8 @@ dependencies { optional(project(":module:spring-boot-micrometer-metrics")) optional(project(":module:spring-boot-webmvc")) - testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-jdbc")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webmvc-test")) testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) diff --git a/module/spring-boot-data-couchbase-test/build.gradle b/module/spring-boot-data-couchbase-test/build.gradle index 8f250811df9..7f43b36eab1 100644 --- a/module/spring-boot-data-couchbase-test/build.gradle +++ b/module/spring-boot-data-couchbase-test/build.gradle @@ -24,12 +24,10 @@ plugins { description = "Spring Boot Data Couchbase Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-couchbase")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-elasticsearch-test/build.gradle b/module/spring-boot-data-elasticsearch-test/build.gradle index a1e0061a3fe..cb71861c576 100644 --- a/module/spring-boot-data-elasticsearch-test/build.gradle +++ b/module/spring-boot-data-elasticsearch-test/build.gradle @@ -25,14 +25,12 @@ plugins { description = "Spring Boot Data Elasticsearch Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-elasticsearch")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-jackson")) optional(project(":module:spring-boot-jsonb")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-data-jdbc-test/build.gradle b/module/spring-boot-data-jdbc-test/build.gradle index d9534cd7d81..355e970873f 100644 --- a/module/spring-boot-data-jdbc-test/build.gradle +++ b/module/spring-boot-data-jdbc-test/build.gradle @@ -24,13 +24,11 @@ plugins { description = "Spring Boot Data JDBC Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-jdbc")) api(project(":module:spring-boot-jdbc-test")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-jpa-test/build.gradle b/module/spring-boot-data-jpa-test/build.gradle index b10eed79c66..60a2d7de2c1 100644 --- a/module/spring-boot-data-jpa-test/build.gradle +++ b/module/spring-boot-data-jpa-test/build.gradle @@ -24,14 +24,12 @@ plugins { description = "Spring Boot Data JPA Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-jpa")) api(project(":module:spring-boot-jdbc-test")) api(project(":module:spring-boot-jpa-test")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-ldap-test/build.gradle b/module/spring-boot-data-ldap-test/build.gradle index 83e7fc96237..48b086a5255 100644 --- a/module/spring-boot-data-ldap-test/build.gradle +++ b/module/spring-boot-data-ldap-test/build.gradle @@ -25,12 +25,10 @@ plugins { description = "Spring Boot Data LDAP Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-ldap")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-data-mongodb-test/build.gradle b/module/spring-boot-data-mongodb-test/build.gradle index de5df5ec768..f82d30cbf15 100644 --- a/module/spring-boot-data-mongodb-test/build.gradle +++ b/module/spring-boot-data-mongodb-test/build.gradle @@ -25,12 +25,10 @@ plugins { description = "Spring Boot Data MongoDB Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-mongodb")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-data-neo4j-test/build.gradle b/module/spring-boot-data-neo4j-test/build.gradle index 7520ffe3a40..75e75edb0be 100644 --- a/module/spring-boot-data-neo4j-test/build.gradle +++ b/module/spring-boot-data-neo4j-test/build.gradle @@ -25,12 +25,10 @@ plugins { description = "Spring Boot Data Neo4j Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-neo4j")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-data-r2dbc-test/build.gradle b/module/spring-boot-data-r2dbc-test/build.gradle index d44dca9f38a..5d4db7d22f7 100644 --- a/module/spring-boot-data-r2dbc-test/build.gradle +++ b/module/spring-boot-data-r2dbc-test/build.gradle @@ -24,12 +24,10 @@ plugins { description = "Spring Boot Data R2DBC Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-r2dbc")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-jdbc-test")) optional("org.junit.jupiter:junit-jupiter-api") diff --git a/module/spring-boot-data-redis-test/build.gradle b/module/spring-boot-data-redis-test/build.gradle index ec2d4d09a72..b586f43dc0e 100644 --- a/module/spring-boot-data-redis-test/build.gradle +++ b/module/spring-boot-data-redis-test/build.gradle @@ -25,12 +25,10 @@ plugins { description = "Spring Boot Data Redis Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-data-redis")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-testcontainers")) diff --git a/module/spring-boot-freemarker/build.gradle b/module/spring-boot-freemarker/build.gradle index 29d888dc12a..05c4062846e 100644 --- a/module/spring-boot-freemarker/build.gradle +++ b/module/spring-boot-freemarker/build.gradle @@ -38,8 +38,8 @@ dependencies { optional("jakarta.servlet:jakarta.servlet-api") testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-servlet")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) diff --git a/module/spring-boot-graphql-test/build.gradle b/module/spring-boot-graphql-test/build.gradle index 85840a1e828..b2d94a3133b 100644 --- a/module/spring-boot-graphql-test/build.gradle +++ b/module/spring-boot-graphql-test/build.gradle @@ -24,14 +24,14 @@ plugins { description = "Spring Boot GraphQL Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api("org.springframework.graphql:spring-graphql-test") - implementation(project(":core:spring-boot-test")) implementation(project(":module:spring-boot-graphql")) implementation(project(":module:spring-boot-jackson")) + optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-json-test")) - optional(project(":module:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-validation")) optional(project(":module:spring-boot-webclient")) optional(project(":module:spring-boot-webflux-test")) diff --git a/module/spring-boot-groovy-templates/build.gradle b/module/spring-boot-groovy-templates/build.gradle index 40b0ae41908..7f4a4364fa9 100644 --- a/module/spring-boot-groovy-templates/build.gradle +++ b/module/spring-boot-groovy-templates/build.gradle @@ -34,8 +34,7 @@ dependencies { optional(project(":module:spring-boot-webmvc-test")) optional("jakarta.servlet:jakarta.servlet-api") - testImplementation(project(":core:spring-boot-test")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) diff --git a/module/spring-boot-hateoas/build.gradle b/module/spring-boot-hateoas/build.gradle index c5720745d68..83f312fa4e9 100644 --- a/module/spring-boot-hateoas/build.gradle +++ b/module/spring-boot-hateoas/build.gradle @@ -33,8 +33,7 @@ dependencies { optional(project(":core:spring-boot-autoconfigure")) - testImplementation(project(":core:spring-boot-test")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webmvc-test")) testImplementation(project(":test-support:spring-boot-test-support")) testImplementation("jakarta.servlet:jakarta.servlet-api") diff --git a/module/spring-boot-jdbc-test/build.gradle b/module/spring-boot-jdbc-test/build.gradle index 550cfad6680..23a08ba1498 100644 --- a/module/spring-boot-jdbc-test/build.gradle +++ b/module/spring-boot-jdbc-test/build.gradle @@ -26,12 +26,10 @@ plugins { description = "Spring Boot JDBC Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-jdbc")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") dockerTestImplementation(project(":core:spring-boot-docker-compose")) diff --git a/module/spring-boot-jooq-test/build.gradle b/module/spring-boot-jooq-test/build.gradle index 0dab0304b3c..c5b505c162a 100644 --- a/module/spring-boot-jooq-test/build.gradle +++ b/module/spring-boot-jooq-test/build.gradle @@ -24,13 +24,11 @@ plugins { description = "Spring Boot jOOQ Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-jooq")) - implementation(project(":core:spring-boot-test")) - optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-jdbc-test")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":module:spring-boot-flyway")) diff --git a/module/spring-boot-jpa-test/build.gradle b/module/spring-boot-jpa-test/build.gradle index 7bd0448cdc4..125e3a3c9e1 100644 --- a/module/spring-boot-jpa-test/build.gradle +++ b/module/spring-boot-jpa-test/build.gradle @@ -24,11 +24,10 @@ plugins { description = "Spring Boot JPA Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-jpa")) - implementation(project(":core:spring-boot-test")) - - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-json-test/build.gradle b/module/spring-boot-json-test/build.gradle index 3428fd64307..85364836588 100644 --- a/module/spring-boot-json-test/build.gradle +++ b/module/spring-boot-json-test/build.gradle @@ -25,13 +25,13 @@ plugins { description = "Spring Boot JSON Test" dependencies { - implementation(project(":core:spring-boot-test")) + api(project(":core:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-gson")) optional(project(":module:spring-boot-jackson")) optional(project(":module:spring-boot-jsonb")) optional(project(":module:spring-boot-kotlin-serialization")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("com.jayway.jsonpath:json-path") optional("org.assertj:assertj-core") optional("org.junit.jupiter:junit-jupiter-api") diff --git a/module/spring-boot-micrometer-metrics-test/build.gradle b/module/spring-boot-micrometer-metrics-test/build.gradle index b843574d4ec..79095c30096 100644 --- a/module/spring-boot-micrometer-metrics-test/build.gradle +++ b/module/spring-boot-micrometer-metrics-test/build.gradle @@ -24,11 +24,10 @@ plugins { description = "Spring Boot Micrometer Metrics Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-micrometer-metrics")) - implementation(project(":core:spring-boot-test")) - - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-micrometer-tracing-test/build.gradle b/module/spring-boot-micrometer-tracing-test/build.gradle index e0b58b0eda5..0a69727f794 100644 --- a/module/spring-boot-micrometer-tracing-test/build.gradle +++ b/module/spring-boot-micrometer-tracing-test/build.gradle @@ -24,11 +24,10 @@ plugins { description = "Spring Boot Micrometer Tracing Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-micrometer-tracing")) - implementation(project(":core:spring-boot-test")) - - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-mustache/build.gradle b/module/spring-boot-mustache/build.gradle index 511155eaade..d707c86aca7 100644 --- a/module/spring-boot-mustache/build.gradle +++ b/module/spring-boot-mustache/build.gradle @@ -34,11 +34,10 @@ dependencies { optional("org.springframework:spring-webflux") optional(project(":core:spring-boot-autoconfigure")) - testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-reactor-netty")) testImplementation(project(":module:spring-boot-restclient")) testImplementation(project(":module:spring-boot-reactor-netty")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-tomcat")) testImplementation(project(":module:spring-boot-webflux-test")) testImplementation(project(":module:spring-boot-webmvc-test")) diff --git a/module/spring-boot-restclient-test/build.gradle b/module/spring-boot-restclient-test/build.gradle index bc014afeabf..edda6ceba10 100644 --- a/module/spring-boot-restclient-test/build.gradle +++ b/module/spring-boot-restclient-test/build.gradle @@ -25,12 +25,12 @@ description = "Spring Boot RestClient Test" dependencies { api(project(":core:spring-boot")) + api(project(":core:spring-boot-test-autoconfigure")) optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-jackson")) optional(project(":module:spring-boot-json-test")) optional(project(":module:spring-boot-restclient")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") optional("org.springframework:spring-test") diff --git a/module/spring-boot-restdocs/build.gradle b/module/spring-boot-restdocs/build.gradle index 5f93d36e00d..46e6770b11e 100644 --- a/module/spring-boot-restdocs/build.gradle +++ b/module/spring-boot-restdocs/build.gradle @@ -26,9 +26,11 @@ description = "Spring Boot REST Docs" dependencies { api("org.springframework.restdocs:spring-restdocs-core") + + optional(project(":core:spring-boot-autoconfigure")) + optional(project(":core:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-webmvc-test")) optional(project(":module:spring-boot-web-server-test")) - optional(project(":module:spring-boot-test-autoconfigure")) optional("org.springframework.restdocs:spring-restdocs-mockmvc") optional("org.springframework.restdocs:spring-restdocs-restassured") optional("org.springframework.restdocs:spring-restdocs-webtestclient") diff --git a/module/spring-boot-rsocket-test/build.gradle b/module/spring-boot-rsocket-test/build.gradle index 7356e0334b7..34d72f7c216 100644 --- a/module/spring-boot-rsocket-test/build.gradle +++ b/module/spring-boot-rsocket-test/build.gradle @@ -24,8 +24,11 @@ plugins { description = "Spring Boot RSocket Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-rsocket")) + optional(project(":core:spring-boot-autoconfigure")) + testImplementation(project(":test-support:spring-boot-test-support")) testRuntimeOnly("ch.qos.logback:logback-classic") diff --git a/module/spring-boot-security-oauth2-client/build.gradle b/module/spring-boot-security-oauth2-client/build.gradle index 86c31b7f7a4..953f58861bc 100644 --- a/module/spring-boot-security-oauth2-client/build.gradle +++ b/module/spring-boot-security-oauth2-client/build.gradle @@ -37,10 +37,9 @@ dependencies { optional(project(":module:spring-boot-webmvc-test")) optional(project(":module:spring-boot-web-server-test")) - testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-tomcat")) testImplementation(project(":test-support:spring-boot-test-support")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webmvc")) testImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) testImplementation("com.squareup.okhttp3:mockwebserver") diff --git a/module/spring-boot-security-oauth2-resource-server/build.gradle b/module/spring-boot-security-oauth2-resource-server/build.gradle index c7ab7a5f0a7..bd98ca47339 100644 --- a/module/spring-boot-security-oauth2-resource-server/build.gradle +++ b/module/spring-boot-security-oauth2-resource-server/build.gradle @@ -38,10 +38,9 @@ dependencies { optional(project(":module:spring-boot-webmvc-test")) optional("jakarta.servlet:jakarta.servlet-api") - testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-actuator-autoconfigure")) testImplementation(project(":module:spring-boot-jackson")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webflux")) testImplementation(project(":module:spring-boot-webmvc")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-security-saml2/build.gradle b/module/spring-boot-security-saml2/build.gradle index 1eb9ff78ab7..c57092628b1 100644 --- a/module/spring-boot-security-saml2/build.gradle +++ b/module/spring-boot-security-saml2/build.gradle @@ -33,9 +33,8 @@ dependencies { optional(project(":core:spring-boot-autoconfigure")) - testImplementation(project(":core:spring-boot-test")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-actuator-autoconfigure")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webmvc")) testImplementation(project(":module:spring-boot-webmvc-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-security-test/build.gradle b/module/spring-boot-security-test/build.gradle index 503f598c4df..51f12b8b147 100644 --- a/module/spring-boot-security-test/build.gradle +++ b/module/spring-boot-security-test/build.gradle @@ -24,10 +24,11 @@ plugins { description = "Spring Boot Security Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-security")) api("org.springframework.security:spring-security-test") - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-webflux-test")) optional(project(":module:spring-boot-webmvc-test")) optional("org.seleniumhq.selenium:htmlunit3-driver") { diff --git a/module/spring-boot-security/build.gradle b/module/spring-boot-security/build.gradle index 3d7039587e6..70be60af38e 100644 --- a/module/spring-boot-security/build.gradle +++ b/module/spring-boot-security/build.gradle @@ -27,6 +27,7 @@ description = "Spring Boot Security" dependencies { api(project(":core:spring-boot")) + api(project(":core:spring-boot-test-autoconfigure")) api("org.springframework.security:spring-security-config") api("org.springframework.security:spring-security-web") diff --git a/module/spring-boot-thymeleaf/build.gradle b/module/spring-boot-thymeleaf/build.gradle index 46b2975f7f3..21089b4f32b 100644 --- a/module/spring-boot-thymeleaf/build.gradle +++ b/module/spring-boot-thymeleaf/build.gradle @@ -42,8 +42,7 @@ dependencies { optional("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect") optional("jakarta.servlet:jakarta.servlet-api") - testImplementation(project(":core:spring-boot-test")) - testImplementation(project(":module:spring-boot-test-autoconfigure")) + testImplementation(project(":core:spring-boot-test-autoconfigure")) testImplementation(project(":module:spring-boot-webflux-test")) testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) diff --git a/module/spring-boot-web-server-test/build.gradle b/module/spring-boot-web-server-test/build.gradle index 701ad75b8b3..40e24a2a2ca 100644 --- a/module/spring-boot-web-server-test/build.gradle +++ b/module/spring-boot-web-server-test/build.gradle @@ -27,12 +27,11 @@ description = "Spring Boot Web Server Test" dependencies { api(project(":core:spring-boot")) + api(project(":core:spring-boot-test-autoconfigure")) - implementation(project(":core:spring-boot-test")) - + optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-http-codec")) optional(project(":module:spring-boot-restclient")) - optional(project(":module:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-web-server")) optional(project(":module:spring-boot-webclient")) optional("jakarta.servlet:jakarta.servlet-api") diff --git a/module/spring-boot-webflux-test/build.gradle b/module/spring-boot-webflux-test/build.gradle index e71e6905664..54c2bd59fef 100644 --- a/module/spring-boot-webflux-test/build.gradle +++ b/module/spring-boot-webflux-test/build.gradle @@ -24,14 +24,13 @@ plugins { description = "Spring Boot WebFlux Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-webflux")) - implementation(project(":core:spring-boot-test")) - + optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-http-codec")) optional(project(":module:spring-boot-jackson")) optional(project(":module:spring-boot-json-test")) - optional(project(":module:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-validation")) optional(project(":module:spring-boot-web-server-test")) optional("org.junit.jupiter:junit-jupiter-api") diff --git a/module/spring-boot-webmvc-test/build.gradle b/module/spring-boot-webmvc-test/build.gradle index f9e8df179f0..469c2aefbcd 100644 --- a/module/spring-boot-webmvc-test/build.gradle +++ b/module/spring-boot-webmvc-test/build.gradle @@ -25,18 +25,19 @@ plugins { description = "Spring Boot Web MVC Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-webmvc")) compileOnly("jakarta.servlet:jakarta.servlet-api") - implementation(project(":core:spring-boot-test")) implementation(project(":module:spring-boot-http-converter")) implementation(project(":module:spring-boot-web-server")) implementation(project(":module:spring-boot-web-server-test")) + optional(project(":core:spring-boot-autoconfigure")) + optional(project(":core:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-jackson")) optional(project(":module:spring-boot-json-test")) - optional(project(":module:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-validation")) optional(project(":module:spring-boot-webflux")) optional("org.junit.jupiter:junit-jupiter-api") diff --git a/module/spring-boot-webservices-test/build.gradle b/module/spring-boot-webservices-test/build.gradle index b2343ca57e5..b74f42946b1 100644 --- a/module/spring-boot-webservices-test/build.gradle +++ b/module/spring-boot-webservices-test/build.gradle @@ -25,12 +25,11 @@ plugins { description = "Spring Boot Web Services Test" dependencies { + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-webservices")) api("org.springframework.ws:spring-ws-test") - implementation(project(":core:spring-boot-test")) - - optional(project(":module:spring-boot-test-autoconfigure")) + optional(project(":core:spring-boot-autoconfigure")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/settings.gradle b/settings.gradle index ead7544c6e8..0fad3157a07 100644 --- a/settings.gradle +++ b/settings.gradle @@ -75,6 +75,7 @@ include "core:spring-boot-autoconfigure-processor" include "core:spring-boot-docker-compose" include "core:spring-boot-properties-migrator" include "core:spring-boot-test" +include "core:spring-boot-test-autoconfigure" include "core:spring-boot-testcontainers" include "module:spring-boot-activemq" @@ -181,7 +182,6 @@ include "module:spring-boot-session-data-redis" include "module:spring-boot-session-hazelcast" include "module:spring-boot-session-jdbc" include "module:spring-boot-sql" -include "module:spring-boot-test-autoconfigure" include "module:spring-boot-thymeleaf" include "module:spring-boot-tomcat" include "module:spring-boot-tx" diff --git a/starter/spring-boot-starter-test/build.gradle b/starter/spring-boot-starter-test/build.gradle index a5eddbf1fae..bbabef93e3b 100644 --- a/starter/spring-boot-starter-test/build.gradle +++ b/starter/spring-boot-starter-test/build.gradle @@ -25,8 +25,8 @@ dependencies { api(project(":core:spring-boot-test")) + api(project(":core:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-restclient-test")) - api(project(":module:spring-boot-test-autoconfigure")) api(project(":module:spring-boot-web-server-test")) api("com.jayway.jsonpath:json-path")