From 782e3f75b6b3565b8d8f0169deca818ca0a0c543 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 27 Jul 2022 08:13:26 +0200
Subject: [PATCH] Polish Hazelcast configuration

This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
---
 .../src/test/resources/hazelcast.xml                           | 3 +--
 .../spring-boot-actuator/src/test/resources/hazelcast-3.xml    | 1 -
 .../spring-boot-actuator/src/test/resources/hazelcast.xml      | 3 +--
 .../spring-boot-autoconfigure/src/test/resources/hazelcast.xml | 3 +--
 .../boot/autoconfigure/hazelcast/hazelcast-specific.xml        | 3 +--
 .../springframework/boot/autoconfigure/session/hazelcast-3.xml | 1 -
 .../src/main/resources/hazelcast.xml                           | 1 -
 .../src/main/resources/hazelcast.xml                           | 2 +-
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
index cfb3b2e15b0..56f83540403 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
@@ -1,11 +1,10 @@
 <hazelcast
-		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"
 		xmlns="http://www.hazelcast.com/schema/config"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<map name="defaultCache" />
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast-3.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast-3.xml
index 1d6e65e8892..b63c79dc467 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast-3.xml
+++ b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast-3.xml
@@ -6,7 +6,6 @@
 	<map name="defaultCache"/>
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
index 56298f8e790..94d867b6709 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
+++ b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
@@ -1,12 +1,11 @@
 <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">
 	<instance-name>actuator-hazelcast</instance-name>
 	<map name="defaultCache" />
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
index 4e6920f3174..93c771d2b82 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
@@ -1,11 +1,10 @@
 <hazelcast
-	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"
 	xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<instance-name>default-instance</instance-name>
 	<map name="defaultCache" />
 	<network>
 		<join>
-			<tcp-ip enabled="false" />
 			<multicast enabled="false" />
 		</join>
 	</network>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
index f5788c2e503..f1a414df8ad 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
@@ -1,4 +1,4 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd"
 		   xmlns="http://www.hazelcast.com/schema/config"
 		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
@@ -11,7 +11,6 @@
 
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/hazelcast-3.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/hazelcast-3.xml
index f8af5591502..dd3b3d7eff4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/hazelcast-3.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/hazelcast-3.xml
@@ -11,7 +11,6 @@
 
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml
index 4fbcdb0b596..c75a4194dcd 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml
+++ b/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>
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml
index 4abe5ce1cb9..6781e5a2246 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml
+++ b/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>