Skip to content

Commit aae7ad8

Browse files
committed
Bump and fix errors for release 2025.06
1 parent 2cd7ede commit aae7ad8

File tree

5 files changed

+32
-9
lines changed

5 files changed

+32
-9
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: "Setups JDK"
2-
description: "Setups JDK 17"
2+
description: "Setups JDK 21"
33
runs:
44
using: "composite"
55
steps:
66
- name: Setup Java JDK
77
uses: actions/setup-java@v4
88
with:
9-
java-version: 17
9+
java-version: 21
1010
distribution: adopt

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
44
<properties>
5-
<neo4j.version>5.26.5</neo4j.version>
6-
<java.version>17</java.version>
5+
<neo4j.version>2025.06.0</neo4j.version>
6+
<java.version>21</java.version>
77
<geotools.version>32.2</geotools.version>
88
<spatial.test.osm.version>20100819</spatial.test.osm.version>
99
<spatial.test.shp.version>20100819</spatial.test.shp.version>
@@ -16,7 +16,7 @@
1616
<modelVersion>4.0.0</modelVersion>
1717
<artifactId>neo4j-spatial</artifactId>
1818
<groupId>org.neo4j</groupId>
19-
<version>5.26.1-SNAPSHOT</version>
19+
<version>2025.06-SNAPSHOT</version>
2020
<name>Neo4j - Spatial Components</name>
2121
<description>Spatial utilities and components for Neo4j</description>
2222
<url>https://neo4j.com/labs/neo4j-spatial/5/</url>

server-plugin/pom.xml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,27 @@
2626
<parent>
2727
<groupId>org.neo4j</groupId>
2828
<artifactId>neo4j-spatial</artifactId>
29-
<version>5.26.1-SNAPSHOT</version>
29+
<version>2025.06-SNAPSHOT</version>
3030
</parent>
3131

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

34+
<properties>
35+
<maven.compiler.release>21</maven.compiler.release>
36+
</properties>
37+
38+
<dependencyManagement>
39+
<dependencies>
40+
<dependency>
41+
<groupId>org.junit</groupId>
42+
<artifactId>junit-bom</artifactId>
43+
<version>5.10.3</version>
44+
<type>pom</type>
45+
<scope>import</scope>
46+
</dependency>
47+
</dependencies>
48+
</dependencyManagement>
49+
3450
<build>
3551
<plugins>
3652
<plugin>
@@ -96,7 +112,7 @@
96112
<dependency>
97113
<groupId>com.google.code.gson</groupId>
98114
<artifactId>gson</artifactId>
99-
<version>2.13.1</version>
115+
<version>2.11.0</version>
100116
<scope>test</scope>
101117
</dependency>
102118
<dependency>
@@ -113,10 +129,14 @@
113129
</dependency>
114130

115131
<!-- The JUnit-Hamcrest-Mockito combo -->
132+
<dependency>
133+
<groupId>org.junit.jupiter</groupId>
134+
<artifactId>junit-jupiter-api</artifactId>
135+
<scope>test</scope>
136+
</dependency>
116137
<dependency>
117138
<groupId>org.junit.jupiter</groupId>
118139
<artifactId>junit-jupiter-engine</artifactId>
119-
<version>5.11.3</version>
120140
<scope>test</scope>
121141
</dependency>
122142
<dependency>

server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import org.neo4j.kernel.impl.api.security.RestrictedAccessMode;
3333
import org.neo4j.kernel.internal.GraphDatabaseAPI;
3434

35+
import static org.neo4j.internal.kernel.api.security.StaticAccessMode.SCHEMA;
36+
3537
public class IndexManager {
3638

3739
private final GraphDatabaseAPI db;
@@ -44,7 +46,7 @@ public static SecurityContext withIndexCreate(SecurityContext securityContext) {
4446
}
4547

4648
private IndexAccessMode(SecurityContext securityContext) {
47-
super(securityContext.mode(), Static.SCHEMA);
49+
super(securityContext.mode(), SCHEMA);
4850
}
4951

5052
@Override

server-plugin/src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ private void partition(Transaction tx, Node indexNode, List<NodeWithEnvelope> no
584584

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

0 commit comments

Comments
 (0)