From c696b93ab76b75652fa924ae6526248a29d7fb3a Mon Sep 17 00:00:00 2001
From: Gemma Lamont <gemma.lamont@neotechnology.com>
Date: Mon, 17 Jul 2023 09:45:30 +0200
Subject: [PATCH] [NOID] Use Neo 4.4.24

---
 .github/workflows/CI.yaml  |  6 +++---
 build.gradle               | 12 ++++++------
 teamcity-repository.gradle |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 6a6e057232..3b2aee1d70 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -62,8 +62,8 @@ jobs:
       matrix:
         project: ['core', 'full', 'processor', 'test-utils', 'core-it', 'full-it']
     env:
-      DOCKER_ENTERPRISE_DEV_URL: ${{ secrets.DOCKER_ENTERPRISE_DEV_URL }}
-      DOCKER_COMMUNITY_DEV_URL: ${{ secrets.DOCKER_COMMUNITY_DEV_URL }}
+      DOCKER_ENTERPRISE_FOUR_FOUR_URL: ${{ secrets.DOCKER_ENTERPRISE_FOUR_FOUR_URL }}
+      DOCKER_COMMUNITY_FOUR_FOUR_URL: ${{ secrets.DOCKER_COMMUNITY_FOUR_FOUR_URL }}
       ENTERPRISE_TAR: enterprise-docker.tar
       COMMUNITY_TAR: community-docker.tar
 
@@ -71,7 +71,7 @@ jobs:
     needs: compile
     steps:
       - uses: actions/checkout@v3
-      - name: Download neo4j dev docker container
+      - name: Download neo4j 4.4 docker container
         if: matrix.project == 'it'
         run: |
           curl -s -L0 -u "${TEAMCITY_USER}:${TEAMCITY_PASSWORD}" -X GET ${DOCKER_ENTERPRISE_FOUR_FOUR_URL} -o ${ENTERPRISE_TAR} &
diff --git a/build.gradle b/build.gradle
index 17b7a13a8e..cc441ef398 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'java-library'
     id 'com.github.johnrengelman.shadow' version '4.0.3'  apply false
     id "com.bmuschko.nexus" version "2.3.1"
     id 'maven-publish'
@@ -20,7 +20,7 @@ allprojects {
     description = """neo4j-apoc-procedures"""
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 if (System.env.CI != null)
     apply from: 'teamcity-repository.gradle'
 
@@ -37,7 +37,7 @@ repositories {
 }
 
 subprojects {
-    apply plugin: 'java'
+    apply plugin: 'java-library'
 
     repositories {
 
@@ -72,8 +72,8 @@ subprojects {
         // neo4jDockerImage system property is used in TestContainerUtil
         systemProperties 'user.language' : 'en' ,
                 'user.country ' : 'US',
-                'neo4jDockerImage' : project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-enterprise-debian' : 'neo4j:4.4.22-enterprise',
-                'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-debian': 'neo4j:4.4.22'
+                'neo4jDockerImage' : project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-enterprise-debian' : 'neo4j:4.4.24-enterprise',
+                'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-debian': 'neo4j:4.4.24'
 
         maxHeapSize = "5G"
         forkEvery = 50
@@ -119,7 +119,7 @@ apply from: "licenses-3rdparties.gradle"
 ext {
     publicDir =  "${project.rootDir}"
     // NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
-    neo4jVersion = "4.4.22"
+    neo4jVersion = "4.4.24"
     // instead we apply the override logic here
     neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
     testContainersVersion = '1.17.6'
diff --git a/teamcity-repository.gradle b/teamcity-repository.gradle
index 1ae7189a0d..a284fbc1e8 100644
--- a/teamcity-repository.gradle
+++ b/teamcity-repository.gradle
@@ -2,7 +2,7 @@ allprojects {
     plugins.withType(JavaLibraryPlugin) {
         repositories {
             maven {
-                name = 'teamcity-neo4j-4.4'
+                name = 'teamcity-neo4j-44'
                 url =  System.getenv('TEAMCITY_FOUR_FOUR_URL')
                 credentials {
                     username System.getenv('TEAMCITY_USER')