Merge branch '3.1.x'

Author: mhalbritter

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

@@ -19,7 +19,6 @@
 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 @@
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
-@Disabled
 class PostgresEnvironmentTests {
 
 	@Test
@@ -61,13 +59,13 @@ void getPasswordWhenHasPostgresPassword() {
 	}
 
 	@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 @@
 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 @@
  * @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

@@ -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'