Release 5.23.0 (#4013) (#4051) (#4173)

* Release 5.23.0 (#4013) (#4051)

* Release 5.23.0 (#4013)

* Release 5.23.0
* Updated java driver, antora and other references to 5.23

* restored teamcity-repository.gradle, build.gradle, ci.yaml and action.yml like the 5.22 ones

.github/actions/test-gradle-project/action.yml

@@ -12,10 +12,10 @@ runs:
     - uses: ./.github/actions/setup-gradle-cache
     - name: Run compile tests 
       shell: bash
-      run: ./gradlew --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI :${{inputs.project-name}}:compileJava :${{inputs.project-name}}:compileTestJava
+      run: ./gradlew :${{inputs.project-name}}:compileJava :${{inputs.project-name}}:compileTestJava
     - name: Run tests
       shell: bash
-      run: ./gradlew --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI :${{inputs.project-name}}:check --parallel
+      run: ./gradlew :${{inputs.project-name}}:check --parallel
     - name: Archive test results
       uses: actions/upload-artifact@v2
       if: always()

.github/workflows/CI.yaml

@@ -2,13 +2,18 @@ name: CI
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ "5.23" ]
   pull_request:
-    branches: [ "dev" ]
+    branches: [ "5.23" ]
 
 env:
-  CODEARTIFACT_DOWNLOAD_URL: ${{ secrets.CODEARTIFACT_DOWNLOAD_URL }}
-  CODEARTIFACT_USERNAME: ${{ secrets.CODEARTIFACT_USERNAME }}
+  DOCKER_ENTERPRISE_URL: ${{ secrets.DOCKER_ENTERPRISE_DEV_URL }}
+  DOCKER_COMMUNITY_URL: ${{ secrets.DOCKER_COMMUNITY_DEV_URL }}
+  TEAMCITY_DEV_URL: ${{ secrets.TEAMCITY_DEV_URL }}
+  TEAMCITY_USER: ${{ secrets.TEAMCITY_USER }}
+  TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
+  ENTERPRISE_TAR: enterprise-docker.tar
+  COMMUNITY_TAR: community-docker.tar
 
 
 jobs:
@@ -23,43 +28,23 @@ jobs:
       matrix:
         language: [ 'java', 'javascript' ]
     steps:
-      - name: Configure AWS CLI
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-      - name: Configure CodeArtifact Authentication Token 
-        run: |
-          CODEARTIFACT_TOKEN=`aws codeartifact get-authorization-token --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --query authorizationToken --output text`
-          echo "::add-mask::$CODEARTIFACT_TOKEN"
-          echo "CODEARTIFACT_TOKEN=$CODEARTIFACT_TOKEN" >> "$GITHUB_ENV"
-
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-jdk
       - uses: ./.github/actions/setup-gradle-cache
-
-      - name: Determine latest neo4j CI version
-        run: |
-          neo4j_version_base=$(grep -e "neo4jVersion = .*" build.gradle | cut -d '=' -f 2 | tr -d \'\" | tr -d ' ')
-          echo "neo4j_version_base=$neo4j_version_base"
-          NEO4J_VERSION_CI=`aws codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --max-items 1 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" --output text | head -n 1`
-          echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV"
-          echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI"
 
       - name: Compile Java
         run: |
           chmod +x gradlew
-          ./gradlew --no-daemon --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI --init-script init.gradle clean
+          ./gradlew --no-daemon --init-script init.gradle clean
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
-      - name: Compile
-        run: ./gradlew --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI compileJava compileTestJava
+      # Autobuild attempts to build any compiled languages 
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
@@ -73,19 +58,6 @@ jobs:
         project: [ 'extended', 'extended-it' ]
     runs-on: ubuntu-latest
     steps:
-      - name: Configure AWS CLI
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-      - name: Configure CodeArtifact Authentication Token 
-        run: |
-          CODEARTIFACT_TOKEN=`aws codeartifact get-authorization-token --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --query authorizationToken --output text`
-          echo "::add-mask::$CODEARTIFACT_TOKEN"
-          echo "CODEARTIFACT_TOKEN=$CODEARTIFACT_TOKEN" >> "$GITHUB_ENV"
-
       - uses: actions/checkout@v2
       - name: Set up JDK 17
         uses: actions/setup-java@v2
@@ -98,19 +70,11 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-
-      - name: Determine latest neo4j CI version
-        run: |
-          neo4j_version_base=$(grep -e "neo4jVersion = .*" build.gradle | cut -d '=' -f 2 | tr -d \'\" | tr -d ' ')
-          echo "neo4j_version_base=$neo4j_version_base"
-          NEO4J_VERSION_CI=`aws codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --max-items 1 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" --output text | head -n 1`
-          echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV"
-          echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI"
 
       - name: Init gradle
         run: |
           chmod +x gradlew
-          ./gradlew --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI --init-script init.gradle
+          ./gradlew --init-script init.gradle
 
       - name: Run ${{ matrix.project }} tests
         uses: ./.github/actions/test-gradle-project

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "apoc-core"]
 	path = apoc-core
 	url = https://github.com/neo4j/apoc
-	branch = 5.22
+	branch = 5.23

build.gradle

@@ -28,17 +28,7 @@ repositories {
     /*maven {  // this contains the neo4j 4.0.0-beta jars
     url "https://neo4j.bintray.com/community/"
 }*/
-    if (System.getenv("CODEARTIFACT_DOWNLOAD_URL") ?: "" != "") {
-        maven {
-            url System.getenv('CODEARTIFACT_DOWNLOAD_URL')
-            credentials {
-                username System.getenv('CODEARTIFACT_USERNAME')
-                password System.getenv('CODEARTIFACT_TOKEN')
-            }
-        }
-    } else {
-        mavenCentral()
-    }
+    mavenCentral()
     maven {
         url "https://repo.gradle.org/gradle/libs-releases"
     }
@@ -53,17 +43,7 @@ subprojects {
         /*maven {  // this contains the neo4j 4.0.0-beta jars
         url "https://neo4j.bintray.com/community/"
     }*/
-        if (System.getenv("CODEARTIFACT_DOWNLOAD_URL") ?: "" != "") {
-            maven {
-                url System.getenv('CODEARTIFACT_DOWNLOAD_URL')
-                credentials {
-                    username System.getenv('CODEARTIFACT_USERNAME')
-                    password System.getenv('CODEARTIFACT_TOKEN')
-                }
-            }
-        } else {
-            mavenCentral()
-        }
+        mavenCentral()
         maven {
             url "https://repo.gradle.org/gradle/libs-releases"
         }

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.23', '4.4', '4.3', '4.2', '4.1', '4.0']
     start_path: docs/asciidoc
     exclude:
     - '!**/_includes/*'

docs/asciidoc/antora.yml

@@ -8,4 +8,4 @@ asciidoc:
     docs-version: "5.0"
     branch: "5.0"
     apoc-release-absolute: "5.0"
-    apoc-release: "5.22.0"
+    apoc-release: "5.23.0"

docs/asciidoc/modules/ROOT/partials/neo4j-server.adoc

@@ -24,6 +24,7 @@ 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.23.0[5.23.0^] | 5.23.0 (5.23.x)
 | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.22.0[5.22.0^] | 5.22.0 (5.22.x)
 | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.21.0[5.21.0^] | 5.21.0 (5.21.x)
 | https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/5.20.0[5.20.0^] | 5.20.0 (5.20.x)
@@ -46,7 +47,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.30[4.4.0.30^] | 4.4.0 (4.4.x)
 |===
 
 // end::version-matrix[]

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.22.0' }
+if (!project.hasProperty('apocVersion')) { ext.apocVersion = '5.23.0' }
 
 ext {
     versionParts = apocVersion.split('-')

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.23.0'
 
     compileOnly group: 'org.apache.poi', name: 'poi', version: '5.1.0'
     compileOnly group: 'org.apache.poi', name: 'poi-ooxml', version: '5.1.0'

extra-dependencies/build.gradle

@@ -72,7 +72,7 @@ ext {
 
 
 subprojects {
-    version = '5.22.0'
+    version = '5.23.0'
     group = 'org.neo4j.contrib'
 }
 

readme.adoc

@@ -1,8 +1,8 @@
 :readme:
-:branch: 5.22
+:branch: 5.23
 :docs: https://neo4j.com/labs/apoc/5
-:apoc-release: 5.22.0
-:neo4j-version: 5.22.0
+:apoc-release: 5.23.0
+:neo4j-version: 5.23.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]]

teamcity-repository.gradle

@@ -2,11 +2,11 @@ allprojects {
     plugins.withType(JavaLibraryPlugin) {
         repositories {
             maven {
-                name = 'aws-codeartifact-repo'
-                url =  System.getenv('CODEARTIFACT_DOWNLOAD_URL')
+                name = 'teamcity-neo4j-dev'
+                url =  System.getenv('TEAMCITY_DEV_URL')
                 credentials {
-                    username System.getenv('CODEARTIFACT_USERNAME')
-                    password System.getenv('CODEARTIFACT_TOKEN')
+                    username System.getenv('TEAMCITY_USER')
+                    password System.getenv('TEAMCITY_PASSWORD')
                 }
                 authentication {
                     basic(BasicAuthentication)