diff --git a/build-plugin/spring-boot-gradle-plugin/build.gradle b/build-plugin/spring-boot-gradle-plugin/build.gradle index 299cd449fa2e..7b4ad618787c 100644 --- a/build-plugin/spring-boot-gradle-plugin/build.gradle +++ b/build-plugin/spring-boot-gradle-plugin/build.gradle @@ -41,7 +41,7 @@ dependencies { dockerTestImplementation(gradleTestKit()) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") implementation(project(":buildpack:spring-boot-buildpack-platform")) diff --git a/build-plugin/spring-boot-maven-plugin/build.gradle b/build-plugin/spring-boot-maven-plugin/build.gradle index 0b4c03cf543b..adb1ff626714 100644 --- a/build-plugin/spring-boot-maven-plugin/build.gradle +++ b/build-plugin/spring-boot-maven-plugin/build.gradle @@ -43,7 +43,7 @@ dependencies { } dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") implementation(project(":buildpack:spring-boot-buildpack-platform")) diff --git a/core/spring-boot-testcontainers/build.gradle b/core/spring-boot-testcontainers/build.gradle index 564a7913d508..e39ad7560e30 100644 --- a/core/spring-boot-testcontainers/build.gradle +++ b/core/spring-boot-testcontainers/build.gradle @@ -41,8 +41,8 @@ dependencies { dockerTestImplementation("org.mockito:mockito-core") dockerTestImplementation("org.springframework:spring-core-test") dockerTestImplementation("org.springframework:spring-jdbc") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") dockerTestRuntimeOnly("com.zaxxer:HikariCP") dockerTestRuntimeOnly("com.h2database:h2") @@ -54,8 +54,8 @@ dependencies { testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:postgresql") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") + testImplementation("org.testcontainers:testcontainers-postgresql") } dockerTest { diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java index 59f254fed51c..997cbb967408 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.testcontainers.containers.Container; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.testcontainers.beans.TestcontainerBeanDefinition; import org.springframework.boot.testcontainers.context.ImportTestcontainers; @@ -127,7 +127,7 @@ void importWhenHasBadArgsDynamicPropertySourceMethod() { static class ImportWithoutValue { @ContainerAnnotation - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); } @@ -144,21 +144,21 @@ static class NoContainers { @ImportTestcontainers static class NullContainer { - static @Nullable PostgreSQLContainer container = null; + static @Nullable PostgreSQLContainer container = null; } @ImportTestcontainers static class NonStaticContainer { - PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); } interface ContainerDefinitions { @ContainerAnnotation - PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); } @@ -170,7 +170,7 @@ interface ContainerDefinitions { @ImportTestcontainers static class ContainerDefinitionsWithDynamicPropertySource { - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); @DynamicPropertySource static void containerProperties(DynamicPropertyRegistry registry) { diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java index a970962294aa..8d35a51d4d6b 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java @@ -16,8 +16,8 @@ package org.springframework.boot.testcontainers; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -30,6 +30,6 @@ interface LoadTimeWeaverAwareConsumerContainers { @Container @ServiceConnection - PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.1"); + PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:16.1"); } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java index f19dfc2c18db..b652f6d76210 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java @@ -19,8 +19,8 @@ import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -90,7 +90,7 @@ public void setUrl(@Nullable String url) { static class Containers { @Container - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); @DynamicPropertySource static void setConnectionProperties(DynamicPropertyRegistry registry) { diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java index ce02484c7f7b..dcb3b3472099 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -54,17 +54,17 @@ void startsInParallel(CapturedOutput out) { static class ContainerConfig { @Bean - static PostgreSQLContainer container1() { + static PostgreSQLContainer container1() { return TestImage.container(PostgreSQLContainer.class); } @Bean - static PostgreSQLContainer container2() { + static PostgreSQLContainer container2() { return TestImage.container(PostgreSQLContainer.class); } @Bean - static PostgreSQLContainer container3() { + static PostgreSQLContainer container3() { return TestImage.container(PostgreSQLContainer.class); } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java index 6675295cebbd..7c6dd61ad5e4 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -52,13 +52,13 @@ void startsInParallel(CapturedOutput out) { static class Containers { @Container - static PostgreSQLContainer container1 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container1 = TestImage.container(PostgreSQLContainer.class); @Container - static PostgreSQLContainer container2 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container2 = TestImage.container(PostgreSQLContainer.class); @Container - static PostgreSQLContainer container3 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container3 = TestImage.container(PostgreSQLContainer.class); } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java index 4a5214772ad7..721da9ab4858 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.beans.factory.support.BeanDefinitionRegistry; @@ -142,7 +142,7 @@ static class ContainerConfiguration { @Bean @ServiceConnection - PostgreSQLContainer postgresContainer() { + PostgreSQLContainer postgresContainer() { return TestImage.container(PostgreSQLContainer.class); } @@ -176,7 +176,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B static class TestcontainersRootBeanDefinition extends RootBeanDefinition implements TestcontainerBeanDefinition { - private final PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + private final PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); TestcontainersRootBeanDefinition() { setBeanClass(PostgreSQLContainer.class); diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java index 12feddd4a678..8fafcb9f92cc 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java @@ -21,9 +21,9 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.testcontainers.utility.DockerImageName; import org.springframework.boot.testsupport.container.TestImage; @@ -67,7 +67,7 @@ DataSource dataSource() { } - static class StartCountingPostgreSQLContainer extends PostgreSQLContainer { + static class StartCountingPostgreSQLContainer extends PostgreSQLContainer { final AtomicInteger startCount = new AtomicInteger(); diff --git a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ConnectionDetailsRegistrarTests.java b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ConnectionDetailsRegistrarTests.java index 85f99ec452b6..f5963747ece2 100644 --- a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ConnectionDetailsRegistrarTests.java +++ b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ConnectionDetailsRegistrarTests.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -45,7 +45,7 @@ class ConnectionDetailsRegistrarTests { private Origin origin; - private PostgreSQLContainer container; + private PostgreSQLContainer container; private MergedAnnotation annotation; diff --git a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactoryTests.java b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactoryTests.java index 44dd6de228a1..cd77616c4836 100644 --- a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactoryTests.java +++ b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactoryTests.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.JdbcDatabaseContainer; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory; @@ -50,7 +50,7 @@ class ContainerConnectionDetailsFactoryTests { private Origin origin; - private PostgreSQLContainer container; + private PostgreSQLContainer container; private MergedAnnotation annotation; diff --git a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSourceTests.java b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSourceTests.java index cb02563e6e3d..fb6180a08482 100644 --- a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSourceTests.java +++ b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSourceTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.containers.FutureContainer; import org.testcontainers.containers.JdbcDatabaseContainer; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; import org.springframework.boot.origin.Origin; @@ -45,7 +45,7 @@ class ContainerConnectionSourceTests { private Origin origin; - private PostgreSQLContainer container; + private PostgreSQLContainer container; private MergedAnnotation annotation; diff --git a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerTests.java b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerTests.java index 715e1635e84d..158314b01b72 100644 --- a/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerTests.java +++ b/core/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -51,7 +51,7 @@ class ServiceConnectionContextCustomizerTests { private Origin origin; - private PostgreSQLContainer container; + private PostgreSQLContainer container; private MergedAnnotation annotation; @@ -94,8 +94,8 @@ void customizeContextRegistersServiceConnections() { @Test void equalsAndHashCode() { - PostgreSQLContainer container1 = mock(PostgreSQLContainer.class); - PostgreSQLContainer container2 = mock(PostgreSQLContainer.class); + PostgreSQLContainer container1 = mock(PostgreSQLContainer.class); + PostgreSQLContainer container2 = mock(PostgreSQLContainer.class); MergedAnnotation annotation1 = MergedAnnotation.of(ServiceConnection.class, Map.of("name", "", "type", new Class[0])); MergedAnnotation annotation2 = MergedAnnotation.of(ServiceConnection.class, diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index 244d3d0329be..70f92eae69de 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/documentation/spring-boot-docs/build.gradle @@ -212,10 +212,10 @@ dependencies { implementation("org.springframework.security:spring-security-web") implementation("org.springframework.ws:spring-ws-core") implementation("org.springframework.ws:spring-ws-test") - implementation("org.testcontainers:junit-jupiter") - implementation("org.testcontainers:neo4j") - implementation("org.testcontainers:mongodb") - implementation("org.testcontainers:elasticsearch") + implementation("org.testcontainers:testcontainers-junit-jupiter") + implementation("org.testcontainers:testcontainers-neo4j") + implementation("org.testcontainers:testcontainers-mongodb") + implementation("org.testcontainers:testcontainers-elasticsearch") implementation("org.junit.jupiter:junit-jupiter") implementation("org.yaml:snakeyaml") diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc index 66de4898c468..1d76e592d3c3 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc @@ -49,7 +49,7 @@ NOTE: In most cases, you will additionally need to configure the application to A common pattern with Testcontainers is to declare the container instances as static fields in an interface. -For example, the following interface declares two containers, one named `mongo` of type javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.containers.MongoDBContainer[] and another named `neo4j` of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[]: +For example, the following interface declares two containers, one named `mongo` of type javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.mongodb.MongoDBContainer[] and another named `neo4j` of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.neo4j.Neo4jContainer[]: include-code::MyContainers[] @@ -150,10 +150,10 @@ The following service connection factories are provided in the `spring-boot-test | Containers of type javadoc:{url-testcontainers-jdbc-javadoc}/org.testcontainers.containers.JdbcDatabaseContainer[] | javadoc:org.springframework.boot.mongodb.autoconfigure.MongoConnectionDetails[] -| Containers of type javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.containers.MongoDBContainer[] or javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.mongodb.MongoDBAtlasLocalContainer[] +| Containers of type javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.mongodb.MongoDBContainer[] or javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.mongodb.MongoDBAtlasLocalContainer[] | javadoc:org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails[] -| Containers of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[] +| Containers of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.neo4j.Neo4jContainer[] | javadoc:org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails[] | Containers named "otel/opentelemetry-collector-contrib" or of type javadoc:org.testcontainers.grafana.LgtmStackContainer[] @@ -165,16 +165,16 @@ The following service connection factories are provided in the `spring-boot-test | Containers named "otel/opentelemetry-collector-contrib" or of type javadoc:org.testcontainers.grafana.LgtmStackContainer[] | javadoc:org.springframework.boot.pulsar.autoconfigure.PulsarConnectionDetails[] -| Containers of type javadoc:{url-testcontainers-pulsar-javadoc}/org.testcontainers.containers.PulsarContainer[] +| Containers of type javadoc:{url-testcontainers-pulsar-javadoc}/org.testcontainers.pulsar.PulsarContainer[] | javadoc:org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails[] | Containers of type javadoc:org.testcontainers.clickhouse.ClickHouseContainer[], -javadoc:{url-testcontainers-mariadb-javadoc}/org.testcontainers.containers.MariaDBContainer[], javadoc:{url-testcontainers-mssqlserver-javadoc}/org.testcontainers.containers.MSSQLServerContainer[], javadoc:{url-testcontainers-mysql-javadoc}/org.testcontainers.containers.MySQLContainer[], -javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javadoc:{url-testcontainers-oracle-xe-javadoc}/org.testcontainers.containers.OracleContainer[OracleContainer (XE)] or javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.containers.PostgreSQLContainer[] +javadoc:{url-testcontainers-mariadb-javadoc}/org.testcontainers.mariadb.MariaDBContainer[], javadoc:{url-testcontainers-mssqlserver-javadoc}/org.testcontainers.mssqlserver.MSSQLServerContainer[], javadoc:{url-testcontainers-mysql-javadoc}/org.testcontainers.mysql.MySQLContainer[], +javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javadoc:{url-testcontainers-oracle-xe-javadoc}/org.testcontainers.containers.OracleContainer[OracleContainer (XE)] or javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.postgresql.PostgreSQLContainer[] | javadoc:org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails[] -| Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.containers.RabbitMQContainer[] +| Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[] | javadoc:org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails[] | Containers of type javadoc:com.redis.testcontainers.RedisContainer[] or javadoc:com.redis.testcontainers.RedisStackContainer[], or containers named "redis", "redis/redis-stack" or "redis/redis-stack-server" @@ -186,7 +186,7 @@ javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javad [TIP] ==== By default all applicable connection details beans will be created for a given javadoc:org.testcontainers.containers.Container[]. -For example, a javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.containers.PostgreSQLContainer[] will create both javadoc:org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails[] and javadoc:org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails[]. +For example, a javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.postgresql.PostgreSQLContainer[] will create both javadoc:org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails[] and javadoc:org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails[]. If you want to create only a subset of the applicable types, you can use the `type` attribute of javadoc:org.springframework.boot.testcontainers.service.connection.ServiceConnection[format=annotation]. ==== @@ -197,7 +197,7 @@ This works as long as Spring Boot is able to get the instance of the javadoc:org If you're using a javadoc:org.springframework.context.annotation.Bean[format=annotation] method, Spring Boot won't call the bean method to get the Docker image name, because this would cause eager initialization issues. Instead, the return type of the bean method is used to find out which connection detail should be used. -This works as long as you're using typed containers such as javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[] or javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.containers.RabbitMQContainer[]. +This works as long as you're using typed containers such as javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.neo4j.Neo4jContainer[] or javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[]. This stops working if you're using javadoc:org.testcontainers.containers.GenericContainer[], for example with Redis as shown in the following example: include-code::MyRedisConfiguration[] diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java index 528d2279e675..bccc5e6d7aff 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.devtools; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.boot.devtools.restart.RestartScope; import org.springframework.boot.test.context.TestConfiguration; diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java index 625cd2c5eeeb..2055143bfccd 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.dynamicproperties; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.java index ba4beca4f1c5..e2d318f3ce20 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.java @@ -16,9 +16,9 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.importingcontainerdeclarations; -import org.testcontainers.containers.MongoDBContainer; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.mongodb.MongoDBContainer; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -30,6 +30,6 @@ public interface MyContainers { @Container @ServiceConnection - Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:5"); + Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:5"); } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.java index 3017357d974e..7a8624f2626b 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.test; -import org.testcontainers.containers.Neo4jContainer; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -27,8 +27,8 @@ public class MyContainersConfiguration { @Bean @ServiceConnection - public Neo4jContainer neo4jContainer() { - return new Neo4jContainer<>("neo4j:5"); + public Neo4jContainer neo4jContainer() { + return new Neo4jContainer("neo4j:5"); } } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.java index 472c7a5527b6..7bd595dcff31 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.docs.testing.testcontainers.dynamicproperties; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.DynamicPropertyRegistry; @@ -30,7 +30,7 @@ class MyIntegrationTests { @Container - static Neo4jContainer neo4j = new Neo4jContainer<>("neo4j:5"); + static Neo4jContainer neo4j = new Neo4jContainer("neo4j:5"); @Test void myTest() { diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.java index 2a819052dc28..5472ea9e5b68 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.java @@ -16,9 +16,9 @@ package org.springframework.boot.docs.testing.testcontainers.importingconfigurationinterfaces; -import org.testcontainers.containers.MongoDBContainer; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.mongodb.MongoDBContainer; +import org.testcontainers.neo4j.Neo4jContainer; interface MyContainers { @@ -26,6 +26,6 @@ interface MyContainers { MongoDBContainer mongoContainer = new MongoDBContainer("mongo:5.0"); @Container - Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:5"); + Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:5"); } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.java index 6f07db3a8726..1ecd0d3588f5 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.docs.testing.testcontainers.junitextension; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.SpringBootTest; @@ -28,7 +28,7 @@ class MyIntegrationTests { @Container - static Neo4jContainer neo4j = new Neo4jContainer<>("neo4j:5"); + static Neo4jContainer neo4j = new Neo4jContainer("neo4j:5"); @Test void myTest() { diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.java index cf4ade782672..af6a817daef1 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.docs.testing.testcontainers.serviceconnections; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -30,7 +30,7 @@ class MyIntegrationTests { @Container @ServiceConnection - static Neo4jContainer neo4j = new Neo4jContainer<>("neo4j:5"); + static Neo4jContainer neo4j = new Neo4jContainer("neo4j:5"); @Test void myTest() { diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.java index 35a6dc4aae48..c130b3de468a 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.boot.docs.testing.testcontainers.springbeans; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.java index 43717b73062c..80a49144d3eb 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.testing.testcontainers.springbeans; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.testcontainers.utility.DockerImageName; import org.springframework.boot.test.context.TestConfiguration; diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt index c26ee1d13715..e33f7ac520ee 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt @@ -19,7 +19,7 @@ import org.springframework.boot.devtools.restart.RestartScope import org.springframework.boot.test.context.TestConfiguration import org.springframework.boot.testcontainers.service.connection.ServiceConnection import org.springframework.context.annotation.Bean -import org.testcontainers.containers.MongoDBContainer +import org.testcontainers.mongodb.MongoDBContainer @TestConfiguration(proxyBeanMethods = false) class MyContainersConfiguration { diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.kt index 60a371ab7696..4610c32bf51a 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.kt @@ -19,7 +19,7 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdeve import org.springframework.boot.test.context.TestConfiguration import org.springframework.context.annotation.Bean import org.springframework.test.context.DynamicPropertyRegistrar; -import org.testcontainers.containers.MongoDBContainer +import org.testcontainers.mongodb.MongoDBContainer @TestConfiguration(proxyBeanMethods = false) class MyContainersConfiguration { diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.kt index da59836466dd..cc8dc3b8a0e9 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.kt @@ -17,9 +17,9 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.importingcontainerdeclarations import org.springframework.boot.testcontainers.service.connection.ServiceConnection -import org.testcontainers.containers.MongoDBContainer -import org.testcontainers.containers.Neo4jContainer import org.testcontainers.junit.jupiter.Container +import org.testcontainers.mongodb.MongoDBContainer +import org.testcontainers.neo4j.Neo4jContainer interface MyContainers { diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.kt index d6bc2f743902..7b05710d11f7 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/devservices/testcontainers/atdevelopmenttime/test/MyContainersConfiguration.kt @@ -19,14 +19,14 @@ package org.springframework.boot.docs.features.devservices.testcontainers.atdeve import org.springframework.boot.test.context.TestConfiguration import org.springframework.boot.testcontainers.service.connection.ServiceConnection import org.springframework.context.annotation.Bean -import org.testcontainers.containers.Neo4jContainer +import org.testcontainers.neo4j.Neo4jContainer @TestConfiguration(proxyBeanMethods = false) class MyContainersConfiguration { @Bean @ServiceConnection - fun neo4jContainer(): Neo4jContainer<*> { + fun neo4jContainer(): Neo4jContainer { return Neo4jContainer("neo4j:5") } diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt index 7bb07be52102..26d530f9f6ea 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt @@ -19,9 +19,9 @@ import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.DynamicPropertyRegistry import org.springframework.test.context.DynamicPropertySource -import org.testcontainers.containers.Neo4jContainer import org.testcontainers.junit.jupiter.Container import org.testcontainers.junit.jupiter.Testcontainers +import org.testcontainers.neo4j.Neo4jContainer @Testcontainers @SpringBootTest diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.kt index 63c26338bbef..256982b81cd4 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/importingconfigurationinterfaces/MyContainers.kt @@ -16,9 +16,9 @@ package org.springframework.boot.docs.testing.testcontainers.importingconfigurationinterfaces -import org.testcontainers.containers.MongoDBContainer -import org.testcontainers.containers.Neo4jContainer import org.testcontainers.junit.jupiter.Container +import org.testcontainers.mongodb.MongoDBContainer +import org.testcontainers.neo4j.Neo4jContainer interface MyContainers { @@ -28,7 +28,7 @@ interface MyContainers { val mongoContainer: MongoDBContainer = MongoDBContainer("mongo:5.0") @Container - val neo4jContainer: Neo4jContainer<*> = Neo4jContainer("neo4j:5") + val neo4jContainer: Neo4jContainer = Neo4jContainer("neo4j:5") } diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.kt index 65e049fb6f48..c992dfe3aa17 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/junitextension/MyIntegrationTests.kt @@ -17,9 +17,9 @@ package org.springframework.boot.docs.testing.testcontainers.junitextension import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.SpringBootTest; diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.kt index 9ff0c46c5c2b..5bc017e07fee 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.kt @@ -17,9 +17,9 @@ package org.springframework.boot.docs.testing.testcontainers.serviceconnections import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.kt index f708329ea92c..d8851fa18979 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyIntegrationTests.kt @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.context.annotation.Import -import org.testcontainers.containers.MongoDBContainer +import org.testcontainers.mongodb.MongoDBContainer @SpringBootTest @Import(MyTestConfiguration::class) diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.kt index 54a37264e169..7624f099345a 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/springbeans/MyTestConfiguration.kt @@ -17,7 +17,7 @@ package org.springframework.boot.docs.testing.testcontainers.springbeans import org.springframework.boot.test.context.TestConfiguration import org.springframework.context.annotation.Bean -import org.testcontainers.containers.MongoDBContainer +import org.testcontainers.mongodb.MongoDBContainer import org.testcontainers.utility.DockerImageName @TestConfiguration(proxyBeanMethods = false) diff --git a/integration-test/spring-boot-loader-integration-tests/build.gradle b/integration-test/spring-boot-loader-integration-tests/build.gradle index 836a7c209cc9..a1910a709bd2 100644 --- a/integration-test/spring-boot-loader-integration-tests/build.gradle +++ b/integration-test/spring-boot-loader-integration-tests/build.gradle @@ -38,7 +38,7 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/integration-test/spring-boot-sni-integration-tests/build.gradle b/integration-test/spring-boot-sni-integration-tests/build.gradle index 0f8393f9b92b..82d4ed57e2a6 100644 --- a/integration-test/spring-boot-sni-integration-tests/build.gradle +++ b/integration-test/spring-boot-sni-integration-tests/build.gradle @@ -40,7 +40,7 @@ dependencies { intTestImplementation(project(":starter:spring-boot-starter-webmvc")) intTestImplementation(project(":test-support:spring-boot-test-support")) intTestImplementation(project(":starter:spring-boot-starter-test")) - intTestImplementation("org.testcontainers:junit-jupiter") + intTestImplementation("org.testcontainers:testcontainers-junit-jupiter") intTestImplementation("org.testcontainers:testcontainers") } diff --git a/module/spring-boot-activemq/build.gradle b/module/spring-boot-activemq/build.gradle index 37186fcf878e..c41d9795231b 100644 --- a/module/spring-boot-activemq/build.gradle +++ b/module/spring-boot-activemq/build.gradle @@ -38,12 +38,12 @@ dependencies { optional("org.messaginghub:pooled-jms") { exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec" } - optional("org.testcontainers:activemq") + optional("org.testcontainers:testcontainers-activemq") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) dockerTestImplementation("ch.qos.logback:logback-classic") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-amqp/build.gradle b/module/spring-boot-amqp/build.gradle index 89de82d77918..0152cb160b86 100644 --- a/module/spring-boot-amqp/build.gradle +++ b/module/spring-boot-amqp/build.gradle @@ -41,12 +41,12 @@ dependencies { optional(project(":module:spring-boot-micrometer-metrics")) optional("io.micrometer:micrometer-core") optional("org.springframework.amqp:spring-rabbit-stream") - optional("org.testcontainers:rabbitmq") + optional("org.testcontainers:testcontainers-rabbitmq") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) dockerTestImplementation("ch.qos.logback:logback-classic") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java index 4efbcd087315..898f9fad3dc5 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,9 +22,9 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.RabbitMQContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.rabbitmq.RabbitMQContainer; import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java index ec74a57c4919..8049dd52218c 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java +++ b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java @@ -20,7 +20,7 @@ import java.util.List; import org.jspecify.annotations.Nullable; -import org.testcontainers.containers.RabbitMQContainer; +import org.testcontainers.rabbitmq.RabbitMQContainer; import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.ssl.SslBundle; diff --git a/module/spring-boot-artemis/build.gradle b/module/spring-boot-artemis/build.gradle index 72e6062d01af..ee5a4979a2b9 100644 --- a/module/spring-boot-artemis/build.gradle +++ b/module/spring-boot-artemis/build.gradle @@ -37,12 +37,12 @@ dependencies { optional("org.messaginghub:pooled-jms") { exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec" } - optional("org.testcontainers:activemq") + optional("org.testcontainers:testcontainers-activemq") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) dockerTestImplementation("ch.qos.logback:logback-classic") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-cache/build.gradle b/module/spring-boot-cache/build.gradle index 79e9b4dc94f9..2e170c0dacd3 100644 --- a/module/spring-boot-cache/build.gradle +++ b/module/spring-boot-cache/build.gradle @@ -57,7 +57,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("com.redis:testcontainers-redis") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") testImplementation(project(":core:spring-boot-test")) diff --git a/module/spring-boot-cassandra/build.gradle b/module/spring-boot-cassandra/build.gradle index 9aeff368ddb9..1c9f8ee89a18 100644 --- a/module/spring-boot-cassandra/build.gradle +++ b/module/spring-boot-cassandra/build.gradle @@ -34,13 +34,13 @@ dependencies { optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-health")) optional("io.projectreactor:reactor-core") - optional("org.testcontainers:cassandra") + optional("org.testcontainers:testcontainers-cassandra") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:cassandra") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-cassandra") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-couchbase/build.gradle b/module/spring-boot-couchbase/build.gradle index ac4e2309c45e..91eae95ebab5 100644 --- a/module/spring-boot-couchbase/build.gradle +++ b/module/spring-boot-couchbase/build.gradle @@ -34,12 +34,12 @@ dependencies { optional(project(":module:spring-boot-health")) optional(project(":module:spring-boot-jackson")) optional("com.fasterxml.jackson.core:jackson-databind") - optional("org.testcontainers:couchbase") + optional("org.testcontainers:testcontainers-couchbase") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) 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 ab654019765e..aa48ddaa7bc2 100644 --- a/module/spring-boot-data-cassandra-test/build.gradle +++ b/module/spring-boot-data-cassandra-test/build.gradle @@ -36,8 +36,8 @@ dependencies { dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:cassandra") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-cassandra") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-cassandra/build.gradle b/module/spring-boot-data-cassandra/build.gradle index 42cfd72eb5f1..68ea7b2f59bc 100644 --- a/module/spring-boot-data-cassandra/build.gradle +++ b/module/spring-boot-data-cassandra/build.gradle @@ -36,8 +36,8 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:cassandra") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-cassandra") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-couchbase-test/build.gradle b/module/spring-boot-data-couchbase-test/build.gradle index 81001a3cc35c..c9b1843793e4 100644 --- a/module/spring-boot-data-couchbase-test/build.gradle +++ b/module/spring-boot-data-couchbase-test/build.gradle @@ -35,8 +35,8 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:couchbase") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-couchbase") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") dockerTestCompileOnly("com.google.code.findbugs:jsr305") diff --git a/module/spring-boot-data-elasticsearch-test/build.gradle b/module/spring-boot-data-elasticsearch-test/build.gradle index 0be074f5731d..613d996d8257 100644 --- a/module/spring-boot-data-elasticsearch-test/build.gradle +++ b/module/spring-boot-data-elasticsearch-test/build.gradle @@ -38,8 +38,8 @@ dependencies { dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:elasticsearch") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-elasticsearch/build.gradle b/module/spring-boot-data-elasticsearch/build.gradle index 63be8b7fceb2..50be6423f259 100644 --- a/module/spring-boot-data-elasticsearch/build.gradle +++ b/module/spring-boot-data-elasticsearch/build.gradle @@ -40,8 +40,8 @@ dependencies { dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("ch.qos.logback:logback-classic") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:elasticsearch") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-jdbc/build.gradle b/module/spring-boot-data-jdbc/build.gradle index 840f2e255827..ec310d551be5 100644 --- a/module/spring-boot-data-jdbc/build.gradle +++ b/module/spring-boot-data-jdbc/build.gradle @@ -36,9 +36,9 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("ch.qos.logback:logback-classic") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:mariadb") - dockerTestImplementation("org.testcontainers:mysql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-mariadb") + dockerTestImplementation("org.testcontainers:testcontainers-mysql") dockerTestRuntimeOnly("com.mysql:mysql-connector-j") dockerTestRuntimeOnly("com.zaxxer:HikariCP") diff --git a/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java b/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java index eded84b48daa..651dab9a796d 100644 --- a/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java +++ b/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java @@ -18,9 +18,9 @@ import org.junit.jupiter.api.Test; import org.testcontainers.containers.JdbcDatabaseContainer; -import org.testcontainers.containers.MariaDBContainer; -import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mariadb.MariaDBContainer; +import org.testcontainers.mysql.MySQLContainer; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; diff --git a/module/spring-boot-data-ldap-test/build.gradle b/module/spring-boot-data-ldap-test/build.gradle index b4dedcceca7b..663edca291ee 100644 --- a/module/spring-boot-data-ldap-test/build.gradle +++ b/module/spring-boot-data-ldap-test/build.gradle @@ -36,7 +36,7 @@ dependencies { dockerTestImplementation(testFixtures(project(":core:spring-boot-autoconfigure"))) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-mongodb-test/build.gradle b/module/spring-boot-data-mongodb-test/build.gradle index 356c2df6e126..0749d2145c98 100644 --- a/module/spring-boot-data-mongodb-test/build.gradle +++ b/module/spring-boot-data-mongodb-test/build.gradle @@ -40,8 +40,8 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.mongodb:mongodb-driver-reactivestreams") dockerTestImplementation("org.mongodb:mongodb-driver-sync") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-mongodb") dockerTestImplementation("org.testcontainers:testcontainers") dockerTestCompileOnly("com.google.code.findbugs:jsr305") diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java index 66f5bfb0c584..aa213e789440 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.mongodb.test.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java index df3ef6ecf117..ec607b4b91d2 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java @@ -19,9 +19,9 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java index 29115e14d9db..297c6b5d33f2 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.mongodb.test.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java index fa82c6a285ef..7f5b5406a1bc 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.mongodb.test.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +48,7 @@ class TransactionalDataMongoTestIntegrationTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class); + static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class).withReplicaSet(); @Autowired private ExampleRepository exampleRepository; diff --git a/module/spring-boot-data-neo4j-test/build.gradle b/module/spring-boot-data-neo4j-test/build.gradle index 5c7dd7445a4e..73b336d2c366 100644 --- a/module/spring-boot-data-neo4j-test/build.gradle +++ b/module/spring-boot-data-neo4j-test/build.gradle @@ -37,8 +37,8 @@ dependencies { dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:neo4j") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-neo4j") dockerTestImplementation("org.testcontainers:testcontainers") testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java index 5d360ef9b168..0d7e68b1e53b 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.neo4j.test.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +49,7 @@ class DataNeo4jTestIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); @Autowired private Neo4jTemplate neo4jTemplate; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java index 7efa67eafb76..20772d2b63f8 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java @@ -18,9 +18,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -44,7 +44,7 @@ class DataNeo4jTestPropertiesIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); @Autowired private Environment environment; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java index b7f1f88feaa3..8d2786270c0b 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java @@ -20,9 +20,9 @@ import org.junit.jupiter.api.Test; import org.neo4j.driver.Driver; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -57,7 +57,7 @@ class DataNeo4jTestReactiveIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); @Autowired private ReactiveNeo4jTemplate neo4jTemplate; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java index a633d2672187..5885dd1998fa 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.neo4j.test.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -44,7 +44,7 @@ class DataNeo4jTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); @Autowired private ExampleService service; diff --git a/module/spring-boot-data-neo4j/build.gradle b/module/spring-boot-data-neo4j/build.gradle index 8c1323ba8aa6..73f38b28872c 100644 --- a/module/spring-boot-data-neo4j/build.gradle +++ b/module/spring-boot-data-neo4j/build.gradle @@ -39,8 +39,8 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("ch.qos.logback:logback-classic") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:neo4j") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-neo4j") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java index 9072b10a9fc0..f3108c1c21c8 100644 --- a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java @@ -17,9 +17,9 @@ package org.springframework.boot.data.neo4j.autoconfigure; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -44,7 +44,7 @@ class Neo4jRepositoriesAutoConfigurationIntegrationTests { @Container - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/module/spring-boot-data-redis-test/build.gradle b/module/spring-boot-data-redis-test/build.gradle index 4476fe889f3b..b33e4b3da6af 100644 --- a/module/spring-boot-data-redis-test/build.gradle +++ b/module/spring-boot-data-redis-test/build.gradle @@ -38,7 +38,7 @@ dependencies { dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") dockerTestRuntimeOnly("io.lettuce:lettuce-core") diff --git a/module/spring-boot-data-redis/build.gradle b/module/spring-boot-data-redis/build.gradle index db71cc79ad14..4f9843b7c543 100644 --- a/module/spring-boot-data-redis/build.gradle +++ b/module/spring-boot-data-redis/build.gradle @@ -50,7 +50,7 @@ dependencies { dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) dockerTestImplementation(testFixtures(project(":core:spring-boot-testcontainers"))) dockerTestImplementation("ch.qos.logback:logback-classic") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-elasticsearch/build.gradle b/module/spring-boot-elasticsearch/build.gradle index 359a7b446ee5..8b9d4d86a5d3 100644 --- a/module/spring-boot-elasticsearch/build.gradle +++ b/module/spring-boot-elasticsearch/build.gradle @@ -41,14 +41,14 @@ dependencies { optional("org.springframework.data:spring-data-elasticsearch") { exclude group: "org.elasticsearch.client", module: "transport" } - optional("org.testcontainers:elasticsearch") + optional("org.testcontainers:testcontainers-elasticsearch") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":module:spring-boot-jackson")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:elasticsearch") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-flyway/build.gradle b/module/spring-boot-flyway/build.gradle index 08a9b1592491..6a06299fdadc 100644 --- a/module/spring-boot-flyway/build.gradle +++ b/module/spring-boot-flyway/build.gradle @@ -39,13 +39,13 @@ dependencies { optional("org.flywaydb:flyway-database-oracle") optional("org.flywaydb:flyway-database-postgresql") optional("org.flywaydb:flyway-sqlserver") - optional("org.testcontainers:jdbc") + optional("org.testcontainers:testcontainers-jdbc") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") dockerTestRuntimeOnly("org.postgresql:postgresql") testImplementation(project(":core:spring-boot-test")) diff --git a/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java b/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java index 7adf484ce65a..78775f54bd42 100644 --- a/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java @@ -18,9 +18,9 @@ import org.flywaydb.core.Flyway; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -46,7 +46,7 @@ class FlywayContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-hazelcast/build.gradle b/module/spring-boot-hazelcast/build.gradle index 2b6087c120dc..de8962f03aaf 100644 --- a/module/spring-boot-hazelcast/build.gradle +++ b/module/spring-boot-hazelcast/build.gradle @@ -42,7 +42,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-jdbc-test/build.gradle b/module/spring-boot-jdbc-test/build.gradle index d857b7080b05..1dfc4c4a2f1c 100644 --- a/module/spring-boot-jdbc-test/build.gradle +++ b/module/spring-boot-jdbc-test/build.gradle @@ -40,8 +40,8 @@ dependencies { dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.postgresql:postgresql") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":module:spring-boot-transaction")) diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java index ffab7ab7ea3c..d7d5b17bae65 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java @@ -20,9 +20,9 @@ import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -50,7 +50,7 @@ class AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests { @Container - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java index e0779b8d6cb4..4c7571a31691 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java @@ -19,8 +19,8 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -52,7 +52,7 @@ class AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests { @Container - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java index 133ac4ad8297..b600936e1e48 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java @@ -20,9 +20,9 @@ import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -51,7 +51,7 @@ class AutoConfigureTestDatabaseServiceConnectionIntegrationTests { @Container @ServiceConnection - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc/build.gradle b/module/spring-boot-jdbc/build.gradle index c910d8fce98f..b392250e97b6 100644 --- a/module/spring-boot-jdbc/build.gradle +++ b/module/spring-boot-jdbc/build.gradle @@ -50,14 +50,14 @@ dependencies { } optional("org.apache.tomcat:tomcat-jdbc") optional("org.postgresql:postgresql") - optional("org.testcontainers:jdbc") + optional("org.testcontainers:testcontainers-jdbc") optional("org.vibur:vibur-dbcp") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") dockerTestRuntimeOnly("com.clickhouse:clickhouse-jdbc") dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc") @@ -88,7 +88,7 @@ dependencies { testRuntimeOnly("org.firebirdsql.jdbc:jaybird") { exclude group: "javax.resource", module: "connector-api" } - testRuntimeOnly("org.testcontainers:jdbc") { + testRuntimeOnly("org.testcontainers:testcontainers-jdbc") { exclude group: "javax.annotation", module: "javax.annotation-api" exclude group: "javax.xml.bind", module: "jaxb-api" } diff --git a/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java b/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java index 6525ebd2d34c..26ee0c268d8d 100644 --- a/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java @@ -19,9 +19,9 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -48,7 +48,7 @@ class JdbcContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-kafka/build.gradle b/module/spring-boot-kafka/build.gradle index d10980ba2ff8..8f018755ba86 100644 --- a/module/spring-boot-kafka/build.gradle +++ b/module/spring-boot-kafka/build.gradle @@ -33,12 +33,12 @@ dependencies { optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-micrometer-metrics")) optional("org.apache.kafka:kafka-streams") - optional("org.testcontainers:kafka") - optional("org.testcontainers:redpanda") + optional("org.testcontainers:testcontainers-kafka") + optional("org.testcontainers:testcontainers-redpanda") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-ldap/build.gradle b/module/spring-boot-ldap/build.gradle index 6619f3879b7e..fec91a85d35f 100644 --- a/module/spring-boot-ldap/build.gradle +++ b/module/spring-boot-ldap/build.gradle @@ -36,12 +36,12 @@ dependencies { optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-health")) optional("com.unboundid:unboundid-ldapsdk") - optional("org.testcontainers:ldap") + optional("org.testcontainers:testcontainers-ldap") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-liquibase/build.gradle b/module/spring-boot-liquibase/build.gradle index ef5c36aeadd7..c65d4a39ae75 100644 --- a/module/spring-boot-liquibase/build.gradle +++ b/module/spring-boot-liquibase/build.gradle @@ -38,13 +38,13 @@ dependencies { optional(project(":core:spring-boot-testcontainers")) optional(project(":core:spring-boot-test-autoconfigure")) optional(project(":module:spring-boot-actuator-autoconfigure")) - optional("org.testcontainers:jdbc") + optional("org.testcontainers:testcontainers-jdbc") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") dockerTestRuntimeOnly("org.postgresql:postgresql") testImplementation(project(":core:spring-boot-test")) diff --git a/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java b/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java index a2fd70ece8a6..ecfa85b0ed45 100644 --- a/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java @@ -18,9 +18,9 @@ import liquibase.integration.spring.SpringLiquibase; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -46,7 +46,7 @@ class LiquibaseContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-mail/build.gradle b/module/spring-boot-mail/build.gradle index 91d14d439bfc..4ae3da2fdab6 100644 --- a/module/spring-boot-mail/build.gradle +++ b/module/spring-boot-mail/build.gradle @@ -38,7 +38,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.testcontainers:testcontainers") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-micrometer-metrics/build.gradle b/module/spring-boot-micrometer-metrics/build.gradle index 520f1f24bd79..ef685d15bf27 100644 --- a/module/spring-boot-micrometer-metrics/build.gradle +++ b/module/spring-boot-micrometer-metrics/build.gradle @@ -62,12 +62,12 @@ dependencies { optional("org.apache.kafka:kafka-streams") optional("org.apache.logging.log4j:log4j-core") optional("org.aspectj:aspectjweaver") - optional("org.testcontainers:grafana") + optional("org.testcontainers:testcontainers-grafana") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) dockerTestImplementation("io.rest-assured:rest-assured") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testFixturesImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-micrometer-tracing/build.gradle b/module/spring-boot-micrometer-tracing/build.gradle index 4d07b99375ae..b0916b886828 100644 --- a/module/spring-boot-micrometer-tracing/build.gradle +++ b/module/spring-boot-micrometer-tracing/build.gradle @@ -47,11 +47,11 @@ dependencies { optional("io.zipkin.reporter2:zipkin-reporter-brave") optional("org.aspectj:aspectjweaver") optional("org.junit.platform:junit-platform-launcher") - optional("org.testcontainers:grafana") + optional("org.testcontainers:testcontainers-grafana") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":module:spring-boot-opentelemetry")) diff --git a/module/spring-boot-mongodb/build.gradle b/module/spring-boot-mongodb/build.gradle index 5c9fb1a4d474..bf8a4709ca5d 100644 --- a/module/spring-boot-mongodb/build.gradle +++ b/module/spring-boot-mongodb/build.gradle @@ -39,12 +39,12 @@ dependencies { optional("io.netty:netty-transport") optional("org.mongodb:mongodb-driver-reactivestreams") optional("org.mongodb:mongodb-driver-sync") - optional("org.testcontainers:mongodb") + optional("org.testcontainers:testcontainers-mongodb") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.mongodb:mongodb-driver-sync") testImplementation(project(":core:spring-boot-test")) diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java index 993b41975b28..ffa0916a5284 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java @@ -26,9 +26,9 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.boot.health.contributor.Health; import org.springframework.boot.health.contributor.Status; diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java index c0292e8ea07f..692387237be6 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java @@ -28,9 +28,9 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.boot.health.contributor.Health; import org.springframework.boot.health.contributor.Status; diff --git a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbContainerConnectionDetailsFactory.java b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbContainerConnectionDetailsFactory.java index 958676e2d60d..7ffc3331a8ec 100644 --- a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbContainerConnectionDetailsFactory.java +++ b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbContainerConnectionDetailsFactory.java @@ -16,7 +16,7 @@ package org.springframework.boot.mongodb.testcontainers; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.boot.mongodb.autoconfigure.MongoConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; diff --git a/module/spring-boot-neo4j/build.gradle b/module/spring-boot-neo4j/build.gradle index e470980394a9..335533f41650 100644 --- a/module/spring-boot-neo4j/build.gradle +++ b/module/spring-boot-neo4j/build.gradle @@ -37,13 +37,13 @@ dependencies { optional(project(":module:spring-boot-health")) optional(project(":module:spring-boot-micrometer-observation")) optional("org.neo4j.driver:neo4j-java-driver-observation-micrometer") - optional("org.testcontainers:neo4j") + optional("org.testcontainers:testcontainers-neo4j") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:neo4j") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-neo4j") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") diff --git a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4/health/Neo4jReactiveHealthIndicatorIntegrationTests.java b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4/health/Neo4jReactiveHealthIndicatorIntegrationTests.java index 13c2ad702300..a5637563bdda 100644 --- a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4/health/Neo4jReactiveHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4/health/Neo4jReactiveHealthIndicatorIntegrationTests.java @@ -19,9 +19,9 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -50,7 +50,7 @@ class Neo4jReactiveHealthIndicatorIntegrationTests { // gh-33428 @Container - private static final Neo4jContainer neo4jServer = TestImage.container(Neo4jContainer.class); + private static final Neo4jContainer neo4jServer = TestImage.container(Neo4jContainer.class); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java index 9fdca2c1d98a..06f5c8407849 100644 --- a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java @@ -28,9 +28,9 @@ import org.neo4j.driver.Result; import org.neo4j.driver.Session; import org.neo4j.driver.Transaction; -import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -53,7 +53,7 @@ class Neo4jAutoConfigurationIntegrationTests { @Container - private static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + private static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); @SpringBootTest @Nested diff --git a/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/testcontainers/Neo4jContainerConnectionDetailsFactory.java b/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/testcontainers/Neo4jContainerConnectionDetailsFactory.java index 45bb06873cd1..278636d43ebe 100644 --- a/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/testcontainers/Neo4jContainerConnectionDetailsFactory.java +++ b/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/testcontainers/Neo4jContainerConnectionDetailsFactory.java @@ -20,7 +20,7 @@ import org.neo4j.driver.AuthToken; import org.neo4j.driver.AuthTokens; -import org.testcontainers.containers.Neo4jContainer; +import org.testcontainers.neo4j.Neo4jContainer; import org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; @@ -36,25 +36,24 @@ * @author Phillip Webb */ class Neo4jContainerConnectionDetailsFactory - extends ContainerConnectionDetailsFactory, Neo4jConnectionDetails> { + extends ContainerConnectionDetailsFactory { Neo4jContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "org.neo4j.driver.AuthToken"); } @Override - protected Neo4jConnectionDetails getContainerConnectionDetails( - ContainerConnectionSource> source) { + protected Neo4jConnectionDetails getContainerConnectionDetails(ContainerConnectionSource source) { return new Neo4jContainerConnectionDetails(source); } /** * {@link Neo4jConnectionDetails} backed by a {@link ContainerConnectionSource}. */ - private static final class Neo4jContainerConnectionDetails extends ContainerConnectionDetails> + private static final class Neo4jContainerConnectionDetails extends ContainerConnectionDetails implements Neo4jConnectionDetails { - private Neo4jContainerConnectionDetails(ContainerConnectionSource> source) { + private Neo4jContainerConnectionDetails(ContainerConnectionSource source) { super(source); } diff --git a/module/spring-boot-opentelemetry/build.gradle b/module/spring-boot-opentelemetry/build.gradle index 8ee5e2bf19c1..30ee890c52c1 100644 --- a/module/spring-boot-opentelemetry/build.gradle +++ b/module/spring-boot-opentelemetry/build.gradle @@ -35,11 +35,11 @@ dependencies { optional(project(":core:spring-boot-testcontainers")) optional(project(":module:spring-boot-actuator-autoconfigure")) optional("io.opentelemetry:opentelemetry-exporter-otlp") - optional("org.testcontainers:grafana") + optional("org.testcontainers:testcontainers-grafana") dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-pulsar/build.gradle b/module/spring-boot-pulsar/build.gradle index 439a609dff42..b1f9a35b2504 100644 --- a/module/spring-boot-pulsar/build.gradle +++ b/module/spring-boot-pulsar/build.gradle @@ -33,13 +33,13 @@ dependencies { optional(project(":core:spring-boot-docker-compose")) optional(project(":core:spring-boot-testcontainers")) optional("org.springframework.pulsar:spring-pulsar-reactive") - optional("org.testcontainers:pulsar") + optional("org.testcontainers:testcontainers-pulsar") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:pulsar") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-pulsar") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java index a6fccaccf6b5..84e54c4bfe8e 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java @@ -20,9 +20,9 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PulsarContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.pulsar.PulsarContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java index 532c2941a5ce..05e3e3d28573 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,9 +22,9 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PulsarContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.pulsar.PulsarContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; diff --git a/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactory.java b/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactory.java index 6bc45179a5e9..be0ebed3cd65 100644 --- a/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactory.java +++ b/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactory.java @@ -16,7 +16,7 @@ package org.springframework.boot.pulsar.testcontainers; -import org.testcontainers.containers.PulsarContainer; +import org.testcontainers.pulsar.PulsarContainer; import org.springframework.boot.pulsar.autoconfigure.PulsarConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; diff --git a/module/spring-boot-r2dbc/build.gradle b/module/spring-boot-r2dbc/build.gradle index 43e0eb99775c..98048edfd8cf 100644 --- a/module/spring-boot-r2dbc/build.gradle +++ b/module/spring-boot-r2dbc/build.gradle @@ -47,21 +47,21 @@ dependencies { optional("io.r2dbc:r2dbc-pool") optional("io.r2dbc:r2dbc-proxy") optional("io.r2dbc:r2dbc-spi") - optional("org.testcontainers:clickhouse") - optional("org.testcontainers:jdbc") - optional("org.testcontainers:mariadb") - optional("org.testcontainers:mssqlserver") - optional("org.testcontainers:mysql") - optional("org.testcontainers:oracle-xe") - optional("org.testcontainers:oracle-free") - optional("org.testcontainers:postgresql") - optional("org.testcontainers:r2dbc") + optional("org.testcontainers:testcontainers-clickhouse") + optional("org.testcontainers:testcontainers-jdbc") + optional("org.testcontainers:testcontainers-mariadb") + optional("org.testcontainers:testcontainers-mssqlserver") + optional("org.testcontainers:testcontainers-mysql") + optional("org.testcontainers:testcontainers-oracle-xe") + optional("org.testcontainers:testcontainers-oracle-free") + optional("org.testcontainers:testcontainers-postgresql") + optional("org.testcontainers:testcontainers-r2dbc") dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":module:spring-boot-jdbc")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestRuntimeOnly("com.clickhouse:clickhouse-r2dbc") dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") diff --git a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MariaDbR2dbcContainerConnectionDetailsFactory.java b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MariaDbR2dbcContainerConnectionDetailsFactory.java index 922d20d36c61..9c69d7ea7628 100644 --- a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MariaDbR2dbcContainerConnectionDetailsFactory.java +++ b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MariaDbR2dbcContainerConnectionDetailsFactory.java @@ -17,8 +17,8 @@ package org.springframework.boot.r2dbc.testcontainers; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.testcontainers.containers.MariaDBContainer; -import org.testcontainers.containers.MariaDBR2DBCDatabaseContainer; +import org.testcontainers.mariadb.MariaDBContainer; +import org.testcontainers.mariadb.MariaDBR2DBCDatabaseContainer; import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; @@ -34,14 +34,14 @@ * @author Phillip Webb */ class MariaDbR2dbcContainerConnectionDetailsFactory - extends ContainerConnectionDetailsFactory, R2dbcConnectionDetails> { + extends ContainerConnectionDetailsFactory { MariaDbR2dbcContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions"); } @Override - public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource> source) { + public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource source) { return new MariaDbR2dbcDatabaseContainerConnectionDetails(source); } @@ -49,9 +49,9 @@ public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionS * {@link R2dbcConnectionDetails} backed by a {@link ContainerConnectionSource}. */ private static final class MariaDbR2dbcDatabaseContainerConnectionDetails - extends ContainerConnectionDetails> implements R2dbcConnectionDetails { + extends ContainerConnectionDetails implements R2dbcConnectionDetails { - private MariaDbR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource> source) { + private MariaDbR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource source) { super(source); } diff --git a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MySqlR2dbcContainerConnectionDetailsFactory.java b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MySqlR2dbcContainerConnectionDetailsFactory.java index bd2b82928806..d993fde6ff51 100644 --- a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MySqlR2dbcContainerConnectionDetailsFactory.java +++ b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/MySqlR2dbcContainerConnectionDetailsFactory.java @@ -17,8 +17,8 @@ package org.springframework.boot.r2dbc.testcontainers; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.testcontainers.containers.MySQLContainer; -import org.testcontainers.containers.MySQLR2DBCDatabaseContainer; +import org.testcontainers.mysql.MySQLContainer; +import org.testcontainers.mysql.MySQLR2DBCDatabaseContainer; import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; @@ -34,14 +34,14 @@ * @author Phillip Webb */ class MySqlR2dbcContainerConnectionDetailsFactory - extends ContainerConnectionDetailsFactory, R2dbcConnectionDetails> { + extends ContainerConnectionDetailsFactory { MySqlR2dbcContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions"); } @Override - public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource> source) { + public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource source) { return new MySqlR2dbcDatabaseContainerConnectionDetails(source); } @@ -49,9 +49,9 @@ public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionS * {@link R2dbcConnectionDetails} backed by a {@link ContainerConnectionSource}. */ private static final class MySqlR2dbcDatabaseContainerConnectionDetails - extends ContainerConnectionDetails> implements R2dbcConnectionDetails { + extends ContainerConnectionDetails implements R2dbcConnectionDetails { - private MySqlR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource> source) { + private MySqlR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource source) { super(source); } diff --git a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/PostgresR2dbcContainerConnectionDetailsFactory.java b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/PostgresR2dbcContainerConnectionDetailsFactory.java index dbf622510758..9adf914ce3a3 100644 --- a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/PostgresR2dbcContainerConnectionDetailsFactory.java +++ b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/PostgresR2dbcContainerConnectionDetailsFactory.java @@ -17,8 +17,8 @@ package org.springframework.boot.r2dbc.testcontainers; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.PostgreSQLR2DBCDatabaseContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; +import org.testcontainers.postgresql.PostgreSQLR2DBCDatabaseContainer; import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; @@ -34,15 +34,14 @@ * @author Phillip Webb */ class PostgresR2dbcContainerConnectionDetailsFactory - extends ContainerConnectionDetailsFactory, R2dbcConnectionDetails> { + extends ContainerConnectionDetailsFactory { PostgresR2dbcContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions"); } @Override - public R2dbcConnectionDetails getContainerConnectionDetails( - ContainerConnectionSource> source) { + public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource source) { return new PostgresR2dbcDatabaseContainerConnectionDetails(source); } @@ -50,9 +49,9 @@ public R2dbcConnectionDetails getContainerConnectionDetails( * {@link R2dbcConnectionDetails} backed by a {@link ContainerConnectionSource}. */ private static final class PostgresR2dbcDatabaseContainerConnectionDetails - extends ContainerConnectionDetails> implements R2dbcConnectionDetails { + extends ContainerConnectionDetails implements R2dbcConnectionDetails { - PostgresR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource> source) { + PostgresR2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource source) { super(source); } diff --git a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/SqlServerR2dbcContainerConnectionDetailsFactory.java b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/SqlServerR2dbcContainerConnectionDetailsFactory.java index 507ba77f0507..30bfa3a377c1 100644 --- a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/SqlServerR2dbcContainerConnectionDetailsFactory.java +++ b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/testcontainers/SqlServerR2dbcContainerConnectionDetailsFactory.java @@ -17,8 +17,8 @@ package org.springframework.boot.r2dbc.testcontainers; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.testcontainers.containers.MSSQLR2DBCDatabaseContainer; -import org.testcontainers.containers.MSSQLServerContainer; +import org.testcontainers.mssqlserver.MSSQLR2DBCDatabaseContainer; +import org.testcontainers.mssqlserver.MSSQLServerContainer; import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; @@ -34,7 +34,7 @@ * @author Phillip Webb */ class SqlServerR2dbcContainerConnectionDetailsFactory - extends ContainerConnectionDetailsFactory, R2dbcConnectionDetails> { + extends ContainerConnectionDetailsFactory { SqlServerR2dbcContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions"); @@ -42,7 +42,7 @@ class SqlServerR2dbcContainerConnectionDetailsFactory @Override public R2dbcConnectionDetails getContainerConnectionDetails( - ContainerConnectionSource> source) { + ContainerConnectionSource source) { return new MsSqlServerR2dbcDatabaseContainerConnectionDetails(source); } @@ -50,10 +50,10 @@ public R2dbcConnectionDetails getContainerConnectionDetails( * {@link R2dbcConnectionDetails} backed by a {@link ContainerConnectionSource}. */ private static final class MsSqlServerR2dbcDatabaseContainerConnectionDetails - extends ContainerConnectionDetails> implements R2dbcConnectionDetails { + extends ContainerConnectionDetails implements R2dbcConnectionDetails { private MsSqlServerR2dbcDatabaseContainerConnectionDetails( - ContainerConnectionSource> source) { + ContainerConnectionSource source) { super(source); } diff --git a/module/spring-boot-session-data-redis/build.gradle b/module/spring-boot-session-data-redis/build.gradle index 2e0b771cb3d3..940fa78a6929 100644 --- a/module/spring-boot-session-data-redis/build.gradle +++ b/module/spring-boot-session-data-redis/build.gradle @@ -41,7 +41,7 @@ dependencies { dockerTestImplementation(testFixtures(project(":module:spring-boot-web-server"))) dockerTestImplementation(testFixtures(project(":module:spring-boot-session"))) dockerTestImplementation("com.redis:testcontainers-redis") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestRuntimeOnly("jakarta.servlet:jakarta.servlet-api") diff --git a/module/spring-boot-zipkin/build.gradle b/module/spring-boot-zipkin/build.gradle index 788baa9d7f9f..25bb81404a52 100644 --- a/module/spring-boot-zipkin/build.gradle +++ b/module/spring-boot-zipkin/build.gradle @@ -37,7 +37,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(testFixtures(project(":core:spring-boot-docker-compose"))) - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":core:spring-boot-test")) testImplementation(project(":test-support:spring-boot-test-support")) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index ef19280b63d3..9e46f3a7b556 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2600,7 +2600,7 @@ bom { releaseNotes("https://github.com/xerial/sqlite-jdbc/releases/tag/{version}") } } - library("Testcontainers", "1.21.3") { + library("Testcontainers", "2.0.1") { group("org.testcontainers") { bom("testcontainers-bom") } diff --git a/smoke-test/spring-boot-smoke-test-activemq/build.gradle b/smoke-test/spring-boot-smoke-test-activemq/build.gradle index 59e67dedf889..05c870339761 100644 --- a/smoke-test/spring-boot-smoke-test-activemq/build.gradle +++ b/smoke-test/spring-boot-smoke-test-activemq/build.gradle @@ -28,8 +28,8 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:activemq") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-activemq") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-amqp/build.gradle b/smoke-test/spring-boot-smoke-test-amqp/build.gradle index 7877e79e76be..17cafdb9c40b 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-amqp/build.gradle @@ -28,8 +28,8 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:rabbitmq") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-rabbitmq") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java index 0254e02a77b5..e763ade7aa09 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java @@ -21,9 +21,9 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.RabbitMQContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.rabbitmq.RabbitMQContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java index d376111e5217..7599d2d4ff21 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java +++ b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java @@ -16,7 +16,7 @@ package smoketest.amqp; -import org.testcontainers.containers.RabbitMQContainer; +import org.testcontainers.rabbitmq.RabbitMQContainer; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; diff --git a/smoke-test/spring-boot-smoke-test-artemis/build.gradle b/smoke-test/spring-boot-smoke-test-artemis/build.gradle index 5d98c574d3b0..23d66cefc537 100644 --- a/smoke-test/spring-boot-smoke-test-artemis/build.gradle +++ b/smoke-test/spring-boot-smoke-test-artemis/build.gradle @@ -28,8 +28,8 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:activemq") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-activemq") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-cache/build.gradle b/smoke-test/spring-boot-smoke-test-cache/build.gradle index cd51f36cc5ff..01d9e34f6250 100644 --- a/smoke-test/spring-boot-smoke-test-cache/build.gradle +++ b/smoke-test/spring-boot-smoke-test-cache/build.gradle @@ -67,7 +67,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("com.redis:testcontainers-redis") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle b/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle index 0754c40fa888..771d935ce2cc 100644 --- a/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle @@ -33,8 +33,8 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") - dockerTestImplementation("org.testcontainers:cassandra") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-cassandra") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle b/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle index 7ae372a06fb9..38ee664b691d 100644 --- a/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle @@ -36,8 +36,8 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") - dockerTestImplementation("org.testcontainers:couchbase") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-couchbase") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle b/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle index ba00b57f5ee4..ff66ce4f9bec 100644 --- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle @@ -33,8 +33,8 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:elasticsearch") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle b/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle index 8931b0f1367b..b269a55fe9ef 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle @@ -34,8 +34,8 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-mongodb") dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java index 2d2abc7b54c4..353d7d4eb459 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java @@ -19,9 +19,9 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java index 1fa82b5b1db8..6f6836f11d85 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java @@ -17,9 +17,9 @@ package smoketest.data.mongodb; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.data.mongodb.test.autoconfigure.DataMongoTest; diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java index 1027000830c8..024a4a5d4caf 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java @@ -17,7 +17,7 @@ package smoketest.data.mongodb; import com.github.dockerjava.api.command.InspectContainerResponse; -import org.testcontainers.containers.MongoDBContainer; +import org.testcontainers.mongodb.MongoDBContainer; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; 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 76a9fa8edcf0..8b6c25136821 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 @@ -35,9 +35,9 @@ dependencies { dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("io.projectreactor:reactor-test") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") - dockerTestImplementation("org.testcontainers:r2dbc") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-r2dbc") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java index 662425a3f531..c77f798671ff 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -19,9 +19,9 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +44,7 @@ class CityRepositoryTests { @Container @ServiceConnection - static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) + static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) .withDatabaseName("test_flyway"); @Autowired 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 6993038ba825..8fcffba6c6ca 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 @@ -33,9 +33,9 @@ dependencies { dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("io.projectreactor:reactor-test") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:postgresql") - dockerTestImplementation("org.testcontainers:r2dbc") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-postgresql") + dockerTestImplementation("org.testcontainers:testcontainers-r2dbc") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java index 68a3866cd065..6b5af56e7d2b 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -19,9 +19,9 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.postgresql.PostgreSQLContainer; import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +44,7 @@ class CityRepositoryTests { @Container @ServiceConnection - static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) + static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) .withDatabaseName("test_liquibase"); @Autowired diff --git a/smoke-test/spring-boot-smoke-test-data-redis/build.gradle b/smoke-test/spring-boot-smoke-test-data-redis/build.gradle index 1ecaa5852d0b..5e4b5e7a9e9f 100644 --- a/smoke-test/spring-boot-smoke-test-data-redis/build.gradle +++ b/smoke-test/spring-boot-smoke-test-data-redis/build.gradle @@ -35,7 +35,7 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") dockerTestImplementation("redis.clients:jedis") } diff --git a/smoke-test/spring-boot-smoke-test-kafka/build.gradle b/smoke-test/spring-boot-smoke-test-kafka/build.gradle index 285e960dbfde..dee2af348c6d 100644 --- a/smoke-test/spring-boot-smoke-test-kafka/build.gradle +++ b/smoke-test/spring-boot-smoke-test-kafka/build.gradle @@ -39,8 +39,8 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:kafka") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-kafka") testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.awaitility:awaitility") diff --git a/smoke-test/spring-boot-smoke-test-pulsar/build.gradle b/smoke-test/spring-boot-smoke-test-pulsar/build.gradle index 3a896a8b5214..18b205190021 100644 --- a/smoke-test/spring-boot-smoke-test-pulsar/build.gradle +++ b/smoke-test/spring-boot-smoke-test-pulsar/build.gradle @@ -29,8 +29,8 @@ dependencies { dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:pulsar") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-pulsar") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java b/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java index 369aa372971d..bb17f94f05c6 100644 --- a/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java @@ -25,9 +25,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.PulsarContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.pulsar.PulsarContainer; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.system.CapturedOutput; diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle index abe5b6460ee9..9e8a815738ad 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle @@ -33,7 +33,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("com.redis:testcontainers-redis") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") } tasks.named("compileTestJava") { diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle index 3b07f903582c..e735cbf5221e 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle @@ -32,7 +32,7 @@ dependencies { dockerTestImplementation(project(":starter:spring-boot-starter-webmvc-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation("com.redis:testcontainers-redis") - dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") } tasks.named("compileTestJava") { diff --git a/system-test/spring-boot-deployment-system-tests/build.gradle b/system-test/spring-boot-deployment-system-tests/build.gradle index d358ffcfb0d7..e9e8f4078dca 100644 --- a/system-test/spring-boot-deployment-system-tests/build.gradle +++ b/system-test/spring-boot-deployment-system-tests/build.gradle @@ -47,7 +47,7 @@ dependencies { systemTestImplementation("org.apache.httpcomponents.client5:httpclient5") systemTestImplementation("org.slf4j:slf4j-simple") systemTestImplementation("org.springframework:spring-web") - systemTestImplementation("org.testcontainers:junit-jupiter") + systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter") systemTestImplementation("org.testcontainers:testcontainers") } diff --git a/system-test/spring-boot-image-system-tests/build.gradle b/system-test/spring-boot-image-system-tests/build.gradle index 55b529541702..bdde09fb5c12 100644 --- a/system-test/spring-boot-image-system-tests/build.gradle +++ b/system-test/spring-boot-image-system-tests/build.gradle @@ -55,7 +55,7 @@ dependencies { systemTestImplementation(project(":test-support:spring-boot-gradle-test-support")) systemTestImplementation(gradleTestKit()) systemTestImplementation("org.assertj:assertj-core") - systemTestImplementation("org.testcontainers:junit-jupiter") + systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter") systemTestImplementation("org.testcontainers:testcontainers") } diff --git a/test-support/spring-boot-docker-test-support/build.gradle b/test-support/spring-boot-docker-test-support/build.gradle index cf4cb12aa98c..74ed8f66f587 100644 --- a/test-support/spring-boot-docker-test-support/build.gradle +++ b/test-support/spring-boot-docker-test-support/build.gradle @@ -30,24 +30,24 @@ dependencies { compileOnly("org.junit.jupiter:junit-jupiter") compileOnly("org.springframework:spring-core") - optional("org.testcontainers:activemq") - optional("org.testcontainers:cassandra") - optional("org.testcontainers:couchbase") - optional("org.testcontainers:elasticsearch") - optional("org.testcontainers:grafana") - optional("org.testcontainers:junit-jupiter") - optional("org.testcontainers:kafka") - optional("org.testcontainers:ldap") - optional("org.testcontainers:mariadb") - optional("org.testcontainers:mongodb") - optional("org.testcontainers:mysql") - optional("org.testcontainers:neo4j") - optional("org.testcontainers:oracle-xe") - optional("org.testcontainers:oracle-free") - optional("org.testcontainers:postgresql") - optional("org.testcontainers:pulsar") - optional("org.testcontainers:rabbitmq") - optional("org.testcontainers:redpanda") + optional("org.testcontainers:testcontainers-activemq") + optional("org.testcontainers:testcontainers-cassandra") + optional("org.testcontainers:testcontainers-couchbase") + optional("org.testcontainers:testcontainers-elasticsearch") + optional("org.testcontainers:testcontainers-grafana") + optional("org.testcontainers:testcontainers-junit-jupiter") + optional("org.testcontainers:testcontainers-kafka") + optional("org.testcontainers:testcontainers-ldap") + optional("org.testcontainers:testcontainers-mariadb") + optional("org.testcontainers:testcontainers-mongodb") + optional("org.testcontainers:testcontainers-mysql") + optional("org.testcontainers:testcontainers-neo4j") + optional("org.testcontainers:testcontainers-oracle-xe") + optional("org.testcontainers:testcontainers-oracle-free") + optional("org.testcontainers:testcontainers-postgresql") + optional("org.testcontainers:testcontainers-pulsar") + optional("org.testcontainers:testcontainers-rabbitmq") + optional("org.testcontainers:testcontainers-redpanda") optional("com.redis:testcontainers-redis") } diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index 2a439be01694..0f930d19bc80 100644 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -30,19 +30,19 @@ import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.containers.Container; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.MariaDBContainer; -import org.testcontainers.containers.MongoDBContainer; -import org.testcontainers.containers.MySQLContainer; -import org.testcontainers.containers.Neo4jContainer; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.PulsarContainer; -import org.testcontainers.containers.RabbitMQContainer; import org.testcontainers.couchbase.CouchbaseContainer; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.grafana.LgtmStackContainer; import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.ldap.LLdapContainer; +import org.testcontainers.mariadb.MariaDBContainer; import org.testcontainers.mongodb.MongoDBAtlasLocalContainer; +import org.testcontainers.mongodb.MongoDBContainer; +import org.testcontainers.mysql.MySQLContainer; +import org.testcontainers.neo4j.Neo4jContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; +import org.testcontainers.pulsar.PulsarContainer; +import org.testcontainers.rabbitmq.RabbitMQContainer; import org.testcontainers.redpanda.RedpandaContainer; import org.testcontainers.utility.DockerImageName; @@ -176,7 +176,7 @@ public enum TestImage { * A container image suitable for testing Neo4j. */ NEO4J("neo4j", "5.26.11", () -> Neo4jContainer.class, - (container) -> ((Neo4jContainer) container).withStartupAttempts(5) + (container) -> ((Neo4jContainer) container).withStartupAttempts(5) .withStartupTimeout(Duration.ofMinutes(10))), /**