From 91358fcd750757bcbafd9f1c58c6e4314376016a Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 4 Nov 2024 20:40:09 +0100
Subject: [PATCH] Upgrade Hazelcast to 5.5.0

This upgrades the Hazelcast library used by this plugin from 5.3.7 to 5.5.0

As a result, the minimum required version of Java now is 17.

This plugin now also adopted a new versioning scheme: the version number now reflects the version of the Hazelcast library that is in use.

fixes #101
---
 changelog.html                              |  7 +++++--
 classes/hazelcast-local-config.template.xml |  7 +------
 plugin.xml                                  |  2 +-
 pom.xml                                     | 13 +++++++++++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/changelog.html b/changelog.html
index b0ad3323f..c870b956c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,10 +44,13 @@ <h1>
 Hazelcast Clustering Plugin Changelog
 </h1>
 
-<p><b>3.0.1</b> -- (To be determined)</p>
+<p><b>5.5.0 Release 1</b> -- (To be determined)</p>
 <ul>
+    <li>Minimum Java requirement: 17</li>
+    <li>Adopted a new versioning scheme: the version number now reflects the version of the Hazelcast library that is in use.</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/103'>Issue #103</a>] - Fix Cluster initialization race condition</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/102'>Issue #102</a>] - Remove unused code in ClusterListener</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/101'>Issue #101</a>] - Upgrade to Hazelcast 5.5.0</li>
 </ul>
 
 <p><b>3.0.0</b> -- September 12, 2024</p>
@@ -55,7 +58,7 @@ <h1>
 <ul>
     <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/97'>Issue #97</a>] - Compatibility issue with Openfire 4.9.0</li>
     <li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2792'>Issue OF-2792</a>] - Cache summary page shows wrong stats when using Clustering</li>
-    <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/59'>Upgrade to Hazelcast 5.3.7</a>] - Upgrade to Hazelcast 5.3.7</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-hazelcast-plugin/issues/59'>Issue #59</a>] - Upgrade to Hazelcast 5.3.7</li>
 </ul>
 
 <p><b>2.6.1</b> -- November 9, 2022</p>
diff --git a/classes/hazelcast-local-config.template.xml b/classes/hazelcast-local-config.template.xml
index 0ee7ef57e..819e38322 100644
--- a/classes/hazelcast-local-config.template.xml
+++ b/classes/hazelcast-local-config.template.xml
@@ -2,12 +2,7 @@
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           https://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd">
-    <!-- Recommend you open cp subsystem on your cluster -->
-    <cp-subsystem>
-        <cp-member-count>3</cp-member-count>
-        <group-size>3</group-size>
-    </cp-subsystem>
+           https://www.hazelcast.com/schema/config/hazelcast-config-5.5.xsd">
     <network>
         <port auto-increment="true" port-count="100">5701</port>
         <outbound-ports>
diff --git a/plugin.xml b/plugin.xml
index 0cb75804d..c1a225ed0 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -8,5 +8,5 @@
     <version>${project.version}</version>
     <date>2024-11-02</date>
     <minServerVersion>4.8.1</minServerVersion>
-    <minJavaVersion>1.8</minJavaVersion>
+    <minJavaVersion>17</minJavaVersion>
 </plugin>
diff --git a/pom.xml b/pom.xml
index 2fd3f325c..ef622d4b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>hazelcast</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>5.5.0.1-SNAPSHOT</version>
     <name>Hazelcast Plugin</name>
     <description>Adds clustering support</description>
 
@@ -33,6 +33,15 @@
     <build>
         <sourceDirectory>src/java</sourceDirectory>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
             </plugin>
@@ -47,7 +56,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>5.3.7</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>