Merge branch '2.5.x'

Closes gh-27526

spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle

@@ -18,6 +18,7 @@ dependencies {
 	compileOnly("org.mockito:mockito-core")
 	compileOnly("org.springframework:spring-context")
 	compileOnly("org.springframework.data:spring-data-redis")
+	compileOnly("org.testcontainers:cassandra")
 	compileOnly("org.testcontainers:testcontainers")
 
 	implementation("org.apache.maven.resolver:maven-resolver-connector-basic")

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.testcontainers;
+
+import java.time.Duration;
+
+/**
+ * Custom {@link org.testcontainers.containers.CassandraContainer} tuned to improve
+ * startup time.
+ *
+ * @author Andy Wilkinson
+ * @since 2.4.10
+ */
+public class CassandraContainer extends org.testcontainers.containers.CassandraContainer<CassandraContainer> {
+
+	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));
+	}
+
+}