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 23f6e90e93d..566f53e3a14 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 @@ -5,7 +5,7 @@ - + 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 ee10fee2ca2..d01639965c5 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 @@ -6,7 +6,7 @@ - + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java index a6ea4451b13..3909ba70298 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.hazelcast; import java.util.Map; import com.hazelcast.config.Config; +import com.hazelcast.config.JoinConfig; import com.hazelcast.config.QueueConfig; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; @@ -138,7 +139,7 @@ class HazelcastAutoConfigurationServerTests { @Test void configInstanceWithName() { - Config config = new Config("my-test-instance"); + Config config = createTestConfig("my-test-instance"); HazelcastInstance existing = Hazelcast.newHazelcastInstance(config); try { this.contextRunner.withUserConfiguration(HazelcastConfigWithName.class) @@ -205,6 +206,14 @@ class HazelcastAutoConfigurationServerTests { }); } + private static Config createTestConfig(String instanceName) { + Config config = new Config(instanceName); + JoinConfig join = config.getNetworkConfig().getJoin(); + join.getAutoDetectionConfig().setEnabled(false); + join.getMulticastConfig().setEnabled(false); + return config; + } + @Configuration(proxyBeanMethods = false) static class HazelcastConfigWithName { @@ -220,7 +229,7 @@ class HazelcastAutoConfigurationServerTests { @Bean Config anotherHazelcastConfig() { - Config config = new Config(); + Config config = createTestConfig("another-test-instance"); config.addQueueConfig(new QueueConfig("another-queue")); return config; } 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 edf5d0a1f88..cd699391185 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 @@ -5,7 +5,7 @@ - + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml index 1616ba2e78f..686d75638a9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml @@ -1,5 +1,7 @@ hazelcast: network: join: + auto-detection: + enabled: false multicast: enabled: false 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 419711a7e94..f5a30301dca 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 @@ -11,7 +11,7 @@ - + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.yaml index 614e99777ae..933c34ffd0c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.yaml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.yaml @@ -1,6 +1,8 @@ hazelcast: network: join: + auto-detection: + enabled: false multicast: enabled: false 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 @@ - diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/build.gradle index 2799093cf43..4266edf6a4f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/build.gradle +++ b/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" } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/src/main/resources/hazelcast.xml index b60f199540c..d124024b414 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/src/main/resources/hazelcast.xml +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast4/src/main/resources/hazelcast.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.2.xsd"> 600 @@ -13,7 +13,7 @@ - + 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..608cf7d9b0f 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 @@ + http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd"> @@ -11,6 +11,7 @@ +