Merge branch '2.6.x' into 2.7.x

Closes gh-31883

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml

@@ -14,7 +14,6 @@
 
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/build.gradle

@@ -7,8 +7,8 @@ description = "Spring Boot Hazelcast 4 smoke test"
 
 configurations.all {
 	resolutionStrategy {
-		force "com.hazelcast:hazelcast:4.0.5"
-		force "com.hazelcast:hazelcast-spring:4.0.5"
+		force "com.hazelcast:hazelcast:4.2.5"
+		force "com.hazelcast:hazelcast-spring:4.2.5"
 	}
 }
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/src/main/resources/hazelcast.xml

@@ -1,6 +1,6 @@
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
 		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		   xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd">
+		   xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd">
 	<map name="countries">
 		<time-to-live-seconds>600</time-to-live-seconds>
 	</map>
@@ -13,7 +13,7 @@
 
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
+			<auto-detection enabled="false" />
 			<multicast enabled="false"/>
 		</join>
 	</network>

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml

@@ -1,7 +1,7 @@
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.hazelcast.com/schema/config
-		http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
+		http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd">
 
 	<map name="spring:session:sessions">
 		<attributes>
@@ -11,6 +11,7 @@
 
 	<network>
 		<join>
+			<auto-detection enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>