Merge branch '2.7.x' into 3.0.x

Closes gh-35772

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java

@@ -18,6 +18,8 @@ package org.springframework.boot.autoconfigure.hazelcast;
 
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.client.config.ClientConnectionStrategyConfig;
+import com.hazelcast.client.config.ConnectionRetryConfig;
 import com.hazelcast.client.impl.clientside.HazelcastClientProxy;
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
@@ -201,7 +203,8 @@ class HazelcastAutoConfigurationClientTests {
 
 		@Bean
 		ClientConfig clientConfig() {
-			return new ClientConfig();
+			return new ClientConfig().setConnectionStrategyConfig(new ClientConnectionStrategyConfig()
+				.setConnectionRetryConfig(new ConnectionRetryConfig().setClusterConnectTimeoutMillis(60000)));
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml

@@ -5,4 +5,10 @@
 
 	<instance-name>spring-boot</instance-name>
 	
+	<connection-strategy>
+		<connection-retry>
+			<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
+		</connection-retry>
+	</connection-strategy>
+
 </hazelcast-client>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml

@@ -5,5 +5,10 @@
 	<client-labels>
 		<label>explicit-xml</label>
 	</client-labels>
+	<connection-strategy>
+		<connection-retry>
+			<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
+		</connection-retry>
+	</connection-strategy>
 
 </hazelcast-client>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml

@@ -1,3 +1,6 @@
 hazelcast-client:
   client-labels:
     - explicit-yaml
+  connection-strategy:
+    connection-retry:
+      cluster-connect-timeout-millis: 60000

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml

@@ -1,3 +1,6 @@
 hazelcast-client:
   client-labels:
     - explicit-yml
+  connection-strategy:
+    connection-retry:
+      cluster-connect-timeout-millis: 60000