version update 5.12.0 → 5.18.1

3 files changed, 86 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4140f5b2d306..560a1078ee65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = neo4j-enterprise
 	pkgdesc = A fully transactional graph database implemented in Java
-	pkgver = 5.12.0
+	pkgver = 5.18.1
 	pkgrel = 1
-	url = http://neo4j.org/
+	url = https://neo4j.org/
 	install = neo4j.install
 	arch = any
 	license = custom
@@ -11,13 +11,14 @@ pkgbase = neo4j-enterprise
 	conflicts = neo4j-community
 	options = !strip
 	backup = etc/neo4j/neo4j.conf
-	source = http://dist.neo4j.org/neo4j-enterprise-5.12.0-unix.tar.gz
+	source = http://dist.neo4j.org/neo4j-enterprise-5.18.1-unix.tar.gz
 	source = startup-scripts-fix-paths.patch
 	source = neo4j.conf
 	source = neo4j.install
 	source = neo4j.service
 	source = neo4j-tmpfile.conf
-	sha256sums = 282c8601cbcc04fc49dfefec305c1f3d824ba2cd16ea3d30721051bfcea05239
+	sha256sums = a2ab866be05d2decef558b3e711c4b4403f3a35be6b87f7b94c618bb83b8f7c3
+	    sha256sums = 47ffc2aff4b3012a67514687a5bd6c2e1f5ce5891e9ae5bfc0d3dd4648cb030b
 		sha256sums = 421dc29e493850104fa8909bd1e9ca8b5588193090f9c61f0608e432d64f1a79
         sha256sums = 5d5b0a2137dd093b1e18b264b4a54b9d1f84029100ef6a513361d71d1ddeb8f6
         sha256sums = 8cdf6de9864f66b8f435b8da5c04245a7fa23dde986cc7aec3133261e4003c64
diff --git a/PKGBUILD b/PKGBUILD
index 62591f615e5d..01ac0ce64c39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Amina Khakimova <hakami1024@gmail.com>
 # Contributor: Marcel Campello Ferreira <marcel.campello.ferreira@gmail.com>
 pkgname=neo4j-enterprise
-pkgver=5.12.0
+pkgver=5.18.1
 pkgrel=1
 pkgdesc='A fully transactional graph database implemented in Java'
 arch=(any)
@@ -21,8 +21,8 @@ source=(http://dist.neo4j.org/neo4j-enterprise-$pkgver-unix.tar.gz
         neo4j.service
         neo4j-tmpfile.conf)
 
