From 15d768c23da0cf32a469a2ff42f9c112ade6d3b4 Mon Sep 17 00:00:00 2001
From: David Fauth <dsfauth@gmail.com>
Date: Tue, 12 Dec 2023 11:48:17 -0500
Subject: [PATCH] 5.14 Commit

Updated pom.xml to address multiple jars. Addressed specific for Neo4j 5.14
---
 CHANGELOG.md                               |  7 +++++-
 pom.xml                                    | 29 ++++++++++++++--------
 src/main/java/com/neo4jh3/uber/Uberh3.java |  2 +-
 src/test/java/com/neo4jh3/Neo4jH3Test.java |  2 +-
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d09ea98..a2bac97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-# CHANGELOG - Neo4jH3
+# CHANGELOG - 5.14 - 2023-12-12
+* [Updated] - Updated pom.xml to add multi-release plugin. There have been some changes to Neo4j 5.14 where Neo4j 5.14 supports both Java 17 and Java 21. The multi-release ensures that Neo4j will start with the plugin installed.
+
+If you are using Neo4j 5.14, please use the 5.14 version of the Neo4jH3 plugin.
+
+# CHANGELOG - 5.13 - 2023-11-20
 * [ Added ] Tested through Neo4j 5.13
 * [ Added ] Updated README.md to mention that /tmp directory needs to have execute privileges.
 * [ Fixed ] Ensure the version value returned is correct.
diff --git a/pom.xml b/pom.xml
index 35c8ba0..7c2dd4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,10 +6,10 @@
 
     <groupId>com.neo4jh3</groupId>
     <artifactId>neo4jh3</artifactId>
-    <version>5.13.0</version>
+    <version>5.14.0</version>
 
     <properties>
-        <neo4j.version>5.13.0</neo4j.version>
+        <neo4j.version>5.14.0</neo4j.version>
         <csv.version>1.2</csv.version>
 		<lang3.version>3.13.0</lang3.version>
 		<uber.version>4.1.1</uber.version>
@@ -20,7 +20,8 @@
         <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <assertj.version>3.22.0</assertj.version>
-        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>    
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version> 
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>  
     </properties>
 
     <dependencies>
@@ -36,13 +37,13 @@
             <version>${neo4j.version}</version>
             <scope>provided</scope>
         </dependency>
-
+<!--
 		<dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${lang3.version}</version>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -122,12 +123,6 @@
         <snapshots><enabled>false</enabled></snapshots>
         <releases><enabled>true</enabled></releases>
  </repository>
- <!--
-  <repository>
-        <id>maven-repository</id>
-        <url>file:////Users/davidfauth/.m2/repository/com/uber/h3/4.1.2-SNAPSHOT</url>
-    </repository>
--->
 </repositories>
 
     <build>
@@ -160,6 +155,18 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${maven-jar-plugin.version}</version>
+            <configuration>
+                <archive>
+                    <manifestEntries>
+                        <Multi-Release>true</Multi-Release>
+                    </manifestEntries>
+                </archive>
+            </configuration>
+        </plugin>
             <plugin>
                 <!-- This generates a jar-file with our procedure code,
                      plus any dependencies marked as `compile` scope.
diff --git a/src/main/java/com/neo4jh3/uber/Uberh3.java b/src/main/java/com/neo4jh3/uber/Uberh3.java
index 491d968..3562209 100755
--- a/src/main/java/com/neo4jh3/uber/Uberh3.java
+++ b/src/main/java/com/neo4jh3/uber/Uberh3.java
@@ -28,7 +28,7 @@ public class Uberh3 {
     public Transaction tx;
 
     private final static int DEFAULT_H3_RESOLUTION = 9;
-    private final static String NEO4J_H3_VERSION = "5.13.0";
+    private final static String NEO4J_H3_VERSION = "5.14.0";
 
     private static H3Core h3 = null;
                     
diff --git a/src/test/java/com/neo4jh3/Neo4jH3Test.java b/src/test/java/com/neo4jh3/Neo4jH3Test.java
index f4b862c..a443d3e 100644
--- a/src/test/java/com/neo4jh3/Neo4jH3Test.java
+++ b/src/test/java/com/neo4jh3/Neo4jH3Test.java
@@ -122,7 +122,7 @@ public void should_return_hex_address() throws InterruptedException {
                  }
 
                 result = session.run("RETURN com.neo4jh3.version() AS value");
-                assertEquals("\"5.13.0\"", result.single().get("value").toString());
+                assertEquals("\"5.14.0\"", result.single().get("value").toString());
 
                 result = session.run("RETURN com.neo4jh3.cellToLatLngString('892830926cfffff') AS value");
                 assertEquals("\"37.564248,-122.325306\"", result.single().get("value").toString());