From 430b765d5a5d08f2356ac3e1634bc4b22ff72364 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 9 Nov 2022 12:09:16 -0600
Subject: [PATCH 1/4] Issue #8877 - enabling hazelcast testing in branch

---
 .../test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml b/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
index dbc4cf268c40..aa39f08c81fb 100644
--- a/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
+++ b/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
@@ -11,7 +11,6 @@
   <name>Jetty EE10 Tests :: Sessions :: Hazelcast</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.sessions.hazelcast</bundle-symbolic-name>
-    <skipTests>true</skipTests> <!-- disabled, see Issue #8877 -->
   </properties>
   <build>
     <plugins>

From 047789ab7a3fd5f8c9a0d124a4ca335a29d13506 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 9 Nov 2022 12:11:17 -0600
Subject: [PATCH 2/4] Issue #8877 - downgrading testcontainers to 1.17.4 to see
 if more stable

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

diff --git a/pom.xml b/pom.xml
index 7e961cf63490..848adbba2006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <plexus-utils.version>3.5.0</plexus-utils.version>
     <slf4j.version>2.0.2</slf4j.version>
     <springboot.version>2.1.1.RELEASE</springboot.version>
-    <testcontainers.version>1.17.5</testcontainers.version>
+    <testcontainers.version>1.17.4</testcontainers.version>
     <weld.version>4.0.3.Final</weld.version>
     <wildfly.common.version>1.6.0.Final</wildfly.common.version>
     <wildfly.elytron.version>1.20.1.Final</wildfly.elytron.version>

From 952bcf3409844213269b5f0c7a0305fa07e358c1 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 9 Nov 2022 12:18:18 -0600
Subject: [PATCH 3/4] Issue #8877 - bumping hazelcast from 4.2.5 to 5.2.0

+ Not using hazelcast-all uber-jar
---
 .../test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml     | 2 +-
 jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml | 2 +-
 jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml b/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
index aa39f08c81fb..b71a654d149b 100644
--- a/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
+++ b/jetty-ee10/test-ee10-sessions/test-ee10-hazelcast-sessions/pom.xml
@@ -92,7 +92,7 @@
     </dependency>
     <dependency>
        <groupId>com.hazelcast</groupId>
-       <artifactId>hazelcast-all</artifactId>
+       <artifactId>hazelcast</artifactId>
        <version>${hazelcast.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml
index 7da446a7a3e5..90e35c430560 100644
--- a/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml
+++ b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
        <groupId>com.hazelcast</groupId>
-       <artifactId>hazelcast-all</artifactId>
+       <artifactId>hazelcast</artifactId>
        <version>${hazelcast.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
index 5f7a60f9bc65..63b4f2afc163 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
@@ -92,7 +92,7 @@
     </dependency>
     <dependency>
        <groupId>com.hazelcast</groupId>
-       <artifactId>hazelcast-all</artifactId>
+       <artifactId>hazelcast</artifactId>
        <version>${hazelcast.version}</version>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 848adbba2006..461e81d9f09d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <guice.version>5.1.0</guice.version>
     <hamcrest.version>2.2</hamcrest.version>
     <hawtio.version>2.15.1</hawtio.version>
-    <hazelcast.version>4.2.5</hazelcast.version>
+    <hazelcast.version>5.2.0</hazelcast.version>
     <infinispan.protostream.version>4.4.4.Final</infinispan.protostream.version>
     <infinispan.version>11.0.15.Final</infinispan.version>
     <jackson.version>2.13.4</jackson.version>

From 352f70d92f59d24b40256bcc81d54944d03df4c0 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 9 Nov 2022 12:18:41 -0600
Subject: [PATCH 4/4] Revert "Issue #8877 - downgrading testcontainers to
 1.17.4 to see if more stable"

This reverts commit 047789ab7a3fd5f8c9a0d124a4ca335a29d13506.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 461e81d9f09d..7ab83c06422e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <plexus-utils.version>3.5.0</plexus-utils.version>
     <slf4j.version>2.0.2</slf4j.version>
     <springboot.version>2.1.1.RELEASE</springboot.version>
-    <testcontainers.version>1.17.4</testcontainers.version>
+    <testcontainers.version>1.17.5</testcontainers.version>
     <weld.version>4.0.3.Final</weld.version>
     <wildfly.common.version>1.6.0.Final</wildfly.common.version>
     <wildfly.elytron.version>1.20.1.Final</wildfly.elytron.version>