From aae7ad8dde48ea8cd81ee36e3bb4db646d48afab Mon Sep 17 00:00:00 2001 From: vga91 Date: Thu, 31 Jul 2025 17:31:28 +0200 Subject: [PATCH 1/4] Bump and fix errors for release 2025.06 --- .github/actions/setup-jdk/action.yaml | 4 +-- pom.xml | 6 ++--- server-plugin/pom.xml | 26 ++++++++++++++++--- .../neo4j/gis/spatial/index/IndexManager.java | 4 ++- .../neo4j/gis/spatial/rtree/RTreeIndex.java | 1 + 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/actions/setup-jdk/action.yaml b/.github/actions/setup-jdk/action.yaml index d95bd3bd..b50539f0 100644 --- a/.github/actions/setup-jdk/action.yaml +++ b/.github/actions/setup-jdk/action.yaml @@ -1,10 +1,10 @@ name: "Setups JDK" -description: "Setups JDK 17" +description: "Setups JDK 21" runs: using: "composite" steps: - name: Setup Java JDK uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: adopt diff --git a/pom.xml b/pom.xml index 71758fbf..4720f08f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ - 5.26.5 - 17 + 2025.06.0 + 21 32.2 20100819 20100819 @@ -16,7 +16,7 @@ 4.0.0 neo4j-spatial org.neo4j - 5.26.1-SNAPSHOT + 2025.06-SNAPSHOT Neo4j - Spatial Components Spatial utilities and components for Neo4j https://neo4j.com/labs/neo4j-spatial/5/ diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml index 14c98b8b..258de435 100644 --- a/server-plugin/pom.xml +++ b/server-plugin/pom.xml @@ -26,11 +26,27 @@ org.neo4j neo4j-spatial - 5.26.1-SNAPSHOT + 2025.06-SNAPSHOT neo4j-spatial-server-plugin + + 21 + + + + + + org.junit + junit-bom + 5.10.3 + pom + import + + + + @@ -96,7 +112,7 @@ com.google.code.gson gson - 2.13.1 + 2.11.0 test @@ -113,10 +129,14 @@ + + org.junit.jupiter + junit-jupiter-api + test + org.junit.jupiter junit-jupiter-engine - 5.11.3 test diff --git a/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java b/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java index 2a379347..2b22939a 100644 --- a/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java +++ b/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java @@ -32,6 +32,8 @@ import org.neo4j.kernel.impl.api.security.RestrictedAccessMode; import org.neo4j.kernel.internal.GraphDatabaseAPI; +import static org.neo4j.internal.kernel.api.security.StaticAccessMode.SCHEMA; + public class IndexManager { private final GraphDatabaseAPI db; @@ -44,7 +46,7 @@ public static SecurityContext withIndexCreate(SecurityContext securityContext) { } private IndexAccessMode(SecurityContext securityContext) { - super(securityContext.mode(), Static.SCHEMA); + super(securityContext.mode(), SCHEMA); } @Override diff --git a/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java b/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java index 90cda28e..f364205d 100644 --- a/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java +++ b/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java @@ -584,6 +584,7 @@ private void partition(Transaction tx, Node indexNode, List no //recurse on each partition for (List partition : partitions) { + System.out.println("partition = " + partition); Node newIndexNode = tx.createNode(); if (partition.size() > 1) { partition(tx, newIndexNode, partition, depth + 1, loadingFactor); From b725be69d04e213225988f5670e3c1ee2c72d435 Mon Sep 17 00:00:00 2001 From: vga91 Date: Thu, 31 Jul 2025 17:39:53 +0200 Subject: [PATCH 2/4] updated workflow to trigger ci --- .github/workflows/pr-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 98c52349..2ae00e6c 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -2,9 +2,9 @@ name: build on: push: - branches: - - master + branches: [ "master" ] pull_request: + branches: [ "master" ] jobs: build: From d9c65d3cb15e3ca0077475596c3f4142fdd76a46 Mon Sep 17 00:00:00 2001 From: vga91 Date: Thu, 31 Jul 2025 17:40:43 +0200 Subject: [PATCH 3/4] Revert "updated workflow to trigger ci" This reverts commit 7dfc8dbc44cb233e806d48b82a4f59c142aeaef0. --- .github/workflows/pr-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 2ae00e6c..98c52349 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -2,9 +2,9 @@ name: build on: push: - branches: [ "master" ] + branches: + - master pull_request: - branches: [ "master" ] jobs: build: From 48cc43f5874352996cf5c06b08a054b106329d04 Mon Sep 17 00:00:00 2001 From: vga91 Date: Tue, 19 Aug 2025 10:04:10 +0200 Subject: [PATCH 4/4] changes review --- server-plugin/pom.xml | 2 +- .../src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml index 258de435..f28663f2 100644 --- a/server-plugin/pom.xml +++ b/server-plugin/pom.xml @@ -112,7 +112,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 test diff --git a/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java b/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java index f364205d..90cda28e 100644 --- a/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java +++ b/server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java @@ -584,7 +584,6 @@ private void partition(Transaction tx, Node indexNode, List no //recurse on each partition for (List partition : partitions) { - System.out.println("partition = " + partition); Node newIndexNode = tx.createNode(); if (partition.size() > 1) { partition(tx, newIndexNode, partition, depth + 1, loadingFactor);