Skip to content

Commit 782e3f7

Browse files
committed
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
1 parent 1e886bd commit 782e3f7

File tree

8 files changed

+5
-12
lines changed

8 files changed

+5
-12
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<hazelcast
2-
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
2+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd"
33
xmlns="http://www.hazelcast.com/schema/config"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<map name="defaultCache" />
66
<network>
77
<join>
8-
<tcp-ip enabled="false"/>
98
<multicast enabled="false"/>
109
</join>
1110
</network>

spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast-3.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<map name="defaultCache"/>
77
<network>
88
<join>
9-
<tcp-ip enabled="false"/>
109
<multicast enabled="false"/>
1110
</join>
1211
</network>

spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.hazelcast.com/schema/config
4-
http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
4+
http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd">
55
<instance-name>actuator-hazelcast</instance-name>
66
<map name="defaultCache" />
77
<network>
88
<join>
9-
<tcp-ip enabled="false"/>
109
<multicast enabled="false"/>
1110
</join>
1211
</network>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<hazelcast
2-
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
2+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd"
33
xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<instance-name>default-instance</instance-name>
55
<map name="defaultCache" />
66
<network>
77
<join>
8-
<tcp-ip enabled="false" />
98
<multicast enabled="false" />
109
</join>
1110
</network>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
1+
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd"
22
xmlns="http://www.hazelcast.com/schema/config"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44

@@ -11,7 +11,6 @@
1111

1212
<network>
1313
<join>
14-
<tcp-ip enabled="false"/>
1514
<multicast enabled="false"/>
1615
</join>
1716
</network>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/hazelcast-3.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
<network>
1313
<join>
14-
<tcp-ip enabled="false"/>
1514
<multicast enabled="false"/>
1615
</join>
1716
</network>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<network>
1616
<join>
17-
<tcp-ip enabled="false"/>
1817
<multicast enabled="false"/>
1918
</join>
2019
</network>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.hazelcast.com/schema/config
4-
http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
4+
http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd">
55

66
<map name="spring:session:sessions">
77
<attributes>

0 commit comments

Comments
 (0)