root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' 

Closes gh-28471
This commit is contained in:
Andy Wilkinson 2021-10-28 13:07:22 +01:00
parent e340429a1a 7fbbb4e08a
commit 24ef4e6fb9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-parent/build.gradle
View File

@ -163,7 +163,7 @@ bom {
] ]
} }
} }
library("Testcontainers", "1.16.0") { library("Testcontainers", "1.16.1") {
group("org.testcontainers") { group("org.testcontainers") {
imports = [ imports = [
"testcontainers-bom" "testcontainers-bom"

8
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java
View File

@ -19,8 +19,8 @@ package org.springframework.boot.testsupport.testcontainers;
import java.time.Duration; import java.time.Duration;
/** /**
* Custom {@link org.testcontainers.containers.CassandraContainer} tuned to improve * Custom {@link org.testcontainers.containers.CassandraContainer} tuned for stability in
* startup time. * heavily contended environments such as CI.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 2.4.10 * @since 2.4.10
@ -29,10 +29,6 @@ public class CassandraContainer extends org.testcontainers.containers.CassandraC
public CassandraContainer() { public CassandraContainer() {
super(DockerImageNames.cassandra()); 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)); withStartupTimeout(Duration.ofMinutes(10));
} }