diff --git a/pom.xml b/pom.xml index f16a31af4a8..35853fef0b9 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 3.13.2 5.6.0 4.3.0 - 1.21.4 + 2.0.1 12.1.5 diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml index f3393f4d2d2..dd04572d055 100644 --- a/spring-boot-admin-build/pom.xml +++ b/spring-boot-admin-build/pom.xml @@ -93,7 +93,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreTest.java b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreTest.java index 4bbad0f4fa5..3d831f28727 100644 --- a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreTest.java +++ b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreTest.java @@ -16,8 +16,9 @@ package de.codecentric.boot.admin.server.eventstore; +import com.hazelcast.config.Config; +import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.test.TestHazelcastInstanceFactory; public class HazelcastEventStoreTest extends AbstractEventStoreTest { @@ -25,14 +26,19 @@ public class HazelcastEventStoreTest extends AbstractEventStoreTest { @Override protected InstanceEventStore createStore(int maxLogSizePerAggregate) { - hazelcast = new TestHazelcastInstanceFactory(1).newHazelcastInstance(); + Config config = new Config(); + config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false); + config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false); + hazelcast = Hazelcast.newHazelcastInstance(config); return new HazelcastEventStore(maxLogSizePerAggregate, hazelcast.getMap("testList" + System.currentTimeMillis())); } @Override protected void shutdownStore() { - this.hazelcast.shutdown(); + if (this.hazelcast != null) { + this.hazelcast.shutdown(); + } } }