Skip to content

Commit

Permalink
Release 5.12.0 (#3778)
Browse files Browse the repository at this point in the history
* [NOID] Release 5.12.0 (#3721)

* [NOID] Changed bolt driver version (#3501) (#3509)

* Removed -debian suffix from docker (#3723)

* Updated latest 4.4 doc version (#3738)
  • Loading branch information
vga91 authored Sep 21, 2023
1 parent c6fccf4 commit 4beebfc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 21 deletions.
12 changes: 2 additions & 10 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.12" ]
pull_request:
branches: [ "dev" ]
branches: [ "5.12" ]

jobs:
build:
Expand All @@ -26,14 +26,6 @@ jobs:
java-version: '17.0.8'
distribution: 'temurin'

- name: Download neo4j dev docker container
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}
- uses: actions/cache@v2
with:
path: |
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.12
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.13.0'
version = '5.12.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.13.0-enterprise-debian',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.13.0-debian',
'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise-debian' : 'neo4j:5.12.0-enterprise',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.12.0',
'coreDir': 'apoc-core/core'

maxHeapSize = "8G"
Expand Down Expand Up @@ -130,7 +130,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.13.0"
neo4jVersion = "5.12.0"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
testContainersVersion = '1.18.3'
Expand Down
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.13.0[5.13.0^] | 5.13.0 (5.13.x)
| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.12.0[5.12.0^] | 5.12.0 (5.12.x)
| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.11.0[5.11.0^] | 5.11.0 (5.11.x)
| https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.10.0[5.10.0^] | 5.10.0 (5.10.x)
Expand All @@ -37,7 +36,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.22[4.4.0.22^] | 4.4.0 (4.4.x)
|===

// end::version-matrix[]
Expand Down
2 changes: 1 addition & 1 deletion extended/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,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.5.0'
compileOnly group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.11.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
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.12
:docs: https://neo4j.com/labs/apoc/5
:apoc-release: 5.13.0
:neo4j-version: 5.13.0
:apoc-release: 5.12.0
:neo4j-version: 5.12.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 4beebfc

Please sign in to comment.