From 72f80f3ae6748ea641595432647ca3ae1494e8a5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 28 Oct 2021 13:06:41 +0100 Subject: [PATCH] Upgrade to Testcontainers 1.16.1 Closes gh-28468 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- .../testsupport/testcontainers/CassandraContainer.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index e07875a6703..6f665394a27 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -156,7 +156,7 @@ bom { ] } } - library("Testcontainers", "1.16.0") { + library("Testcontainers", "1.16.1") { group("org.testcontainers") { imports = [ "testcontainers-bom" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java index c08ff07321c..adf9c451a3a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java @@ -19,8 +19,8 @@ package org.springframework.boot.testsupport.testcontainers; import java.time.Duration; /** - * Custom {@link org.testcontainers.containers.CassandraContainer} tuned to improve - * startup time. + * Custom {@link org.testcontainers.containers.CassandraContainer} tuned for stability in + * heavily contended environments such as CI. * * @author Andy Wilkinson * @since 2.4.10 @@ -29,10 +29,6 @@ public class CassandraContainer extends org.testcontainers.containers.CassandraC public CassandraContainer() { super(DockerImageNames.cassandra()); - withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch"); - withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0"); - withEnv("HEAP_NEWSIZE", "128M"); - withEnv("MAX_HEAP_SIZE", "1024M"); withStartupTimeout(Duration.ofMinutes(10)); }