spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source
This commit is contained in:
Moritz Halbritter
2025-08-28 14:04:26 +02:00
parent a3343797f4 6adddb4c09
commit db5680a79c
14 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -16,6 +16,8 @@
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;
@@ -39,6 +41,7 @@ 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);
}
module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/docker/compose/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -18,6 +18,8 @@ package org.springframework.boot.cassandra.docker.compose;
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;
@@ -37,6 +39,7 @@ 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);
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -18,6 +18,8 @@ package org.springframework.boot.data.redis.docker.compose;
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;
@@ -54,6 +56,7 @@ 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);
}
module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/docker/compose/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -16,6 +16,8 @@
package org.springframework.boot.elasticsearch.docker.compose;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchConnectionDetails;
import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchConnectionDetails.Node;
@@ -40,6 +42,7 @@ 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);
}
module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/docker/compose/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -18,6 +18,8 @@ package org.springframework.boot.jdbc.docker.compose;
import java.sql.Driver;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.DatabaseDriver;
import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
@@ -42,6 +44,7 @@ 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
module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/docker/compose/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -16,6 +16,8 @@
package org.springframework.boot.jdbc.docker.compose;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
import org.springframework.boot.testsupport.container.TestImage;
@@ -38,6 +40,7 @@ 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);
}
module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/docker/compose/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -16,6 +16,8 @@
package org.springframework.boot.jdbc.docker.compose;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
import org.springframework.boot.testsupport.container.TestImage;
@@ -38,6 +40,7 @@ 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);
}
module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/docker/compose/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+3
View File
@@ -18,6 +18,8 @@ package org.springframework.boot.jdbc.docker.compose;
import java.sql.Driver;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.DatabaseDriver;
import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
@@ -55,6 +57,7 @@ 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);
module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/docker/compose/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -17,6 +17,7 @@
package org.springframework.boot.mongodb.docker.compose;
import com.mongodb.ConnectionString;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.condition.OS;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -43,6 +44,7 @@ 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");
}
module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/docker/compose/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -16,6 +16,7 @@
package org.springframework.boot.neo4j.docker.compose;
import org.junit.jupiter.api.Disabled;
import org.neo4j.driver.AuthTokens;
import org.neo4j.driver.Driver;
import org.neo4j.driver.GraphDatabase;
@@ -41,6 +42,7 @@ 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");
}
module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/docker/compose/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -21,6 +21,7 @@ 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.docker.compose.service.connection.test.DockerComposeTest;
@@ -44,6 +45,7 @@ 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
module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/docker/compose/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -17,6 +17,7 @@
package org.springframework.boot.r2dbc.docker.compose;
import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails;
@@ -40,6 +41,7 @@ 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);
}
module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/docker/compose/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -17,6 +17,7 @@
package org.springframework.boot.r2dbc.docker.compose;
import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails;
@@ -39,6 +40,7 @@ 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);
}
module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/docker/compose/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2
View File
@@ -21,6 +21,7 @@ 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.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.DatabaseDriver;
@@ -59,6 +60,7 @@ 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);