Skip to content

Commit bdabadb

Browse files
authored
Bump 2025.08.0 and fix CI errors (#4452)
* Bump 2025.06.0 * bump 2025.07.0 * bump 2025.08.0 * added MetaRestricted.class to arrow's TestUtil.registerProcedure * added MetaRestricted.class to ImportArrowExtendedTest's registerProcedure * updated extendedCypher25.txt with missing proc * added MetaRestricted to parquet test - used under the hood
1 parent b119da3 commit bdabadb

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ downloadLicenses {
1515

1616
allprojects {
1717
group = 'org.neo4j.procedure'
18-
version = '2025.05.0'
18+
version = '2025.08.0'
1919
archivesBaseName = 'apoc'
2020
description = """neo4j-apoc-procedures"""
2121
}
@@ -92,8 +92,8 @@ subprojects {
9292
// neo4jDockerImage system property is used in TestContainerUtil
9393
systemProperties 'user.language' : 'en' ,
9494
'user.country' : 'US',
95-
'neo4jDockerImage': project.hasProperty("neo4jDockerEeOverride") ? project.getProperty("neo4jDockerEeOverride") : 'neo4j:2025.05.0-enterprise',
96-
'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerCeOverride") ? project.getProperty("neo4jDockerCeOverride") : 'neo4j:2025.05.0',
95+
'neo4jDockerImage': project.hasProperty("neo4jDockerEeOverride") ? project.getProperty("neo4jDockerEeOverride") : 'neo4j:2025.08.0-enterprise',
96+
'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerCeOverride") ? project.getProperty("neo4jDockerCeOverride") : 'neo4j:2025.08.0',
9797
'coreDir': 'apoc-core/core',
9898
'testDockerBundle': false,
9999
'org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracer.CHECK_REPORTED_COUNTERS': 'true' // Extra assertions in kernel
@@ -153,7 +153,7 @@ subprojects {
153153

154154
ext {
155155
// NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
156-
neo4jVersion = "2025.05.0"
156+
neo4jVersion = "2025.08.0"
157157
// instead we apply the override logic here
158158
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
159159
testContainersVersion = '1.20.2'

docs/asciidoc/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ asciidoc:
88
docs-version: "2025.0"
99
branch: "2025.0"
1010
apoc-release-absolute: "2025.0"
11-
apoc-release: "2025.04.0"
11+
apoc-release: "2025.08.0"

extended/src/main/resources/extendedCypher25.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ apoc.cypher.runSchemaFile
4747
apoc.cypher.runSchemaFiles
4848
apoc.data.email
4949
apoc.diff.relationships
50+
apoc.diff.graphs
5051
apoc.dv.catalog.add
5152
apoc.dv.catalog.list
5253
apoc.dv.catalog.remove

extended/src/test/java/apoc/export/arrow/ArrowTestUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import apoc.graph.Graphs;
44
import apoc.meta.Meta;
5+
import apoc.meta.MetaRestricted;
56
import apoc.util.JsonUtil;
67
import apoc.util.TestUtil;
78
import apoc.load.arrow.LoadArrowExtended;
@@ -98,7 +99,7 @@ public class ArrowTestUtil {
9899
public static void initDbCommon(GraphDatabaseService db) {
99100
db.executeTransactionally(
100101
"CREATE (f:User {name:'Adam',age:42,male:true,kids:['Sam','Anna','Grace'], born:localdatetime('2015-05-18T19:32:24.000'), place:point({latitude: 13.1, longitude: 33.46789, height: 100.0})})-[:KNOWS {since: 1993, bffSince: duration('P5M1.5D')}]->(b:User {name:'Jim',age:42})");
101-
TestUtil.registerProcedure(db, ExportArrowExtended.class, LoadArrowExtended.class, ImportArrow.class, Graphs.class, Meta.class);
102+
TestUtil.registerProcedure(db, ExportArrowExtended.class, LoadArrowExtended.class, ImportArrow.class, Graphs.class, Meta.class, MetaRestricted.class);
102103
}
103104

104105
public static final Map<String, Object> MAPPING_ALL = Map.of("mapping",

extended/src/test/java/apoc/export/arrow/ImportArrowExtendedTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package apoc.export.arrow;
22

33
import apoc.meta.Meta;
4+
import apoc.meta.MetaRestricted;
45
import apoc.util.TestUtil;
56
import org.junit.Before;
67
import org.junit.BeforeClass;
@@ -40,7 +41,7 @@ public class ImportArrowExtendedTest {
4041

4142
@BeforeClass
4243
public static void beforeClass() {
43-
TestUtil.registerProcedure(db, ExportArrowExtended.class, ImportArrow.class, Meta.class);
44+
TestUtil.registerProcedure(db, ExportArrowExtended.class, ImportArrow.class, Meta.class, MetaRestricted.class);
4445
}
4546

4647
@Before

extended/src/test/java/apoc/export/parquet/ParquetTestUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import apoc.graph.Graphs;
55
import apoc.load.LoadParquet;
66
import apoc.meta.Meta;
7+
import apoc.meta.MetaRestricted;
78
import apoc.util.TestUtil;
89
import apoc.util.collection.Iterators;
910
import org.neo4j.graphdb.GraphDatabaseService;
@@ -40,7 +41,7 @@
4041
public class ParquetTestUtil {
4142

4243
public static void beforeClassCommon(GraphDatabaseService db) {
43-
TestUtil.registerProcedure(db, ExportParquet.class, ImportParquet.class, LoadParquet.class, Graphs.class, Meta.class);
44+
TestUtil.registerProcedure(db, ExportParquet.class, ImportParquet.class, LoadParquet.class, Graphs.class, Meta.class, MetaRestricted.class);
4445
}
4546

4647
public static void beforeCommon(GraphDatabaseService db) {

extra-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ext {
7777

7878

7979
subprojects {
80-
version = '2025.05.0'
80+
version = '2025.08.0'
8181
group = 'org.neo4j.contrib'
8282
}
8383

0 commit comments

Comments
 (0)