From b7af1addd4e69ca9fa8c7861eb602ccea8efd633 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:42:34 +0000
Subject: [PATCH 1/3] chore(deps): update dependency
 org.testcontainers:testcontainers to v2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f16a31af4a8..35853fef0b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <wiremock.version>3.13.2</wiremock.version>
         <hazelcast.version>5.6.0</hazelcast.version>
         <awaitility.version>4.3.0</awaitility.version>
-        <testcontainers.version>1.21.4</testcontainers.version>
+        <testcontainers.version>2.0.1</testcontainers.version>
         <jetty.version>12.1.5</jetty.version>
 
         <!-- plugin versions -->

From f12b233bf238694ff3d3c7146ed2105a1212185f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Ko=CC=88ninger?=
 <stephan.koeninger@codecentric.de>
Date: Sun, 9 Nov 2025 17:48:45 +0100
Subject: [PATCH 2/3] fix(deps): rename junit-jupiter artifact to
 testcontainers-junit-jupiter in pom.xml

---
 spring-boot-admin-build/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
+                <artifactId>testcontainers-junit-jupiter</artifactId>
                 <version>${testcontainers.version}</version>
                 <scope>test</scope>
             </dependency>

From 4d564e87a4f5d0193ca699f9f1326a06a2e45cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Ko=CC=88ninger?=
 <stephan.koeninger@codecentric.de>
Date: Tue, 16 Dec 2025 15:42:03 +0100
Subject: [PATCH 3/3] fix: replace TestHazelcastInstanceFactory with Hazelcast
 instance configuration in HazelcastEventStoreTest

---
 .../server/eventstore/HazelcastEventStoreTest.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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();
+		}
 	}
 
 }