Commit 5b9d8bfc authored by dreis2211's avatar dreis2211 Committed by Stephane Nicoll

Upgrade to Testcontainers 1.14.0

See gh-20936
parent 17e5b08c
...@@ -180,6 +180,7 @@ dependencies { ...@@ -180,6 +180,7 @@ dependencies {
testImplementation("org.springframework.kafka:spring-kafka-test") testImplementation("org.springframework.kafka:spring-kafka-test")
testImplementation("org.springframework.security:spring-security-test") testImplementation("org.springframework.security:spring-security-test")
testImplementation("org.testcontainers:cassandra") testImplementation("org.testcontainers:cassandra")
testImplementation("org.testcontainers:couchbase")
testImplementation("org.testcontainers:elasticsearch") testImplementation("org.testcontainers:elasticsearch")
testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:junit-jupiter")
testImplementation("org.testcontainers:testcontainers") testImplementation("org.testcontainers:testcontainers")
......
...@@ -23,8 +23,9 @@ import com.couchbase.client.core.diagnostics.DiagnosticsResult; ...@@ -23,8 +23,9 @@ import com.couchbase.client.core.diagnostics.DiagnosticsResult;
import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.Cluster; import com.couchbase.client.java.Cluster;
import com.couchbase.client.java.env.ClusterEnvironment; import com.couchbase.client.java.env.ClusterEnvironment;
import com.couchbase.client.java.manager.bucket.BucketSettings;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.testcontainers.couchbase.BucketDefinition;
import org.testcontainers.couchbase.CouchbaseContainer;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.junit.jupiter.Testcontainers;
...@@ -45,9 +46,9 @@ class CouchbaseAutoConfigurationIntegrationTests { ...@@ -45,9 +46,9 @@ class CouchbaseAutoConfigurationIntegrationTests {
private static final String BUCKET_NAME = "cbbucket"; private static final String BUCKET_NAME = "cbbucket";
@Container @Container
static final CouchbaseContainer couchbase = new CouchbaseContainer().withClusterAdmin("spring", "password") static final CouchbaseContainer couchbase = new CouchbaseContainer().withCredentials("spring", "password")
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
.withNewBucket(BucketSettings.create(BUCKET_NAME)); .withBucket(new BucketDefinition(BUCKET_NAME));
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class))
......
...@@ -12,7 +12,7 @@ javaPlatform { ...@@ -12,7 +12,7 @@ javaPlatform {
dependencies { dependencies {
api(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) api(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.13.0")) api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.14.0"))
constraints { constraints {
api("com.vaadin.external.google:android-json:0.0.20131108.vaadin1") api("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")
......
...@@ -46,5 +46,4 @@ ...@@ -46,5 +46,4 @@
<suppress files="[\\/]src[\\/]intTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" /> <suppress files="[\\/]src[\\/]intTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="LinuxDomainSocket" checks="FinalClass" message="SockaddrUn" /> <suppress files="LinuxDomainSocket" checks="FinalClass" message="SockaddrUn" />
<suppress files="BsdDomainSocket" checks="FinalClass" message="SockaddrUn" /> <suppress files="BsdDomainSocket" checks="FinalClass" message="SockaddrUn" />
<suppress files="[\\/]org.springframework.boot.autoconfigure.couchbase.CouchbaseContainer.java$" checks=".*" />
</suppressions> </suppressions>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment