Skip to content

Commit

Permalink
Release 5.19.0 (#4013) (#4051)
Browse files Browse the repository at this point in the history
* Release 5.19.0 (#4013)

* Release 5.19.0
* Updated java driver, antora and other references to 5.19

* removed docker dev container download from yaml
  • Loading branch information
vga91 committed Apr 17, 2024
1 parent 70dc75b commit 13b76a5
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 27 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [ "dev" ]
branches: [ "5.19" ]
pull_request:
branches: [ "dev" ]
branches: [ "5.19" ]

env:
DOCKER_ENTERPRISE_URL: ${{ secrets.DOCKER_ENTERPRISE_DEV_URL }}
Expand Down Expand Up @@ -76,15 +76,6 @@ jobs:
chmod +x gradlew
./gradlew --init-script init.gradle
- name: Download neo4j dev docker container
if: matrix.project == 'extended-it'
run: |
curl -s -L0 -u "${TEAMCITY_USER}:${TEAMCITY_PASSWORD}" -X GET ${DOCKER_ENTERPRISE_URL} -o ${ENTERPRISE_TAR} &
curl -s -L0 -u "${TEAMCITY_USER}:${TEAMCITY_PASSWORD}" -X GET ${DOCKER_COMMUNITY_URL} -o ${COMMUNITY_TAR} &
wait
docker load --input ${ENTERPRISE_TAR}
docker load --input ${COMMUNITY_TAR}
- name: Run ${{ matrix.project }} tests
uses: ./.github/actions/test-gradle-project
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "apoc-core"]
path = apoc-core
url = https://github.com/neo4j/apoc
branch = dev
branch = 5.19
2 changes: 1 addition & 1 deletion apoc-core
Submodule apoc-core updated 498 files
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ downloadLicenses {

allprojects {
group = 'org.neo4j.procedure'
version = '5.20.0'
version = '5.19.0'
archivesBaseName = 'apoc'
description = """neo4j-apoc-procedures"""
}
Expand Down Expand Up @@ -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-debian',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.20.0-debian',
'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise-debian' : 'neo4j:5.19.0-enterprise',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.19.0',
'coreDir': 'apoc-core/core',
'testDockerBundle': false

Expand Down Expand Up @@ -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.19.0"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
testContainersVersion = '1.18.3'
Expand Down
2 changes: 1 addition & 1 deletion docs/antora/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ site:
content:
sources:
- url: https://github.com/neo4j-contrib/neo4j-apoc-procedures
branches: ['5.11', '4.4', '4.3', '4.2', '4.1', '4.0']
branches: ['5.19', '4.4', '4.3', '4.2', '4.1', '4.0']
start_path: docs/asciidoc
exclude:
- '!**/_includes/*'
Expand Down
2 changes: 1 addition & 1 deletion docs/asciidoc/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0"
3 changes: 1 addition & 2 deletions docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.26[4.4.0.26^] | 4.4.0 (4.4.x)
|===

// end::version-matrix[]
Expand Down
2 changes: 1 addition & 1 deletion docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0' }

ext {
versionParts = apocVersion.split('-')
Expand Down
2 changes: 1 addition & 1 deletion extended/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,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.16.0'
compileOnly group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.18.0'

compileOnly group: 'org.apache.poi', name: 'poi', version: '5.1.0'
compileOnly group: 'org.apache.poi', name: 'poi-ooxml', version: '5.1.0'
Expand Down
2 changes: 1 addition & 1 deletion extra-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ext {


subprojects {
version = '5.20.0'
version = '5.19.0'
group = 'org.neo4j.contrib'
}

Expand Down
6 changes: 3 additions & 3 deletions readme.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
:readme:
:branch: 5.4
:branch: 5.19
:docs: https://neo4j.com/labs/apoc/5
:apoc-release: 5.20.0
:neo4j-version: 5.20.0
:apoc-release: 5.19.0
:neo4j-version: 5.19.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]]
Expand Down

0 comments on commit 13b76a5

Please sign in to comment.