Remove Bitnami support

Closes gh-47267

Author: philwebb

documentation/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.cassandra.autoconfigure.CassandraConnectionDetails[]
-| Containers named "cassandra" or "bitnami/cassandra"
+| Containers named "cassandra"
 
 | javadoc:org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchConnectionDetails[]
-| Containers named "elasticsearch" or "bitnami/elasticsearch"
+| Containers named "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", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
 
 | javadoc:org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails[]
 | Containers named "osixia/openldap", "lldap/lldap"
 
 | javadoc:org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails[]
-| Containers named "mongo" or "bitnami/mongodb"
+| Containers named "mongo"
 
 | javadoc:org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails[]
-| Containers named "neo4j" or "bitnami/neo4j"
+| Containers named "neo4j"
 
 | javadoc:org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails[]
 | 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", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
 
 | javadoc:org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails[]
-| Containers named "rabbitmq" or "bitnami/rabbitmq"
+| Containers named "rabbitmq"
 
 | javadoc:org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails[]
-| Containers named "redis", "bitnami/redis", "redis/redis-stack" or "redis/redis-stack-server"
+| Containers named "redis", "redis/redis-stack" or "redis/redis-stack-server"
 
 | javadoc:org.springframework.boot.micrometer.tracing.autoconfigure.zipkin.ZipkinConnectionDetails[]
 | Containers named "openzipkin/zipkin".

module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.amqp.docker.compose;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails;
 import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -40,12 +38,6 @@ void runCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}
 
-	@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);
-	}
-
 	private void assertConnectionDetails(RabbitConnectionDetails connectionDetails) {
 		assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
 		assertThat(connectionDetails.getPassword()).isEqualTo("secret");

module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-bitnami-compose.yaml

@@ -37,12 +37,10 @@
 class RabbitDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<RabbitConnectionDetails> {
 
-	private static final String[] RABBITMQ_CONTAINER_NAMES = { "rabbitmq", "bitnami/rabbitmq" };
-
 	private static final int RABBITMQ_PORT = 5672;
 
 	protected RabbitDockerComposeConnectionDetailsFactory() {
-		super(RABBITMQ_CONTAINER_NAMES);
+		super("rabbitmq");
 	}
 
 	@Override

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java

@@ -18,8 +18,6 @@
 
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails;
 import org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails.Node;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -39,12 +37,6 @@ void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
 		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);
-	}
-
 	private void assertConnectionDetails(CassandraConnectionDetails connectionDetails) {
 		List<Node> contactPoints = connectionDetails.getContactPoints();
 		assertThat(contactPoints).hasSize(1);

module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/docker/compose/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -32,12 +32,10 @@
 class CassandraDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<CassandraConnectionDetails> {
 
-	private static final String[] CASSANDRA_CONTAINER_NAMES = { "cassandra", "bitnami/cassandra" };
-
 	private static final int CASSANDRA_PORT = 9042;
 
 	CassandraDockerComposeConnectionDetailsFactory() {
-		super(CASSANDRA_CONTAINER_NAMES);
+		super("cassandra");
 	}
 
 	@Override

module/spring-boot-cassandra/src/dockerTest/resources/org/springframework/boot/cassandra/docker/compose/cassandra-bitnami-compose.yaml

@@ -18,8 +18,6 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.junit.jupiter.api.Disabled;
-
 import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
 import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Standalone;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -55,12 +53,6 @@ void runWithSslCreatesConnectionDetails(RedisConnectionDetails connectionDetails
 		assertThat(sslContext).isNotNull();
 	}
 
-	@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);
-	}
-
 	@DockerComposeTest(composeFile = "redis-compose.yaml", image = TestImage.REDIS_STACK)
 	void runWithRedisStackCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);

module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraDockerComposeConnectionDetailsFactory.java

@@ -33,8 +33,7 @@
  */
 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", "redis/redis-stack", "redis/redis-stack-server" };
 
 	private static final int REDIS_PORT = 6379;