Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28470
This commit is contained in:
Andy Wilkinson 2021-10-28 13:07:07 +01:00
commit 7fbbb4e08a
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

@ -156,7 +156,7 @@ bom {
]
}
}
library("Testcontainers", "1.16.0") {
library("Testcontainers", "1.16.1") {
group("org.testcontainers") {
imports = [
"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;
/**
* 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));
}