Merge branch '2.5.x' into 2.6.x

Closes gh-30164
spring-projects · Mar 10, 2022 · 7c3c5d3 · 7c3c5d3
2 parents 0958498 + bbdef2b
commit 7c3c5d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...ingframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java b/...ingframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java
@@ -50,7 +50,8 @@ class CassandraAutoConfigurationIntegrationTests {
 					"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
 							+ cassandra.getFirstMappedPort(),
 					"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
-					"spring.data.cassandra.connection.init-query-timeout=10s");
+					"spring.data.cassandra.connection.init-query-timeout=20s",
+					"spring.data.cassandra.request.timeout=20s");
 
 	@Test
 	void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() {

diff --git a/...ork/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/...ork/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
@@ -55,8 +55,8 @@ class CassandraDataAutoConfigurationIntegrationTests {
 					"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
 							+ cassandra.getFirstMappedPort(),
 					"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
-					"spring.data.cassandra.connection.init-query-timeout=10s",
-					"spring.data.cassandra.request.timeout=10s")
+					"spring.data.cassandra.connection.init-query-timeout=20s",
+					"spring.data.cassandra.request.timeout=20s")
 			.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
 					City.class.getPackage().getName()));
 

diff --git a/...ngframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java b/...ngframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java
@@ -46,7 +46,7 @@
 @DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
 		"spring.data.cassandra.schema-action=create-if-not-exists",
 		"spring.data.cassandra.connection.connect-timeout=20s",
-		"spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.request.timeout=10s" })
+		"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.request.timeout=20s" })
 @Testcontainers(disabledWithoutDocker = true)
 class DataCassandraTestIntegrationTests {
 

diff --git a/...test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java b/...test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java
@@ -45,8 +45,8 @@
 		properties = { "spring.data.cassandra.local-datacenter=datacenter1",
 				"spring.data.cassandra.schema-action=create-if-not-exists",
 				"spring.data.cassandra.connection.connect-timeout=20s",
-				"spring.data.cassandra.connection.init-query-timeout=10s",
-				"spring.data.cassandra.request.timeout=10s" })
+				"spring.data.cassandra.connection.init-query-timeout=20s",
+				"spring.data.cassandra.request.timeout=20s" })
 @Testcontainers(disabledWithoutDocker = true)
 class DataCassandraTestWithIncludeFilterIntegrationTests {