Merge branch '3.4.x' into 3.5.x

Closes gh-47275

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.cassandra;
 
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
 import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -39,7 +37,6 @@ class CassandraDockerComposeConnectionDetailsFactoryIntegrationTests {
 		assertConnectionDetails(connectionDetails);
 	}
 
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	@DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA)
 	void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.clickhouse;
 
 import java.sql.Driver;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.jdbc.DatabaseDriver;
@@ -44,7 +42,6 @@ class ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 		// See https://github.com/bitnami/containers/issues/73550

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -21,7 +21,6 @@ import java.time.Duration;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.junit.jupiter.api.Disabled;
 import reactor.core.publisher.Mono;
 
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
@@ -45,7 +44,6 @@ class ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 		// See https://github.com/bitnami/containers/issues/73550

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.docker.compose.service.connection.elasticsearch;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol;
@@ -42,7 +40,6 @@ class ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "elasticsearch-bitnami-compose.yaml", image = TestImage.BITNAMI_ELASTICSEARCH)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.docker.compose.service.connection.mariadb;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -40,7 +38,6 @@ class MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.docker.compose.service.connection.mariadb;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.junit.jupiter.api.Disabled;
 
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -41,7 +40,6 @@ class MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.docker.compose.service.connection.mongo;
 
 import com.mongodb.ConnectionString;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.condition.OS;
 
 import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
@@ -44,7 +43,6 @@ class MongoDockerComposeConnectionDetailsFactoryIntegrationTests {
 
 	@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", disabledReason = "The image has no ARM support")
 	@DockerComposeTest(composeFile = "mongo-bitnami-compose.yaml", image = TestImage.BITNAMI_MONGODB)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(MongoConnectionDetails connectionDetails) {
 		assertConnectionDetailsWithDatabase(connectionDetails, "testdb");
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.docker.compose.service.connection.mysql;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -40,7 +38,6 @@ class MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.docker.compose.service.connection.mysql;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.junit.jupiter.api.Disabled;
 
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -40,7 +39,6 @@ class MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docker.compose.service.connection.neo4j;
 
-import org.junit.jupiter.api.Disabled;
 import org.neo4j.driver.AuthTokens;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.GraphDatabase;
@@ -42,7 +41,6 @@ class Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "neo4j-bitnami-compose.yaml", image = TestImage.BITNAMI_NEO4J)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connectionDetails) {
 		assertConnectionDetailsWithPassword(connectionDetails, "bitnami2");
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.postgres;
 
 import java.sql.Driver;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.jdbc.DatabaseDriver;
@@ -57,7 +55,6 @@ class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails)
 			throws ClassNotFoundException {
 		assertConnectionDetails(connectionDetails);

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -21,7 +21,6 @@ import java.time.Duration;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.Option;
-import org.junit.jupiter.api.Disabled;
 
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -60,7 +59,6 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 		checkDatabaseAccess(connectionDetails);

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.docker.compose.service.connection.rabbit;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails;
 import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Address;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -41,7 +39,6 @@ class RabbitDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "rabbit-bitnami-compose.yaml", image = TestImage.BITNAMI_RABBITMQ)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.redis;
 
 import javax.net.ssl.SSLContext;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails;
 import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Standalone;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -56,7 +54,6 @@ class RedisDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "redis-bitnami-compose.yaml", image = TestImage.BITNAMI_REDIS)
-	@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
 	void runWithBitnamiImageCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactory.java

