Merge branch '2.0.x'

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

@@ -43,7 +43,7 @@ public class CassandraContainer extends Container {
 				.withStartupAttempts(3).withStartupTimeout(Duration.ofSeconds(60)));
 	}
 
-	private static class WaitStrategy extends HostPortWaitStrategy {
+	private static final class WaitStrategy extends HostPortWaitStrategy {
 
 		private final int port;
 

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

@@ -43,7 +43,7 @@ public class Neo4jContainer extends Container {
 						.withEnv("NEO4J_AUTH", "none"));
 	}
 
-	private static class WaitStrategy extends HostPortWaitStrategy {
+	private static final class WaitStrategy extends HostPortWaitStrategy {
 
 		private final int port;