Skip to content

Commit 515b18e

Browse files
snicollsnicoll
committed
Merge branch '2.3.x'
Closes gh-24108
2 parents 24f29a6 + 23ad2b4 commit 515b18e

File tree

30 files changed

+190
-83
lines changed

30 files changed

+190
-83
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
import org.springframework.boot.autoconfigure.AutoConfigurations;
3939
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
40+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
4041
import org.springframework.util.StreamUtils;
4142

4243
import static org.assertj.core.api.Assertions.assertThat;
@@ -83,6 +84,10 @@ void authenticationWithInvalidCredentials() {
8384
static final class PasswordAuthenticatorCassandraContainer
8485
extends CassandraContainer<PasswordAuthenticatorCassandraContainer> {
8586

87+
PasswordAuthenticatorCassandraContainer() {
88+
super(DockerImageNames.cassandra().toString());
89+
}
90+
8691
@Override
8792
protected void containerIsCreated(String containerId) {
8893
String config = this.copyFileFromContainer("/etc/cassandra/cassandra.yaml",

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
3333
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
34+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3435

3536
import static org.assertj.core.api.Assertions.assertThat;
3637

@@ -46,8 +47,8 @@ class CouchbaseAutoConfigurationIntegrationTests {
4647
private static final String BUCKET_NAME = "cbbucket";
4748

4849
@Container
49-
static final CouchbaseContainer couchbase = new CouchbaseContainer().withCredentials("spring", "password")
50-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
50+
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase().toString())
51+
.withCredentials("spring", "password").withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
5152
.withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false));
5253

5354
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.data.cassandra.city.City;
3333
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
34+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3435
import org.springframework.context.annotation.Bean;
3536
import org.springframework.context.annotation.Configuration;
3637
import org.springframework.data.cassandra.config.SchemaAction;
@@ -48,8 +49,8 @@
4849
class CassandraDataAutoConfigurationIntegrationTests {
4950

5051
@Container
51-
static final CassandraContainer<?> cassandra = new CassandraContainer<>().withStartupAttempts(5)
52-
.withStartupTimeout(Duration.ofMinutes(10));
52+
static final CassandraContainer<?> cassandra = new CassandraContainer<>(DockerImageNames.cassandra().toString())
53+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5354

5455
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5556
.withConfiguration(

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
3232
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
3333
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
34+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3435
import org.springframework.context.annotation.Configuration;
3536
import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
3637
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
@@ -48,8 +49,9 @@
4849
class ElasticsearchRepositoriesAutoConfigurationTests {
4950

5051
@Container
51-
static final ElasticsearchContainer elasticsearch = new VersionOverridingElasticsearchContainer()
52-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
52+
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
53+
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
54+
.withStartupTimeout(Duration.ofMinutes(10));
5355

5456
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5557
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.boot.autoconfigure.data.elasticsearch.city.ReactiveCityRepository;
3131
import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
3232
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
33+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3334
import org.springframework.context.annotation.Configuration;
3435
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
3536
import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
@@ -47,8 +48,9 @@
4748
public class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
4849

4950
@Container
50-
static ElasticsearchContainer elasticsearch = new VersionOverridingElasticsearchContainer().withStartupAttempts(5)
51-
.withStartupTimeout(Duration.ofMinutes(10));
51+
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
52+
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
53+
.withStartupTimeout(Duration.ofMinutes(10));
5254

5355
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5456
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class,

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import org.springframework.boot.autoconfigure.AutoConfigurations;
3232
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
33+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3334
import org.springframework.context.annotation.Bean;
3435
import org.springframework.context.annotation.Configuration;
3536
import org.springframework.data.elasticsearch.client.ClientConfiguration;
@@ -47,8 +48,9 @@
4748
public class ReactiveElasticsearchRestClientAutoConfigurationTests {
4849

4950
@Container
50-
static ElasticsearchContainer elasticsearch = new VersionOverridingElasticsearchContainer().withStartupAttempts(5)
51-
.withStartupTimeout(Duration.ofMinutes(10));
51+
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
52+
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
53+
.withStartupTimeout(Duration.ofMinutes(10));
5254

5355
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5456
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/VersionOverridingElasticsearchContainer.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.boot.autoconfigure.data.neo4j.country.CountryRepository;
2727
import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
2828
import org.springframework.boot.test.context.SpringBootTest;
29+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
2930
import org.springframework.context.annotation.Configuration;
3031
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
3132
import org.springframework.test.context.DynamicPropertyRegistry;
@@ -43,7 +44,7 @@
4344
public class Neo4jRepositoriesAutoConfigurationIntegrationTests {
4445

4546
@Container
46-
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:4.0");
47+
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j().toString());
4748

4849
@DynamicPropertySource
4950
static void neo4jProperties(DynamicPropertyRegistry registry) {

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import org.springframework.boot.autoconfigure.AutoConfigurations;
4343
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
44+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
4445
import org.springframework.context.annotation.Bean;
4546
import org.springframework.context.annotation.Configuration;
4647

@@ -58,8 +59,9 @@
5859
class ElasticsearchRestClientAutoConfigurationTests {
5960

6061
@Container
61-
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer().withStartupAttempts(5)
62-
.withStartupTimeout(Duration.ofMinutes(10));
62+
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
63+
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
64+
.withStartupTimeout(Duration.ofMinutes(10));
6365

6466
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
6567
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.beans.factory.annotation.Autowired;
2929
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3030
import org.springframework.boot.test.context.SpringBootTest;
31+
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3132
import org.springframework.context.annotation.Configuration;
3233
import org.springframework.test.context.DynamicPropertyRegistry;
3334
import org.springframework.test.context.DynamicPropertySource;
@@ -45,7 +46,7 @@
4546
class Neo4jAutoConfigurationIntegrationTests {
4647

4748
@Container
48-
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:4.0");
49+
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j().toString());
4950

5051
@DynamicPropertySource
5152
static void neo4jProperties(DynamicPropertyRegistry registry) {

0 commit comments

Comments
 (0)