Merge branch '3.1.x'

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironmentTests.java

@@ -19,7 +19,6 @@ package org.springframework.boot.docker.compose.service.connection.postgres;
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
-@Disabled
 class PostgresEnvironmentTests {
 
 	@Test
@@ -61,13 +59,13 @@ class PostgresEnvironmentTests {
 	}
 
 	@Test
-	void getDatabaseWhenNoPostgresDbOrPostgressUser() {
+	void getDatabaseWhenNoPostgresDbOrPostgresUser() {
 		PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRES_PASSWORD", "secret"));
-		assertThat(environment.getDatabase()).isEqualTo("postgress");
+		assertThat(environment.getDatabase()).isEqualTo("postgres");
 	}
 
 	@Test
-	void getDatabaseWhenNoPostgresDbAndPostgressUser() {
+	void getDatabaseWhenNoPostgresDbAndPostgresUser() {
 		PostgresEnvironment environment = new PostgresEnvironment(
 				Map.of("POSTGRES_USER", "me", "POSTGRES_PASSWORD", "secret"));
 		assertThat(environment.getDatabase()).isEqualTo("me");

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitEnvironmentTests.java

@@ -19,7 +19,6 @@ package org.springframework.boot.docker.compose.service.connection.rabbit;
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -31,7 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
-@Disabled
 class RabbitEnvironmentTests {
 
 	@Test

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/zipkin/XZipkinDockerComposeConnectionDetailsFactoryTests.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2012-2023 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.docker.compose.service.connection.zipkin;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * Tests for {@link ZipkinDockerComposeConnectionDetailsFactory}.
- *
- * @author Moritz Halbritter
- * @author Andy Wilkinson
- * @author Phillip Webb
- */
-@Disabled
-class XZipkinDockerComposeConnectionDetailsFactoryTests {
-
-	@Test
-	void test() {
-		fail("Not yet implemented");
-	}
-
-	// @formatter:off
-
-	/*
-
-
-	@Test
-	void getPort() {
-		RunningService service = createService(Collections.emptyMap());
-		ZipkinService zipkinService = new ZipkinService(service);
-		assertThat(zipkinService.getPort()).isEqualTo(19411);
-	}
-
-	@Test
-	void matches() {
-		assertThat(ZipkinService.matches(createService(Collections.emptyMap()))).isTrue();
-		assertThat(ZipkinService.matches(createService(ImageReference.parse("postgres:15.2"), Collections.emptyMap())))
-			.isFalse();
-	}
-
-	private RunningService createService(Map<String, String> env) {
-		return createService(ImageReference.parse("openzipkin/zipkin:2.24"), env);
-	}
-
-	private RunningService createService(ImageReference image, Map<String, String> env) {
-		return RunningServiceBuilder.create("service-1", image).addTcpPort(9411, 19411).env(env).build();
-	}
-
-
-	 */
-
-	// @formatter:on
-
-}

spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml

@@ -4,4 +4,9 @@ services:
     ports:
       - '9042'
     environment:
+      - 'CASSANDRA_SNITCH=GossipingPropertyFileSnitch'
+      - 'JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0'
+      - 'HEAP_NEWSIZE=128M'
+      - 'MAX_HEAP_SIZE=1024M'
+      - 'CASSANDRA_ENDPOINT_SNITCH=GossipingPropertyFileSnitch'
       - 'CASSANDRA_DC=dc1'