-sha256sums=('282c8601cbcc04fc49dfefec305c1f3d824ba2cd16ea3d30721051bfcea05239'
-            '421dc29e493850104fa8909bd1e9ca8b5588193090f9c61f0608e432d64f1a79'
+sha256sums=('a2ab866be05d2decef558b3e711c4b4403f3a35be6b87f7b94c618bb83b8f7c3'
+            '47ffc2aff4b3012a67514687a5bd6c2e1f5ce5891e9ae5bfc0d3dd4648cb030b'
             '5d5b0a2137dd093b1e18b264b4a54b9d1f84029100ef6a513361d71d1ddeb8f6'
             '8cdf6de9864f66b8f435b8da5c04245a7fa23dde986cc7aec3133261e4003c64'
             '42d4fa137d2a0eb1541780a4afef1bdaebf6c6e593cf7f285b527ea0e07bdf74'
diff --git a/startup-scripts-fix-paths.patch b/startup-scripts-fix-paths.patch
index 76b95c498ea7..e41c5647a9b7 100644
--- a/startup-scripts-fix-paths.patch
+++ b/startup-scripts-fix-paths.patch
@@ -1,60 +1,18 @@
-diff --unified --recursive --text neo4j-enterprise-5.12.0/bin/cypher-shell neo4j-enterprise-5.12.0-p/bin/cypher-shell
---- neo4j-enterprise-5.12.0/bin/cypher-shell	2023-09-05 21:32:30.000000000 +0200
-+++ neo4j-enterprise-5.12.0-p/bin/cypher-shell	2023-09-19 14:38:14.953898759 +0200
-@@ -18,7 +18,6 @@
- #   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
- #   reserved.
-
--
- # resolve links - $0 may be a softlink
- PRG="$0"
-
-@@ -38,6 +37,10 @@
- # Reset the REPO variable. If you need to influence this use the environment setup file.
- REPO=
-
-+# Paths for Arch Linux AUR installation:
-+BASEDIR="/usr/share/java/neo4j"
-+CLASSPATH="$BASEDIR:$BASEDIR/*"
-+REPO="$BASEDIR"
-
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false;
-@@ -97,7 +100,10 @@
-   REPO="$BASEDIR"/lib
- fi
-
--CLASSPATH="$BASEDIR"/etc:"$REPO"/neo4j-java-driver-5.11.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.96.Final.jar:"$REPO"/netty-common-4.1.96.Final.jar:"$REPO"/netty-resolver-4.1.96.Final.jar:"$REPO"/netty-buffer-4.1.96.Final.jar:"$REPO"/netty-transport-4.1.96.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.96.Final.jar:"$REPO"/netty-codec-4.1.96.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.5.8.jar:"$REPO"/cypher-literal-interpreter-5.12.0.jar:"$REPO"/neo4j-values-5.12.0.jar:"$REPO"/neo4j-graphdb-api-5.12.0.jar:"$REPO"/annotations-5.12.0.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.13.0.jar:"$REPO"/neo4j-common-5.12.0.jar:"$REPO"/commons-text-1.10.0.jar:"$REPO"/neo4j-resource-5.12.0.jar:"$REPO"/neo4j-collections-5.12.0.jar:"$REPO"/caffeine-3.1.7.jar:"$REPO"/neo4j-exceptions-5.12.0.jar:"$REPO"/neo4j-unsafe-5.12.0.jar:"$REPO"/jna-5.13.0.jar:"$REPO"/cypher-ast-factory-5.12.0.jar:"$REPO"/neo4j-cypher-javacc-parser-5.12.0.jar:"$REPO"/neo4j-cypher-dsl-2023.5.0.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.12.0.jar
-+BASEDIR="/usr/share/java/neo4j"
-+REPO="$BASEDIR"
-+
-+CLASSPATH="$BASEDIR":"$REPO"/neo4j-java-driver-5.11.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.96.Final.jar:"$REPO"/netty-common-4.1.96.Final.jar:"$REPO"/netty-resolver-4.1.96.Final.jar:"$REPO"/netty-buffer-4.1.96.Final.jar:"$REPO"/netty-transport-4.1.96.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.96.Final.jar:"$REPO"/netty-codec-4.1.96.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.5.8.jar:"$REPO"/cypher-literal-interpreter-5.12.0.jar:"$REPO"/neo4j-values-5.12.0.jar:"$REPO"/neo4j-graphdb-api-5.12.0.jar:"$REPO"/annotations-5.12.0.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.13.0.jar:"$REPO"/neo4j-common-5.12.0.jar:"$REPO"/commons-text-1.10.0.jar:"$REPO"/neo4j-resource-5.12.0.jar:"$REPO"/neo4j-collections-5.12.0.jar:"$REPO"/caffeine-3.1.7.jar:"$REPO"/neo4j-exceptions-5.12.0.jar:"$REPO"/neo4j-unsafe-5.12.0.jar:"$REPO"/jna-5.13.0.jar:"$REPO"/cypher-ast-factory-5.12.0.jar:"$REPO"/neo4j-cypher-javacc-parser-5.12.0.jar:"$REPO"/neo4j-cypher-dsl-2023.5.0.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.12.0.jar
-
- ENDORSED_DIR=
- if [ -n "$ENDORSED_DIR" ] ; then
-@@ -124,5 +130,5 @@
-   -Dapp.repo="$REPO" \
-   -Dapp.home="$BASEDIR" \
-   -Dbasedir="$BASEDIR" \
--  org.neo4j.shell.startup.CypherShellBoot \
-+  org.neo4j.shell.Main \
-   "$@"
-diff --unified --recursive --text neo4j-enterprise-5.12.0/bin/neo4j neo4j-enterprise-5.12.0-p/bin/neo4j
---- neo4j-enterprise-5.12.0/bin/neo4j	2023-09-05 21:44:00.000000000 +0200
-+++ neo4j-enterprise-5.12.0-p/bin/neo4j	2023-09-19 14:40:20.340572661 +0200
+--- neo4j-enterprise-5.18.1/bin/neo4j	2024-03-14 16:49:22.000000000 +0100
++++ pbin/neo4j	2024-04-04 12:57:10.506095591 +0200
 @@ -2,7 +2,7 @@
  # Copyright (c) "Neo4j"
  # Neo4j Sweden AB [https://neo4j.com]
  # This file is a commercial add-on to Neo4j Enterprise Edition.
 -
 +export NEO4J_CONF=/etc/neo4j
-
+ 
  # resolve links - $0 may be a softlink
  PRG="$0"
 @@ -102,6 +102,10 @@
    [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
  fi
-
+ 
 +BASEDIR="/usr/share/java/neo4j"
 +CLASSPATH="$BASEDIR:$BASEDIR/*"
 +REPO="$BASEDIR/repo"
@@ -69,22 +27,40 @@ diff --unified --recursive --text neo4j-enterprise-5.12.0/bin/neo4j neo4j-enterp
 -  "$@"
 \ No newline at end of file
 +  "$@"
-diff --unified --recursive --text neo4j-enterprise-5.12.0/bin/neo4j-admin neo4j-enterprise-5.12.0-p/bin/neo4j-admin
---- neo4j-enterprise-5.12.0/bin/neo4j-admin	2023-09-05 21:44:00.000000000 +0200
-+++ neo4j-enterprise-5.12.0-p/bin/neo4j-admin	2023-09-19 14:41:39.110577293 +0200
+--- neo4j-enterprise-5.18.1/bin/neo4j-admin	2024-03-14 16:49:22.000000000 +0100
++++ pbin/neo4j-admin	2024-04-04 13:50:44.316292561 +0200
 @@ -2,7 +2,7 @@
  # Copyright (c) "Neo4j"
  # Neo4j Sweden AB [https://neo4j.com]
  # This file is a commercial add-on to Neo4j Enterprise Edition.
 -
 +export NEO4J_CONF=/etc/neo4j
-
+ 
  # resolve links - $0 may be a softlink
  PRG="$0"
-@@ -102,6 +102,10 @@
+@@ -41,7 +41,7 @@
+ 			  else
+ 			      JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ 			  fi
+-           fi       
++           fi
+            ;;
+ esac
+ 
+@@ -71,6 +71,9 @@
+   fi
+ fi
+ 
++# this is where Java 17 is installed by the official Arch package
++JAVACMD="/usr/lib/jvm/java-17-openjdk/bin/java"
++
+ if [ ! -x "$JAVACMD" ] ; then
+   echo "Error: JAVA_HOME is not defined correctly." 1>&2
+   echo "  We cannot execute $JAVACMD" 1>&2
+@@ -102,6 +105,10 @@
    [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
  fi
-
+ 
 +BASEDIR="/usr/share/java/neo4j"
 +CLASSPATH="$BASEDIR:$BASEDIR/*:$CLASSPATH"
 +REPO="$BASEDIR/repo"
@@ -92,10 +68,59 @@ diff --unified --recursive --text neo4j-enterprise-5.12.0/bin/neo4j-admin neo4j-
  exec "$JAVACMD" -Xmx128m \
    -classpath "$CLASSPATH" \
    -Dapp.name="neo4j-admin" \
-@@ -110,4 +114,4 @@
+@@ -110,4 +117,4 @@
    -Dapp.home="$BASEDIR" \
    -Dbasedir="$BASEDIR" \
    org.neo4j.server.startup.Neo4jAdminBoot \
 -  "$@"
 \ No newline at end of file
 +  "$@"
+--- neo4j-enterprise-5.18.1/bin/cypher-shell	2024-03-14 16:34:28.000000000 +0100
++++ pbin/cypher-shell	2024-04-04 13:10:04.789476453 +0200
+@@ -18,7 +18,6 @@
+ #   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+ #   reserved.
+ 
+-
+ # resolve links - $0 may be a softlink
+ PRG="$0"
+ 
+@@ -38,6 +37,10 @@
+ # Reset the REPO variable. If you need to influence this use the environment setup file.
+ REPO=
+ 
++# Paths for Arch Linux AUR installation:
++BASEDIR="/usr/share/java/neo4j"
++CLASSPATH="$BASEDIR:$BASEDIR/*"
++REPO="$BASEDIR"
+ 
+ # OS specific support.  $var _must_ be set to either true or false.
+ cygwin=false;
+@@ -56,7 +59,7 @@
+ 			  else
+ 			      JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ 			  fi
+-           fi       
++           fi
+            ;;
+ esac
+ 
+@@ -97,7 +100,10 @@
+   REPO="$BASEDIR"/lib
+ fi
+ 
+-CLASSPATH="$BASEDIR"/etc:"$REPO"/neo4j-java-driver-5.17.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.106.Final.jar:"$REPO"/netty-common-4.1.106.Final.jar:"$REPO"/netty-resolver-4.1.106.Final.jar:"$REPO"/netty-buffer-4.1.106.Final.jar:"$REPO"/netty-transport-4.1.106.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.106.Final.jar:"$REPO"/netty-codec-4.1.106.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.6.2.jar:"$REPO"/cypher-literal-interpreter-5.18.1.jar:"$REPO"/neo4j-values-5.18.1.jar:"$REPO"/neo4j-graphdb-api-5.18.1.jar:"$REPO"/annotations-5.18.1.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.14.0.jar:"$REPO"/neo4j-common-5.18.1.jar:"$REPO"/commons-text-1.11.0.jar:"$REPO"/neo4j-resource-5.18.1.jar:"$REPO"/neo4j-collections-5.18.1.jar:"$REPO"/caffeine-3.1.8.jar:"$REPO"/neo4j-exceptions-5.18.1.jar:"$REPO"/neo4j-unsafe-5.18.1.jar:"$REPO"/jna-5.14.0.jar:"$REPO"/cypher-ast-factory-5.18.1.jar:"$REPO"/neo4j-cypher-javacc-parser-5.18.1.jar:"$REPO"/neo4j-cypher-dsl-2023.9.3.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.18.1.jar
++BASEDIR="/usr/share/java/neo4j"
++REPO="$BASEDIR"
++
++CLASSPATH="$BASEDIR":"$REPO"/neo4j-java-driver-5.17.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.106.Final.jar:"$REPO"/netty-common-4.1.106.Final.jar:"$REPO"/netty-resolver-4.1.106.Final.jar:"$REPO"/netty-buffer-4.1.106.Final.jar:"$REPO"/netty-transport-4.1.106.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.106.Final.jar:"$REPO"/netty-codec-4.1.106.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.6.2.jar:"$REPO"/cypher-literal-interpreter-5.18.1.jar:"$REPO"/neo4j-values-5.18.1.jar:"$REPO"/neo4j-graphdb-api-5.18.1.jar:"$REPO"/annotations-5.18.1.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.14.0.jar:"$REPO"/neo4j-common-5.18.1.jar:"$REPO"/commons-text-1.11.0.jar:"$REPO"/neo4j-resource-5.18.1.jar:"$REPO"/neo4j-collections-5.18.1.jar:"$REPO"/caffeine-3.1.8.jar:"$REPO"/neo4j-exceptions-5.18.1.jar:"$REPO"/neo4j-unsafe-5.18.1.jar:"$REPO"/jna-5.14.0.jar:"$REPO"/cypher-ast-factory-5.18.1.jar:"$REPO"/neo4j-cypher-javacc-parser-5.18.1.jar:"$REPO"/neo4j-cypher-dsl-2023.9.3.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.18.1.jar
+ 
+ ENDORSED_DIR=
+ if [ -n "$ENDORSED_DIR" ] ; then
+@@ -124,5 +130,5 @@
+   -Dapp.repo="$REPO" \
+   -Dapp.home="$BASEDIR" \
+   -Dbasedir="$BASEDIR" \
+-  org.neo4j.shell.startup.CypherShellBoot \
++  org.neo4j.shell.Main \
+   "$@"