From 9e901b6e07c01227947ad5770fa0702e5b296063 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 10 Nov 2020 16:24:16 +0100 Subject: [PATCH] Upgrade to Testcontainers 1.15.0 Closes gh-24103 --- ...WithPasswordAuthenticationIntegrationTests.java | 2 +- ...CouchbaseAutoConfigurationIntegrationTests.java | 2 +- ...andraDataAutoConfigurationIntegrationTests.java | 2 +- ...icsearchRepositoriesAutoConfigurationTests.java | 5 ++--- ...icsearchRepositoriesAutoConfigurationTests.java | 5 ++--- ...sticsearchRestClientAutoConfigurationTests.java | 5 ++--- ...sticsearchRestClientAutoConfigurationTests.java | 5 ++--- .../SessionAutoConfigurationMongoTests.java | 4 ++-- .../spring-boot-parent/build.gradle | 2 +- .../data/mongo/DataMongoTestIntegrationTests.java | 4 ++-- .../DataMongoTestReactiveIntegrationTests.java | 4 ++-- ...MongoTestWithIncludeFilterIntegrationTests.java | 4 ++-- ...TransactionalDataMongoTestIntegrationTests.java | 4 ++-- .../data/neo4j/DataNeo4jTestIntegrationTests.java | 4 ++-- .../DataNeo4jTestPropertiesIntegrationTests.java | 4 ++-- ...Neo4jTestWithIncludeFilterIntegrationTests.java | 4 ++-- .../testcontainers/DockerImageNames.java | 14 +++++++------- .../testsupport/testcontainers/RedisContainer.java | 2 +- .../smoketest/data/r2dbc/CityRepositoryTests.java | 2 +- .../smoketest/data/r2dbc/CityRepositoryTests.java | 2 +- 20 files changed, 38 insertions(+), 42 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java index 3862196ac10..571b5cb8e5f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java @@ -85,7 +85,7 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests { extends CassandraContainer { PasswordAuthenticatorCassandraContainer() { - super(DockerImageNames.cassandra().toString()); + super(DockerImageNames.cassandra()); } @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java index 68c420bc315..ac8c9a00543 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java @@ -47,7 +47,7 @@ class CouchbaseAutoConfigurationIntegrationTests { private static final String BUCKET_NAME = "cbbucket"; @Container - static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase().toString()) + static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase()) .withCredentials("spring", "password").withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)) .withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java index fe2b795bcf4..3f90f901a6e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CassandraDataAutoConfigurationIntegrationTests { @Container - static final CassandraContainer cassandra = new CassandraContainer<>(DockerImageNames.cassandra().toString()) + static final CassandraContainer cassandra = new CassandraContainer<>(DockerImageNames.cassandra()) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index 47145dacd9b..3d18e8c66c6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -49,9 +49,8 @@ import static org.assertj.core.api.Assertions.assertThat; class ElasticsearchRepositoriesAutoConfigurationTests { @Container - static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( - DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) - .withStartupTimeout(Duration.ofMinutes(10)); + static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch()) + .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java index 2e9b60f7de4..34a2cd64145 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java @@ -48,9 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class ReactiveElasticsearchRepositoriesAutoConfigurationTests { @Container - static ElasticsearchContainer elasticsearch = new ElasticsearchContainer( - DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) - .withStartupTimeout(Duration.ofMinutes(10)); + static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch()) + .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java index ac7315ff772..d48060093b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java @@ -48,9 +48,8 @@ import static org.mockito.Mockito.mock; public class ReactiveElasticsearchRestClientAutoConfigurationTests { @Container - static ElasticsearchContainer elasticsearch = new ElasticsearchContainer( - DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) - .withStartupTimeout(Duration.ofMinutes(10)); + static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch()) + .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java index 309037d10fb..a4c464f455f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java @@ -60,9 +60,8 @@ import static org.mockito.Mockito.mock; class ElasticsearchRestClientAutoConfigurationTests { @Container - static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( - DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) - .withStartupTimeout(Duration.ofMinutes(10)); + static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch()) + .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java index 53173d3c09d..88609e1539b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java @@ -47,8 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat; class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfigurationTests { @Container - static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) - .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); + static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5) + .withStartupTimeout(Duration.ofMinutes(5)); private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() .withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 791470148ed..3886d7a17c7 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -161,7 +161,7 @@ bom { ] } } - library("Testcontainers", "1.14.3") { + library("Testcontainers", "1.15.0") { group("org.testcontainers") { imports = [ "testcontainers-bom" diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java index c621d2e0e7a..3a3e5cdd6ad 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java @@ -44,8 +44,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class DataMongoTestIntegrationTests { @Container - static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) - .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); + static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5) + .withStartupTimeout(Duration.ofMinutes(5)); @Autowired private MongoTemplate mongoTemplate; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java index d2526ee8efd..65003b84707 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java @@ -41,8 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat; class DataMongoTestReactiveIntegrationTests { @Container - static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) - .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); + static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5) + .withStartupTimeout(Duration.ofMinutes(5)); @Autowired private ReactiveMongoTemplate mongoTemplate; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java index 07fca15c195..21e28dc89d1 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java @@ -42,8 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat; class DataMongoTestWithIncludeFilterIntegrationTests { @Container - static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) - .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); + static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5) + .withStartupTimeout(Duration.ofMinutes(5)); @Autowired private ExampleService service; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java index cb705c71c12..a882d12fbfb 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java @@ -48,8 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; class TransactionalDataMongoTestIntegrationTests { @Container - static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) - .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); + static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5) + .withStartupTimeout(Duration.ofMinutes(5)); @Autowired private ExampleRepository exampleRepository; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java index 5d450fddd9a..ce144165466 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java @@ -46,8 +46,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class DataNeo4jTestIntegrationTests { @Container - static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) - .withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); + static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication() + .withStartupTimeout(Duration.ofMinutes(10)); @Autowired private Session session; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java index 61567a3513d..eea469a0e46 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java @@ -42,8 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat; class DataNeo4jTestPropertiesIntegrationTests { @Container - static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) - .withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); + static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication() + .withStartupTimeout(Duration.ofMinutes(10)); @Autowired private Environment environment; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java index e7aa66bdaa8..75d1f9e8182 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java @@ -43,8 +43,8 @@ import static org.assertj.core.api.Assertions.assertThat; class DataNeo4jTestWithIncludeFilterIntegrationTests { @Container - static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) - .withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); + static final Neo4jContainer neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication() + .withStartupTimeout(Duration.ofMinutes(10)); @Autowired private ExampleService service; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java index 3acdaf6afc2..90baa346666 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java @@ -46,7 +46,7 @@ public final class DockerImageNames { * @return a docker image name for running cassandra */ public static DockerImageName cassandra() { - return new DockerImageName("cassandra", CASSANDRA_VERSION); + return DockerImageName.parse("cassandra").withTag(CASSANDRA_VERSION); } /** @@ -54,7 +54,7 @@ public final class DockerImageNames { * @return a docker image name for running cassandra */ public static DockerImageName couchbase() { - return new DockerImageName("couchbase/server", COUCHBASE_VERSION); + return DockerImageName.parse("couchbase/server").withTag(COUCHBASE_VERSION); } /** @@ -64,7 +64,7 @@ public final class DockerImageNames { */ public static DockerImageName elasticsearch() { String version = org.elasticsearch.Version.CURRENT.toString(); - return new DockerImageName("docker.elastic.co/elasticsearch/elasticsearch", version); + return DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch").withTag(version); } /** @@ -72,7 +72,7 @@ public final class DockerImageNames { * @return a docker image name for running mongo */ public static DockerImageName mongo() { - return new DockerImageName("mongo", MONGO_VERSION); + return DockerImageName.parse("mongo").withTag(MONGO_VERSION); } /** @@ -80,7 +80,7 @@ public final class DockerImageNames { * @return a docker image name for running neo4j */ public static DockerImageName neo4j() { - return new DockerImageName("neo4j", NEO4J_VERSION); + return DockerImageName.parse("neo4j").withTag(NEO4J_VERSION); } /** @@ -88,7 +88,7 @@ public final class DockerImageNames { * @return a docker image name for running postgresql */ public static DockerImageName postgresql() { - return new DockerImageName("postgres", POSTGRESQL_VERSION); + return DockerImageName.parse("postgres").withTag(POSTGRESQL_VERSION); } /** @@ -96,7 +96,7 @@ public final class DockerImageNames { * @return a docker image name for running redis */ public static DockerImageName redis() { - return new DockerImageName("redis", REDIS_VERSION); + return DockerImageName.parse("redis").withTag(REDIS_VERSION); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java index c354d548359..bc53a13135f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java @@ -28,7 +28,7 @@ import org.testcontainers.containers.GenericContainer; public class RedisContainer extends GenericContainer { public RedisContainer() { - super(DockerImageNames.redis().toString()); + super(DockerImageNames.redis()); addExposedPorts(6379); } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java index ea8ef50c6f2..971768491b2 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CityRepositoryTests { @Container - static PostgreSQLContainer postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString()) + static PostgreSQLContainer postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql()) .withDatabaseName("test_flyway"); @DynamicPropertySource diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java index 8e9525df7a9..af1ec7a5c2c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CityRepositoryTests { @Container - static PostgreSQLContainer postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString()) + static PostgreSQLContainer postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql()) .withDatabaseName("test_liquibase"); @DynamicPropertySource