root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stephane Nicoll 2022-07-27 08:13:26 +02:00
parent 1e886bd083
commit 782e3f75b6
8 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,10 @@
<hazelcast <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="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<map name="defaultCache" /> <map name="defaultCache" />
<network> <network>
<join> <join>
<tcp-ip enabled="false"/>
<multicast enabled="false"/> <multicast enabled="false"/>
</join> </join>
</network> </network>

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

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

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

@ -1,12 +1,11 @@
<hazelcast xmlns="http://www.hazelcast.com/schema/config" <hazelcast xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hazelcast.com/schema/config 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> <instance-name>actuator-hazelcast</instance-name>
<map name="defaultCache" /> <map name="defaultCache" />
<network> <network>
<join> <join>
<tcp-ip enabled="false"/>
<multicast enabled="false"/> <multicast enabled="false"/>
</join> </join>
</network> </network>

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

@ -1,11 +1,10 @@
<hazelcast <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"> xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<instance-name>default-instance</instance-name> <instance-name>default-instance</instance-name>
<map name="defaultCache" /> <map name="defaultCache" />
<network> <network>
<join> <join>
<tcp-ip enabled="false" />
<multicast enabled="false" /> <multicast enabled="false" />
</join> </join>
</network> </network>

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

@ -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="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@ -11,7 +11,6 @@
<network> <network>
<join> <join>
<tcp-ip enabled="false"/>
<multicast enabled="false"/> <multicast enabled="false"/>
</join> </join>
</network> </network>

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

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

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

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

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

@ -1,7 +1,7 @@
<hazelcast xmlns="http://www.hazelcast.com/schema/config" <hazelcast xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hazelcast.com/schema/config 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"> <map name="spring:session:sessions">
<attributes> <attributes>