diff --git a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureDataSourceInitialization.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureDataSourceInitialization.java similarity index 95% rename from module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureDataSourceInitialization.java rename to core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureDataSourceInitialization.java index 28976607d7a..8960a46db5f 100644 --- a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureDataSourceInitialization.java +++ b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureDataSourceInitialization.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.jdbc.test.autoconfigure; +package org.springframework.boot.test.autoconfigure.jdbc; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/package-info.java b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/package-info.java new file mode 100644 index 00000000000..8ad9ef942ce --- /dev/null +++ b/core/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/package-info.java @@ -0,0 +1,23 @@ +/* + * 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. + */ + +/** + * Auto-configuration for core JDBC test concerns. + */ +@NullMarked +package org.springframework.boot.test.autoconfigure.jdbc; + +import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-data-r2dbc-test/build.gradle b/module/spring-boot-data-r2dbc-test/build.gradle index 5d4db7d22f7..f764a9e1cce 100644 --- a/module/spring-boot-data-r2dbc-test/build.gradle +++ b/module/spring-boot-data-r2dbc-test/build.gradle @@ -28,7 +28,6 @@ dependencies { api(project(":module:spring-boot-data-r2dbc")) optional(project(":core:spring-boot-testcontainers")) - optional(project(":module:spring-boot-jdbc-test")) optional("org.junit.jupiter:junit-jupiter-api") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/AutoConfigureDataR2dbc.java b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/AutoConfigureDataR2dbc.java index fd81ed506c3..83aec3b64e6 100644 --- a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/AutoConfigureDataR2dbc.java +++ b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/AutoConfigureDataR2dbc.java @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization; /** * {@link ImportAutoConfiguration Auto-configuration imports} for typical Data R2DBC diff --git a/module/spring-boot-flyway/build.gradle b/module/spring-boot-flyway/build.gradle index 2147f9ef904..32f4bb6b6a9 100644 --- a/module/spring-boot-flyway/build.gradle +++ b/module/spring-boot-flyway/build.gradle @@ -33,8 +33,8 @@ dependencies { optional(project(":core:spring-boot-autoconfigure")) optional(project(":core:spring-boot-docker-compose")) - optional(project(":module:spring-boot-jdbc-test")) optional(project(":core:spring-boot-testcontainers")) + optional(project(":core:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-actuator-autoconfigure")) optional("org.flywaydb:flyway-database-oracle") optional("org.flywaydb:flyway-database-postgresql") diff --git a/module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports b/module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports similarity index 100% rename from module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports rename to module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports diff --git a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigureDataSourceInitializationTests.java b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigureDataSourceInitializationTests.java index 96fc88f63f6..1399a673f02 100644 --- a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigureDataSourceInitializationTests.java +++ b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigureDataSourceInitializationTests.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; diff --git a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureJdbc.java b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureJdbc.java index 3f127b660bb..16a321f28ef 100644 --- a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureJdbc.java +++ b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureJdbc.java @@ -24,6 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization; /** * {@link ImportAutoConfiguration Auto-configuration imports} for typical JDBC tests. Most diff --git a/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports b/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports similarity index 74% rename from module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports rename to module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports index a7b7bc074a5..67d35fa5332 100644 --- a/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports +++ b/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports @@ -1 +1 @@ -org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration \ No newline at end of file +org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration diff --git a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/AutoConfigureJooq.java b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/AutoConfigureJooq.java index a1718d15982..9f91b8d3853 100644 --- a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/AutoConfigureJooq.java +++ b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/AutoConfigureJooq.java @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization; /** * {@link ImportAutoConfiguration Auto-configuration imports} for typical jOOQ tests. Most diff --git a/module/spring-boot-liquibase/build.gradle b/module/spring-boot-liquibase/build.gradle index fc19c0f9b10..08a66eff3c6 100644 --- a/module/spring-boot-liquibase/build.gradle +++ b/module/spring-boot-liquibase/build.gradle @@ -36,8 +36,8 @@ dependencies { optional(project(":core:spring-boot-autoconfigure")) optional(project(":core:spring-boot-docker-compose")) optional(project(":core:spring-boot-testcontainers")) + optional(project(":core:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-actuator-autoconfigure")) - optional(project(":module:spring-boot-jdbc-test")) optional("org.testcontainers:jdbc") dockerTestImplementation(project(":core:spring-boot-test")) diff --git a/module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports b/module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports similarity index 100% rename from module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization.imports rename to module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization.imports diff --git a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigureDataSourceInitializationTests.java b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigureDataSourceInitializationTests.java index 813472242e8..480b7e0889c 100644 --- a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigureDataSourceInitializationTests.java +++ b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigureDataSourceInitializationTests.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureDataSourceInitialization; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureDataSourceInitialization; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle index 0bc7f5fdeba..a4c7d0245ce 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle @@ -32,7 +32,6 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":module:spring-boot-data-r2dbc-test")) - dockerTestImplementation(project(":module:spring-boot-jdbc-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("io.projectreactor:reactor-test") diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle index 2cbb22ae026..2aed9c246d6 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle @@ -30,7 +30,6 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":module:spring-boot-data-r2dbc-test")) - dockerTestImplementation(project(":module:spring-boot-jdbc-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("io.projectreactor:reactor-test")