diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 9d43e4b095..36bdc369b5 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ "dev" ] + branches: [ "5.21" ] pull_request: - branches: [ "dev" ] + branches: [ "5.21" ] env: DOCKER_ENTERPRISE_URL: ${{ secrets.DOCKER_ENTERPRISE_DEV_URL }} diff --git a/.gitmodules b/.gitmodules index b051f40471..a485ec58b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "apoc-core"] path = apoc-core url = https://github.com/neo4j/apoc - branch = 5.20 + branch = 5.21 diff --git a/apoc-core b/apoc-core index 5d16a544e9..a31c119105 160000 --- a/apoc-core +++ b/apoc-core @@ -1 +1 @@ -Subproject commit 5d16a544e917b8dd0c52cfeedb3fe41cd5b8063c +Subproject commit a31c1191056aaf76747423f6541e9ac4d765c4f6 diff --git a/build.gradle b/build.gradle index 3869214f40..15ec845c2e 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ downloadLicenses { allprojects { group = 'org.neo4j.procedure' - version = '5.20.0' + version = '5.21.0' archivesBaseName = 'apoc' description = """neo4j-apoc-procedures""" } @@ -71,8 +71,8 @@ subprojects { // neo4jDockerImage system property is used in TestContainerUtil systemProperties 'user.language' : 'en' , 'user.country' : 'US', - 'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise-debian' : 'neo4j:5.20.0-enterprise', - 'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.20.0', + 'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise-debian' : 'neo4j:5.21.0-enterprise', + 'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.21.0', 'coreDir': 'apoc-core/core', 'testDockerBundle': false @@ -131,7 +131,7 @@ subprojects { ext { // NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic - neo4jVersion = "5.20.0" + neo4jVersion = "5.21.0" // instead we apply the override logic here neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion testContainersVersion = '1.18.3' diff --git a/docs/antora/publish.yml b/docs/antora/publish.yml index 747ba218db..e4debdd954 100644 --- a/docs/antora/publish.yml +++ b/docs/antora/publish.yml @@ -6,7 +6,7 @@ site: content: sources: - url: https://github.com/neo4j-contrib/neo4j-apoc-procedures - branches: ['5.20', '4.4', '4.3', '4.2', '4.1', '4.0'] + branches: ['5.21', '4.4', '4.3', '4.2', '4.1', '4.0'] start_path: docs/asciidoc exclude: - '!**/_includes/*' diff --git a/docs/asciidoc/antora.yml b/docs/asciidoc/antora.yml index 356ba18c55..4815a60b0e 100644 --- a/docs/asciidoc/antora.yml +++ b/docs/asciidoc/antora.yml @@ -8,4 +8,4 @@ asciidoc: docs-version: "5.0" branch: "5.0" apoc-release-absolute: "5.0" - apoc-release: "5.20.0" + apoc-release: "5.21.0" diff --git a/docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc b/docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc index c536691e53..2ea33ff2a3 100644 --- a/docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc +++ b/docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc @@ -24,7 +24,6 @@ The version compatibility matrix explains the mapping between Neo4j and APOC ver [opts=header] |=== |apoc version | neo4j version -| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.20.0[5.20.0^] | 5.20.0 (5.20.x) | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.19.0[5.19.0^] | 5.19.0 (5.19.x) | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.18.0[5.18.0^] | 5.18.0 (5.18.x) | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.17.1[5.17.1^] | 5.17.0 (5.17.x) @@ -44,7 +43,7 @@ The version compatibility matrix explains the mapping between Neo4j and APOC ver | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.3.1[5.3.1^] | 5.3.0 (5.3.x) | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.2.0[5.2.0^] | 5.2.0 (5.2.x) | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.1.0[5.1.0^] | 5.1.0 (5.1.x) -| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/4.4.0.18[4.4.0.18^] | 4.4.0 (4.4.x) +| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/4.4.0.28[4.4.0.28^] | 4.4.0 (4.4.x) |=== // end::version-matrix[] diff --git a/docs/build.gradle b/docs/build.gradle index 4f29f40d5f..9059dddd5f 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -29,7 +29,7 @@ plugins { id 'org.neo4j.doc.build.docbook' version '1.0-alpha12' } -if (!project.hasProperty('apocVersion')) { ext.apocVersion = '5.20.0' } +if (!project.hasProperty('apocVersion')) { ext.apocVersion = '5.21.0' } ext { versionParts = apocVersion.split('-') diff --git a/extended/build.gradle b/extended/build.gradle index 87504eb534..bba08c5818 100644 --- a/extended/build.gradle +++ b/extended/build.gradle @@ -90,7 +90,7 @@ dependencies { // They need to be provided either through the database or in an extra .jar compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective // same version as the one included in neo4j `lib` - compileOnly group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.20.0' + compileOnly group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.5.21.0' compileOnly group: 'org.apache.poi', name: 'poi', version: '5.1.0' compileOnly group: 'org.apache.poi', name: 'poi-ooxml', version: '5.1.0' diff --git a/extra-dependencies/build.gradle b/extra-dependencies/build.gradle index d5ed1adf87..14376f08ae 100644 --- a/extra-dependencies/build.gradle +++ b/extra-dependencies/build.gradle @@ -72,7 +72,7 @@ ext { subprojects { - version = '5.20.0' + version = '5.21.0' group = 'org.neo4j.contrib' } diff --git a/readme.adoc b/readme.adoc index 0d864c4c08..c70f4be367 100644 --- a/readme.adoc +++ b/readme.adoc @@ -1,8 +1,8 @@ :readme: -:branch: 5.20 +:branch: 5.21 :docs: https://neo4j.com/labs/apoc/5 -:apoc-release: 5.20.0 -:neo4j-version: 5.20.0 +:apoc-release: 5.21.0 +:neo4j-version: 5.21.0 :img: https://raw.githubusercontent.com/neo4j-contrib/neo4j-apoc-procedures/{branch}/docs/images https://community.neo4j.com[image:https://img.shields.io/discourse/users?logo=discourse&server=https%3A%2F%2Fcommunity.neo4j.com[Discourse users]]