@@ -32,7 +32,8 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
 class CassandraDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<CassandraConnectionDetails> {
 
-	private static final String[] CASSANDRA_CONTAINER_NAMES = { "cassandra", "bitnami/cassandra" };
+	private static final String[] CASSANDRA_CONTAINER_NAMES = { "cassandra", "bitnami/cassandra",
+			"bitnamilegacy/cassandra" };
 
 	private static final int CASSANDRA_PORT = 9042;
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactory.java

@@ -31,7 +31,8 @@ import org.springframework.boot.docker.compose.service.connection.jdbc.JdbcUrlBu
 class ClickHouseJdbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
 
-	private static final String[] CLICKHOUSE_CONTAINER_NAMES = { "clickhouse/clickhouse-server", "bitnami/clickhouse" };
+	private static final String[] CLICKHOUSE_CONTAINER_NAMES = { "clickhouse/clickhouse-server", "bitnami/clickhouse",
+			"bitnamilegacy/clickhouse" };
 
 	protected ClickHouseJdbcDockerComposeConnectionDetailsFactory() {
 		super(CLICKHOUSE_CONTAINER_NAMES);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactory.java

@@ -33,7 +33,8 @@ import org.springframework.boot.docker.compose.service.connection.r2dbc.Connecti
 class ClickHouseR2dbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
 
-	private static final String[] CLICKHOUSE_CONTAINER_NAMES = { "clickhouse/clickhouse-server", "bitnami/clickhouse" };
+	private static final String[] CLICKHOUSE_CONTAINER_NAMES = { "clickhouse/clickhouse-server", "bitnami/clickhouse",
+			"bitnamilegacy/clickhouse" };
 
 	ClickHouseR2dbcDockerComposeConnectionDetailsFactory() {
 		super(CLICKHOUSE_CONTAINER_NAMES, "io.r2dbc.spi.ConnectionFactoryOptions");

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactory.java

@@ -36,7 +36,8 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
 class ElasticsearchDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<ElasticsearchConnectionDetails> {
 
-	private static final String[] ELASTICSEARCH_CONTAINER_NAMES = { "elasticsearch", "bitnami/elasticsearch" };
+	private static final String[] ELASTICSEARCH_CONTAINER_NAMES = { "elasticsearch", "bitnami/elasticsearch",
+			"bitnamilegacy/elasticsearch" };
 
 	private static final int ELASTICSEARCH_PORT = 9200;
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactory.java

@@ -34,7 +34,7 @@ import org.springframework.boot.docker.compose.service.connection.jdbc.JdbcUrlBu
 class MariaDbJdbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
 
-	private static final String[] MARIADB_CONTAINER_NAMES = { "mariadb", "bitnami/mariadb" };
+	private static final String[] MARIADB_CONTAINER_NAMES = { "mariadb", "bitnami/mariadb", "bitnamilegacy/mariadb" };
 
 	protected MariaDbJdbcDockerComposeConnectionDetailsFactory() {
 		super(MARIADB_CONTAINER_NAMES);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactory.java

@@ -36,7 +36,7 @@ import org.springframework.boot.docker.compose.service.connection.r2dbc.Connecti
 class MariaDbR2dbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
 
-	private static final String[] MARIADB_CONTAINER_NAMES = { "mariadb", "bitnami/mariadb" };
+	private static final String[] MARIADB_CONTAINER_NAMES = { "mariadb", "bitnami/mariadb", "bitnamilegacy/mariadb" };
 
 	MariaDbR2dbcDockerComposeConnectionDetailsFactory() {
 		super(MARIADB_CONTAINER_NAMES, "io.r2dbc.spi.ConnectionFactoryOptions");

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactory.java

@@ -34,7 +34,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
  */
 class MongoDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<MongoConnectionDetails> {
 
-	private static final String[] MONGODB_CONTAINER_NAMES = { "mongo", "bitnami/mongodb" };
+	private static final String[] MONGODB_CONTAINER_NAMES = { "mongo", "bitnami/mongodb", "bitnamilegacy/mongodb" };
 
 	private static final int MONGODB_PORT = 27017;
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactory.java

@@ -34,7 +34,7 @@ import org.springframework.boot.docker.compose.service.connection.jdbc.JdbcUrlBu
 class MySqlJdbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
 
-	private static final String[] MYSQL_CONTAINER_NAMES = { "mysql", "bitnami/mysql" };
+	private static final String[] MYSQL_CONTAINER_NAMES = { "mysql", "bitnami/mysql", "bitnamilegacy/mysql" };
 
 	protected MySqlJdbcDockerComposeConnectionDetailsFactory() {
 		super(MYSQL_CONTAINER_NAMES);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactory.java

@@ -36,7 +36,7 @@ import org.springframework.boot.docker.compose.service.connection.r2dbc.Connecti
 class MySqlR2dbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
 
-	private static final String[] MYSQL_CONTAINER_NAMES = { "mysql", "bitnami/mysql" };
+	private static final String[] MYSQL_CONTAINER_NAMES = { "mysql", "bitnami/mysql", "bitnamilegacy/mysql" };
 
 	MySqlR2dbcDockerComposeConnectionDetailsFactory() {
 		super(MYSQL_CONTAINER_NAMES, "io.r2dbc.spi.ConnectionFactoryOptions");

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactory.java

@@ -34,7 +34,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
  */
 class Neo4jDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<Neo4jConnectionDetails> {
 
-	private static final String[] NEO4J_CONTAINER_NAMES = { "neo4j", "bitnami/neo4j" };
+	private static final String[] NEO4J_CONTAINER_NAMES = { "neo4j", "bitnami/neo4j", "bitnamilegacy/neo4j" };
 
 	Neo4jDockerComposeConnectionDetailsFactory() {
 		super(NEO4J_CONTAINER_NAMES);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactory.java

@@ -39,7 +39,8 @@ import org.springframework.util.StringUtils;
 class PostgresJdbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
 
-	private static final String[] POSTGRES_CONTAINER_NAMES = { "postgres", "bitnami/postgresql" };
+	private static final String[] POSTGRES_CONTAINER_NAMES = { "postgres", "bitnami/postgresql",
+			"bitnamilegacy/postgresql" };
 
 	protected PostgresJdbcDockerComposeConnectionDetailsFactory() {
 		super(POSTGRES_CONTAINER_NAMES);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactory.java

@@ -39,7 +39,8 @@ import org.springframework.util.StringUtils;
 class PostgresR2dbcDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
 
-	private static final String[] POSTGRES_CONTAINER_NAMES = { "postgres", "bitnami/postgresql" };
+	private static final String[] POSTGRES_CONTAINER_NAMES = { "postgres", "bitnami/postgresql",
+			"bitnamilegacy/postgresql" };
 
 	PostgresR2dbcDockerComposeConnectionDetailsFactory() {
 		super(POSTGRES_CONTAINER_NAMES, "io.r2dbc.spi.ConnectionFactoryOptions");

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactory.java

@@ -35,7 +35,8 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
 class RabbitDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<RabbitConnectionDetails> {
 
-	private static final String[] RABBITMQ_CONTAINER_NAMES = { "rabbitmq", "bitnami/rabbitmq" };
+	private static final String[] RABBITMQ_CONTAINER_NAMES = { "rabbitmq", "bitnami/rabbitmq",
+			"bitnamilegacy/rabbitmq" };
 
 	private static final int RABBITMQ_PORT = 5672;
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactory.java

@@ -33,8 +33,8 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
  */
 class RedisDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<RedisConnectionDetails> {
 
-	private static final String[] REDIS_CONTAINER_NAMES = { "redis", "bitnami/redis", "redis/redis-stack",
-			"redis/redis-stack-server" };
+	private static final String[] REDIS_CONTAINER_NAMES = { "redis", "bitnami/redis", "bitnamilegacy/redis",
+			"redis/redis-stack", "redis/redis-stack-server" };
 
 	private static final int REDIS_PORT = 6379;
 

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc

@@ -90,25 +90,25 @@ The following service connections are currently supported:
 | Containers named "apache/activemq-artemis"
 
 | javadoc:org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails[]
-| Containers named "cassandra" or "bitnami/cassandra"
+| Containers named "cassandra", "bitnami/cassandra" or "bitnamilegacy/cassandra"
 
 | javadoc:org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails[]
-| Containers named "elasticsearch" or "bitnami/elasticsearch"
+| Containers named "elasticsearch", "bitnami/elasticsearch" or "bitnamilegacy/elasticsearch"
 
 | javadoc:org.springframework.boot.autoconfigure.hazelcast.HazelcastConnectionDetails[]
 | Containers named "hazelcast/hazelcast".
 
 | javadoc:org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails[]
-| Containers named "clickhouse/clickhouse-server", "bitnami/clickhouse", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "bitnami/mariadb", "mssql/server", "mysql", "bitnami/mysql", "postgres", or "bitnami/postgresql"
+| Containers named "clickhouse/clickhouse-server", "bitnami/clickhouse", "bitnamilegacy/clickhouse", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "bitnami/mariadb", "bitnamilegacy/mariadb", "mssql/server", "mysql", "bitnami/mysql", "bitnamilegacy/mysql", "postgres", "bitnami/postgresql" or "bitnamilegacy/postgresql"
 
 | javadoc:org.springframework.boot.autoconfigure.ldap.LdapConnectionDetails[]
 | Containers named "osixia/openldap", "lldap/lldap"
 
 | javadoc:org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails[]
-| Containers named "mongo" or "bitnami/mongodb"
+| Containers named "mongo", "bitnami/mongodb" or "bitnamilegacy/mongodb"
 
 | javadoc:org.springframework.boot.autoconfigure.neo4j.Neo4jConnectionDetails[]
-| Containers named "neo4j" or "bitnami/neo4j"
+| Containers named "neo4j", "bitnami/neo4j" or "bitnamilegacy/neo4j"
 
 | javadoc:org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingConnectionDetails[]
 | Containers named "otel/opentelemetry-collector-contrib", "grafana/otel-lgtm"
@@ -123,13 +123,13 @@ The following service connections are currently supported:
 | Containers named "apachepulsar/pulsar"
 
 | javadoc:org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails[]
-| Containers named "clickhouse/clickhouse-server", "bitnami/clickhouse", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "bitnami/mariadb", "mssql/server", "mysql", "bitnami/mysql", "postgres", or "bitnami/postgresql"
+| Containers named "clickhouse/clickhouse-server", "bitnami/clickhouse", "bitnamilegacy/clickhouse", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "bitnami/mariadb", "bitnamilegacy/mariadb", "mssql/server", "mysql", "bitnami/mysql", "bitnamilegacy/mysql", "postgres", "bitnami/postgresql" or "bitnamilegacy/postgresql"
 
 | javadoc:org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails[]
-| Containers named "rabbitmq" or "bitnami/rabbitmq"
+| Containers named "rabbitmq", "bitnami/rabbitmq" or "bitnamilegacy/rabbitmq"
 
 | javadoc:org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails[]
-| Containers named "redis", "bitnami/redis", "redis/redis-stack" or "redis/redis-stack-server"
+| Containers named "redis", "bitnami/redis", "bitnamilegacy/redis", "redis/redis-stack" or "redis/redis-stack-server"
 
 | javadoc:org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConnectionDetails[]
 | Containers named "openzipkin/zipkin".

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactory.java

@@ -41,8 +41,8 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
 class RedisContainerConnectionDetailsFactory
 		extends ContainerConnectionDetailsFactory<Container<?>, RedisConnectionDetails> {
 
-	private static final List<String> REDIS_IMAGE_NAMES = List.of("redis", "bitnami/redis", "redis/redis-stack",
-			"redis/redis-stack-server");
+	private static final List<String> REDIS_IMAGE_NAMES = List.of("redis", "bitnami/redis", "bitnamilegacy/redis",
+			"redis/redis-stack", "redis/redis-stack-server");
 
 	private static final int REDIS_PORT = 6379;
 

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java

@@ -269,52 +269,52 @@ public enum TestImage {
 	/**
 	 * A container image suitable for testing Cassandra via Bitnami.
 	 */
-	BITNAMI_CASSANDRA("bitnami/cassandra", "4.1.3"),
+	BITNAMI_CASSANDRA("bitnamilegacy/cassandra", "4.1.3"),
 
 	/**
 	 * A container image suitable for testing ClickHouse via Bitnami.
 	 */
-	BITNAMI_CLICKHOUSE("bitnami/clickhouse", "24.3"),
+	BITNAMI_CLICKHOUSE("bitnamilegacy/clickhouse", "24.3"),
 
 	/**
 	 * A container image suitable for testing Elasticsearch via Bitnami.
 	 */
-	BITNAMI_ELASTICSEARCH("bitnami/elasticsearch", "8.12.1"),
+	BITNAMI_ELASTICSEARCH("bitnamilegacy/elasticsearch", "8.12.1"),
 
 	/**
 	 * A container image suitable for testing MariaDB via Bitnami.
 	 */
-	BITNAMI_MARIADB("bitnami/mariadb", "11.2.3"),
+	BITNAMI_MARIADB("bitnamilegacy/mariadb", "11.2.3"),
 
 	/**
 	 * A container image suitable for testing MongoDB via Bitnami.
 	 */
-	BITNAMI_MONGODB("bitnami/mongodb", "7.0.5"),
+	BITNAMI_MONGODB("bitnamilegacy/mongodb", "7.0.5"),
 
 	/**
 	 * A container image suitable for testing MySQL via Bitnami.
 	 */
-	BITNAMI_MYSQL("bitnami/mysql", "8.0.36"),
+	BITNAMI_MYSQL("bitnamilegacy/mysql", "8.0.36"),
 
 	/**
 	 * A container image suitable for testing Neo4j via Bitnami.
 	 */
-	BITNAMI_NEO4J("bitnami/neo4j", "5.16.0"),
+	BITNAMI_NEO4J("bitnamilegacy/neo4j", "5.16.0"),
 
 	/**
 	 * A container image suitable for testing Postgres via Bitnami.
 	 */
-	BITNAMI_POSTGRESQL("bitnami/postgresql", "16.2.0"),
+	BITNAMI_POSTGRESQL("bitnamilegacy/postgresql", "16.2.0"),
 
 	/**
 	 * A container image suitable for testing RabbitMQ via Bitnami.
 	 */
-	BITNAMI_RABBITMQ("bitnami/rabbitmq", "3.11.28"),
+	BITNAMI_RABBITMQ("bitnamilegacy/rabbitmq", "3.11.28"),
 
 	/**
 	 * A container image suitable for testing Redis via Bitnami.
 	 */
-	BITNAMI_REDIS("bitnami/redis", "7.2.4");
+	BITNAMI_REDIS("bitnamilegacy/redis", "7.2.4");
 
 	private final String name;