Skip to content

Commit c1d51f8

Browse files
committed
Remove Bitnami support
Closes gh-47267
1 parent 255ea92 commit c1d51f8

File tree

45 files changed

+24
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+24
-341
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,25 @@ The following service connections are currently supported:
9090
| Containers named "apache/activemq-artemis"
9191

9292
| javadoc:org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails[]
93-
| Containers named "cassandra" or "bitnami/cassandra"
93+
| Containers named "cassandra"
9494

9595
| javadoc:org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchConnectionDetails[]
96-
| Containers named "elasticsearch" or "bitnami/elasticsearch"
96+
| Containers named "elasticsearch"
9797

9898
| javadoc:org.springframework.boot.autoconfigure.hazelcast.HazelcastConnectionDetails[]
9999
| Containers named "hazelcast/hazelcast".
100100

101101
| javadoc:org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails[]
102-
| 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"
102+
| Containers named "clickhouse/clickhouse-server", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
103103

104104
| javadoc:org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails[]
105105
| Containers named "osixia/openldap", "lldap/lldap"
106106

107107
| javadoc:org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails[]
108-
| Containers named "mongo" or "bitnami/mongodb"
108+
| Containers named "mongo"
109109

110110
| javadoc:org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails[]
111-
| Containers named "neo4j" or "bitnami/neo4j"
111+
| Containers named "neo4j"
112112

113113
| javadoc:org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails[]
114114
| Containers named "otel/opentelemetry-collector-contrib", "grafana/otel-lgtm"
@@ -123,13 +123,13 @@ The following service connections are currently supported:
123123
| Containers named "apachepulsar/pulsar"
124124

125125
| javadoc:org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails[]
126-
| 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"
126+
| Containers named "clickhouse/clickhouse-server", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
127127

128128
| javadoc:org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails[]
129-
| Containers named "rabbitmq" or "bitnami/rabbitmq"
129+
| Containers named "rabbitmq"
130130

131131
| javadoc:org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails[]
132-
| Containers named "redis", "bitnami/redis", "redis/redis-stack" or "redis/redis-stack-server"
132+
| Containers named "redis", "redis/redis-stack" or "redis/redis-stack-server"
133133

134134
| javadoc:org.springframework.boot.micrometer.tracing.autoconfigure.zipkin.ZipkinConnectionDetails[]
135135
| Containers named "openzipkin/zipkin".

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.boot.amqp.docker.compose;
1818

19-
import org.junit.jupiter.api.Disabled;
20-
2119
import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails;
2220
import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address;
2321
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -40,12 +38,6 @@ void runCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) {
4038
assertConnectionDetails(connectionDetails);
4139
}
4240

43-
@DockerComposeTest(composeFile = "rabbit-bitnami-compose.yaml", image = TestImage.BITNAMI_RABBITMQ)
44-
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
45-
void runWithBitnamiImageCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) {
46-
assertConnectionDetails(connectionDetails);
47-
}
48-
4941
private void assertConnectionDetails(RabbitConnectionDetails connectionDetails) {
5042
assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
5143
assertThat(connectionDetails.getPassword()).isEqualTo("secret");

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@
3737
class RabbitDockerComposeConnectionDetailsFactory
3838
extends DockerComposeConnectionDetailsFactory<RabbitConnectionDetails> {
3939

40-
private static final String[] RABBITMQ_CONTAINER_NAMES = { "rabbitmq", "bitnami/rabbitmq" };
41-
4240
private static final int RABBITMQ_PORT = 5672;
4341

4442
protected RabbitDockerComposeConnectionDetailsFactory() {
45-
super(RABBITMQ_CONTAINER_NAMES);
43+
super("rabbitmq");
4644
}
4745

4846
@Override

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.util.List;
2020

21-
import org.junit.jupiter.api.Disabled;
22-
2321
import org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails;
2422
import org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails.Node;
2523
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -39,12 +37,6 @@ void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
3937
assertConnectionDetails(connectionDetails);
4038
}
4139

42-
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
43-
@DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA)
44-
void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
45-
assertConnectionDetails(connectionDetails);
46-
}
47-
4840
private void assertConnectionDetails(CassandraConnectionDetails connectionDetails) {
4941
List<Node> contactPoints = connectionDetails.getContactPoints();
5042
assertThat(contactPoints).hasSize(1);

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
class CassandraDockerComposeConnectionDetailsFactory
3333
extends DockerComposeConnectionDetailsFactory<CassandraConnectionDetails> {
3434

35-
private static final String[] CASSANDRA_CONTAINER_NAMES = { "cassandra", "bitnami/cassandra" };
36-
3735
private static final int CASSANDRA_PORT = 9042;
3836

3937
CassandraDockerComposeConnectionDetailsFactory() {
40-
super(CASSANDRA_CONTAINER_NAMES);
38+
super("cassandra");
4139
}
4240

4341
@Override

module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import javax.net.ssl.SSLContext;
2020

21-
import org.junit.jupiter.api.Disabled;
22-
2321
import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
2422
import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Standalone;
2523
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -55,12 +53,6 @@ void runWithSslCreatesConnectionDetails(RedisConnectionDetails connectionDetails
5553
assertThat(sslContext).isNotNull();
5654
}
5755

58-
@DockerComposeTest(composeFile = "redis-bitnami-compose.yaml", image = TestImage.BITNAMI_REDIS)
59-
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
60-
void runWithBitnamiImageCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
61-
assertConnectionDetails(connectionDetails);
62-
}
63-
6456
@DockerComposeTest(composeFile = "redis-compose.yaml", image = TestImage.REDIS_STACK)
6557
void runWithRedisStackCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
6658
assertConnectionDetails(connectionDetails);

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
*/
3434
class RedisDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<RedisConnectionDetails> {
3535

36-
private static final String[] REDIS_CONTAINER_NAMES = { "redis", "bitnami/redis", "redis/redis-stack",
37-
"redis/redis-stack-server" };
36+
private static final String[] REDIS_CONTAINER_NAMES = { "redis", "redis/redis-stack", "redis/redis-stack-server" };
3837

3938
private static final int REDIS_PORT = 6379;
4039

0 commit comments

Comments
 (0)