Skip to content

Bump and fix errors for release 2025.06 #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump and fix errors for release 2025.06 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb17694
Bump and fix errors for release 2025.06
vga91 Jul 31, 2025
7dfc8db
updated workflow to trigger ci
vga91 Jul 31, 2025
d74b4f6
Revert "updated workflow to trigger ci"
vga91 Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/setup-jdk/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<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.26.5</neo4j.version>
<java.version>17</java.version>
<neo4j.version>2025.06.0</neo4j.version>
<java.version>21</java.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>
Expand All @@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>neo4j-spatial</artifactId>
<groupId>org.neo4j</groupId>
<version>5.26.1-SNAPSHOT</version>
<version>2025.06-SNAPSHOT</version>
<name>Neo4j - Spatial Components</name>
<description>Spatial utilities and components for Neo4j</description>
<url>https://neo4j.com/labs/neo4j-spatial/5/</url>
Expand Down
26 changes: 23 additions & 3 deletions server-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,27 @@
<parent>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-spatial</artifactId>
<version>5.26.1-SNAPSHOT</version>
<version>2025.06-SNAPSHOT</version>
</parent>

<artifactId>neo4j-spatial-server-plugin</artifactId>

<properties>
<maven.compiler.release>21</maven.compiler.release>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -91,7 +107,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.1</version>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -108,10 +124,14 @@
</dependency>

<!-- The JUnit-Hamcrest-Mockito combo -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,7 +46,7 @@ public static SecurityContext withIndexCreate(SecurityContext securityContext) {
}

private IndexAccessMode(SecurityContext securityContext) {
super(securityContext.mode(), Static.SCHEMA);
super(securityContext.mode(), SCHEMA);
}

@Override
Expand Down
1 change: 1 addition & 0 deletions server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ private void partition(Transaction tx, Node indexNode, List<NodeWithEnvelope> no

//recurse on each partition
for (List<NodeWithEnvelope> partition : partitions) {
System.out.println("partition = " + partition);
Node newIndexNode = tx.createNode();
if (partition.size() > 1) {
partition(tx, newIndexNode, partition, depth + 1, loadingFactor);
Expand Down