update to neo4j 5.26 and geo-tools 32.2 (#432)

Author: Andy2003

docs/docs/modules/ROOT/images/generated/step4_break_up_all_geometries_into_points_and_make_density_islands.png

@@ -2,25 +2,25 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<properties>
-		<neo4j.version>5.20.0</neo4j.version>
+		<neo4j.version>5.26.2</neo4j.version>
 		<neo4j.java.version>17</neo4j.java.version>
 		<skinGroupId>org.neo4j.maven.skins</skinGroupId>
 		<skinArtifactId>default-skin</skinArtifactId>
 		<skinVersion>2</skinVersion>
-		<geotools.version>30.2</geotools.version>
+		<geotools.version>32.2</geotools.version>
 		<spatial.test.osm.version>20100819</spatial.test.osm.version>
 		<spatial.test.shp.version>20100819</spatial.test.shp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<bundle.namespace>org.neo4j.gis</bundle.namespace>
 		<github.global.server>github</github.global.server>
-		<junit.version>5.10.2</junit.version>
-		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+		<junit.version>5.11.3</junit.version>
+		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
 	</properties>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>neo4j-spatial</artifactId>
 	<groupId>org.neo4j</groupId>
-	<version>5.20.1-SNAPSHOT</version>
+	<version>5.26.0-SNAPSHOT</version>
 	<name>Neo4j - Spatial Components</name>
 	<description>Spatial utilities and components for Neo4j</description>
 	<url>https://components.neo4j.org/${project.artifactId}/${project.version}</url>
@@ -314,57 +314,27 @@
 			<dependency>
 				<groupId>org.locationtech.jts</groupId>
 				<artifactId>jts-core</artifactId>
-				<version>1.19.0</version>
+				<version>1.20.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
 				<version>2.0.13</version>
 			</dependency>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>2.16.1</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.14.0</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>2.17.1</version>
+				<version>3.17.0</version>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.annotation</groupId>
 				<artifactId>jakarta.annotation-api</artifactId>
 				<version>1.3.5</version>
 			</dependency>
-			<dependency>
-				<groupId>jakarta.activation</groupId>
-				<artifactId>jakarta.activation-api</artifactId>
-				<version>1.2.2</version>
-			</dependency>
-			<dependency>
-				<groupId>jakarta.xml.bind</groupId>
-				<artifactId>jakarta.xml.bind-api</artifactId>
-				<version>2.3.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.scala-lang</groupId>
-				<artifactId>scala-library</artifactId>
-				<version>2.13.14</version>
-			</dependency>
 			<dependency>
 				<groupId>javax.measure</groupId>
 				<artifactId>unit-api</artifactId>
-				<version>2.1.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apiguardian</groupId>
-				<artifactId>apiguardian-api</artifactId>
-				<version>1.1.2</version>
+				<version>2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.errorprone</groupId>

pom.xml

@@ -44,7 +44,6 @@
 import org.neo4j.internal.kernel.api.NodeValueIndexCursor;
 import org.neo4j.internal.kernel.api.PropertyIndexQuery;
 import org.neo4j.internal.kernel.api.Read;
-import org.neo4j.internal.kernel.api.TokenRead;
 import org.neo4j.internal.schema.IndexDescriptor;
 import org.neo4j.internal.schema.IndexType;
 import org.neo4j.internal.schema.SchemaDescriptors;
@@ -53,6 +52,7 @@
 import org.neo4j.kernel.impl.core.NodeEntity;
 import org.neo4j.kernel.impl.coreapi.internal.CursorIterator;
 import org.neo4j.memory.EmptyMemoryTracker;
+import org.neo4j.token.api.TokenConstants;
 
 public abstract class LayerSpaceFillingCurvePointIndex extends ExplicitIndexBackedPointIndex<Long> {
 
@@ -147,7 +147,7 @@ private static ResourceIterator<Node> nodesByLabelAndProperty(KernelTransaction
 				PropertyIndexQuery query) {
 			Read read = transaction.dataRead();
 
-			if (query.propertyKeyId() == TokenRead.NO_TOKEN || labelId == TokenRead.NO_TOKEN) {
+			if (query.propertyKeyId() == TokenConstants.NO_TOKEN || labelId == TokenConstants.NO_TOKEN) {
 				return emptyResourceIterator();
 			}
 			Iterator<IndexDescriptor> iterator = transaction.schemaRead()

src/main/java/org/neo4j/gis/spatial/index/LayerSpaceFillingCurvePointIndex.java

@@ -70,9 +70,9 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
 import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.api.KernelTransaction;
+import org.neo4j.kernel.api.QueryLanguage;
 import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.Level;
@@ -160,11 +160,11 @@ public Stream<NameResult> listProcedures() {
 		GlobalProcedures procedures = ((GraphDatabaseAPI) db).getDependencyResolver()
 				.resolveDependency(GlobalProcedures.class);
 		Stream.Builder<NameResult> builder = Stream.builder();
-		for (ProcedureSignature proc : procedures.getCurrentView().getAllProcedures()) {
+		procedures.getCurrentView().getAllProcedures(QueryLanguage.CYPHER_5).forEach(proc -> {
 			if (proc.name().namespace()[0].equals("spatial")) {
 				builder.accept(new NameResult(proc.name().toString(), proc.toString()));
 			}
-		}
+		});
 		return builder.build();
 	}
 

src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java

@@ -158,7 +158,7 @@ public void testSnapping() throws Exception {
 				for (PointResult result : edgeResults) {
 					System.out.println("\t" + result);
 					resultsLayer.add(tx, result.getKey(), fieldsNames,
-							new Object[]{result.getValue().getGeomNode().getId(),
+							new Object[]{result.getValue().getGeomNode().getElementId(),
 									"Snapped point to layer " + layerName + ": " + result.getValue().getGeometry()
 											.toString(),
 									(long) (1000000 * result.getDistance())});