GitHub action fixes timeout error

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

@@ -12,12 +12,12 @@ 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 --info -Pneo4jVersionOverride=$NEO4JVERSION -Pneo4jDockerEeOverride=$NEO4J_ENTERPRISE_IMAGE -Pneo4jDockerCeOverride=$NEO4J_COMMUNITY_IMAGE :${{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 --info -Pneo4jVersionOverride=$NEO4JVERSION -Pneo4jDockerEeOverride=$NEO4J_ENTERPRISE_IMAGE -Pneo4jDockerCeOverride=$NEO4J_COMMUNITY_IMAGE :${{inputs.project-name}}:check --parallel
     - name: Archive test results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       if: always()
       with:
         name: ${{inputs.project-name}}-test-results

.github/workflows/CI.yaml

@@ -7,8 +7,10 @@ on:
     branches: [ "dev" ]
 
 env:
-  CODEARTIFACT_DOWNLOAD_URL: ${{ secrets.CODEARTIFACT_DOWNLOAD_URL }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  CODEARTIFACT_URL: ${{ secrets.CODEARTIFACT_URL }}
   CODEARTIFACT_USERNAME: ${{ secrets.CODEARTIFACT_USERNAME }}
+  ECR_NEO4J_DOCKER_URL: ${{ secrets.ECR_NEO4J_DOCKER_URL }}
 
 
 jobs:
@@ -40,26 +42,34 @@ jobs:
       - uses: ./.github/actions/setup-jdk
       - uses: ./.github/actions/setup-gradle-cache
 
-      - name: Determine latest neo4j CI version
+      - name: Determine Remote Maven Repository, Neo4j Version and Neo4j Docker Images
         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 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" | tr -d '" '`
-          echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV"
-          echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI"
+          echo "Analyzing current branch BRANCH_NAME=$BRANCH_NAME"
+          if [[ $BRANCH_NAME =~ ^5.[0-9]+$ ]]; then
+            NEO4JVERSION="$neo4j_version_base"
+          else
+            NEO4JVERSION="$neo4j_version_base-SNAPSHOT"
+            CODEARTIFACT_DOWNLOAD_URL="$CODEARTIFACT_URL/ci-live"
+            echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL"
+            echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL" >> "$GITHUB_ENV"
+          fi
+          echo "NEO4JVERSION=$NEO4JVERSION"
+          echo "NEO4JVERSION=$NEO4JVERSION" >> "$GITHUB_ENV"
 
       - name: Compile Java
         run: |
           chmod +x gradlew
-          ./gradlew --no-daemon --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI --init-script init.gradle clean
+          ./gradlew --no-daemon --info -Pneo4jVersionOverride=$NEO4JVERSION --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
+        run: ./gradlew --info -Pneo4jVersionOverride=$NEO4JVERSION compileJava compileTestJava
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
@@ -99,18 +109,44 @@ jobs:
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
-      - name: Determine latest neo4j CI version
+      - name: Determine Remote Maven Repository, Neo4j Version and Neo4j Docker Images
         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 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" | tr -d '" '`
-          echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV"
-          echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI"
+          echo "Analyzing current branch BRANCH_NAME=$BRANCH_NAME"
+          if [[ $BRANCH_NAME =~ ^5.[0-9]+$ ]]; then
+            NEO4JVERSION="$neo4j_version_base"
+            NEO4J_ENTERPRISE_IMAGE="neo4j:$NEO4JVERSION-enterprise"
+            NEO4J_COMMUNITY_IMAGE="neo4j:$NEO4JVERSION-community"
+            echo "DOCKER_REMOTE=Dockerhub" >> "$GITHUB_ENV"
+          else
+            NEO4JVERSION="$neo4j_version_base-SNAPSHOT"
+            NEO4J_ENTERPRISE_IMAGE="${{ secrets.ECR_NEO4J_DOCKER_URL }}/build-service/neo4j:$neo4j_version_base-enterprise-debian-nightly"
+            NEO4J_COMMUNITY_IMAGE="${{ secrets.ECR_NEO4J_DOCKER_URL }}/build-service/neo4j:$neo4j_version_base-community-debian-nightly"
+            echo "DOCKER_REMOTE=ECR" >> "$GITHUB_ENV"
+            CODEARTIFACT_DOWNLOAD_URL="$CODEARTIFACT_URL/ci-live"
+            echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL"
+            echo "CODEARTIFACT_DOWNLOAD_URL=$CODEARTIFACT_DOWNLOAD_URL" >> "$GITHUB_ENV"
+          fi
+          echo "NEO4JVERSION=$NEO4JVERSION"
+          echo "NEO4JVERSION=$NEO4JVERSION" >> "$GITHUB_ENV"
+          echo "NEO4J_ENTERPRISE_IMAGE=$NEO4J_ENTERPRISE_IMAGE"
+          echo "NEO4J_ENTERPRISE_IMAGE=$NEO4J_ENTERPRISE_IMAGE" >> "$GITHUB_ENV"
+          echo "NEO4J_COMMUNITY_IMAGE=$NEO4J_COMMUNITY_IMAGE"
+          echo "NEO4J_COMMUNITY_IMAGE=$NEO4J_COMMUNITY_IMAGE" >> "$GITHUB_ENV"
+
+      - name: Login to ECR
+        if: env.DOCKER_REMOTE == 'ECR'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.ECR_NEO4J_DOCKER_URL }}
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Init gradle
         run: |
           chmod +x gradlew
-          ./gradlew --info -Pneo4jVersionOverride=$NEO4J_VERSION_CI --init-script init.gradle
+          ./gradlew --info -Pneo4jVersionOverride=$NEO4JVERSION --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 = dev

build.gradle

@@ -14,7 +14,7 @@ downloadLicenses {
 
 allprojects {
     group = 'org.neo4j.procedure'
-    version = '5.23.0'
+    version = '5.25.0'
     archivesBaseName = 'apoc'
     description = """neo4j-apoc-procedures"""
 }
@@ -86,13 +86,13 @@ subprojects {
         archiveClassifier = 'javadoc'
     }
     test {
-        //exclude '**/CypherProceduresClusterTest.class'//, '**/AtomicTest.class'
+        include '**/MissingExtraDependenciesTest.class'//, '**/AtomicTest.class'
 
         // 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.23.0-enterprise',
-                'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-debian' : 'neo4j:5.23.0',
+                'neo4jDockerImage': project.hasProperty("neo4jDockerEeOverride") ? project.getProperty("neo4jDockerEeOverride") : 'neo4j:5.25.0-enterprise-debian',
+                'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerCeOverride") ? project.getProperty("neo4jDockerCeOverride") : 'neo4j:5.25.0-debian',
                 'coreDir': 'apoc-core/core',
                 'testDockerBundle': false
 
@@ -151,9 +151,9 @@ 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.23.0"
+    neo4jVersion = "5.25.0"
     // instead we apply the override logic here
     neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
-    testContainersVersion = '1.18.3'
+    testContainersVersion = '1.19.1'
     apacheArrowVersion = '15.0.0'
 }

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.24.0"

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

@@ -24,6 +24,8 @@ 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.24.0[5.24.0^] | 5.24.0 (5.24.x)
+| 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)

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.25.0' }
 
 ext {
     versionParts = apocVersion.split('-')

extended-it/src/test/java/apoc/MissingExtraDependenciesTest.java

@@ -20,7 +20,7 @@
 import static apoc.load.LoadHtml.SELENIUM_MISSING_DEPS_ERROR;
 import static apoc.mongodb.MongoDBUtils.MONGO_MISSING_DEPS_ERROR;
 import static apoc.redis.RedisConfig.REDIS_MISSING_DEPS_ERROR;
-import static apoc.util.TestContainerUtil.createEnterpriseDB;
+import static apoc.util.TestContainerUtil.createCommunityDB;
 import static apoc.util.TestContainerUtil.testCall;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -35,7 +35,7 @@ public class MissingExtraDependenciesTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.EXTENDED), true);
+        neo4jContainer = createCommunityDB(List.of(TestContainerUtil.ApocPackage.EXTENDED), true);
         neo4jContainer.start();
 
         session = neo4jContainer.getSession();

extended-it/src/test/java/apoc/neo4j/docker/BoltTest.java

@@ -25,7 +25,9 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.test.rule.DbmsRule;
 import org.neo4j.test.rule.ImpermanentDbmsRule;
+import org.testcontainers.containers.wait.strategy.Wait;
 
+import java.time.Duration;
 import java.time.LocalTime;
 import java.time.OffsetTime;
 import java.util.Arrays;
@@ -60,7 +62,10 @@ public class BoltTest {
     @BeforeClass
     public static void setUp() throws Exception {
         neo4jContainer = createEnterpriseDB(List.of(ApocPackage.EXTENDED, ApocPackage.CORE), true).withInitScript("init_neo4j_bolt.cypher");
+        neo4jContainer.setWaitStrategy(Wait.defaultWaitStrategy()
+.withStartupTimeout(Duration.ofMinutes(10)));neo4jContainer.withStartupTimeout(Duration.ofMinutes(10));
         neo4jContainer.start();
+
         TestUtil.registerProcedure(db, Bolt.class, ExportCypher.class, Cypher.class, PathExplorer.class, GraphRefactoring.class);
         BOLT_URL = getBoltUrl().replaceAll("'", "");
         session = neo4jContainer.getSession();

extended-it/src/test/java/apoc/neo4j/docker/CoreExtendedTest.java

@@ -8,7 +8,9 @@
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
+import org.testcontainers.containers.wait.strategy.Wait;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +34,9 @@ public void checkForCoreAndExtended() {
         try(Neo4jContainerExtension neo4jContainer = createEnterpriseDB(List.of(ApocPackage.CORE, ApocPackage.EXTENDED), true)
                 .withNeo4jConfig("dbms.transaction.timeout", "60s")
                 .withEnv(APOC_IMPORT_FILE_ENABLED, "true")) {
+            neo4jContainer.setWaitStrategy(Wait.defaultWaitStrategy()
+.withStartupTimeout(Duration.ofMinutes(10)));
+            neo4jContainer.withStartupTimeout(Duration.ofMinutes(10));
             neo4jContainer.start();
 
             Session session = neo4jContainer.getSession();
@@ -54,7 +59,9 @@ public void matchesSpreadsheet() {
         try(Neo4jContainerExtension neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE, TestContainerUtil.ApocPackage.EXTENDED), true)
                 .withNeo4jConfig("dbms.transaction.timeout", "60s")
                 .withEnv(APOC_IMPORT_FILE_ENABLED, "true")) {
-
+            neo4jContainer.setWaitStrategy(Wait.defaultWaitStrategy()
+.withStartupTimeout(Duration.ofMinutes(10)));
+            neo4jContainer.withStartupTimeout(Duration.ofMinutes(10));
             neo4jContainer.start();
 
             Session session = neo4jContainer.getSession();

extended-it/src/test/java/apoc/neo4j/docker/CypherEnterpriseExtendedTest.java

@@ -13,9 +13,11 @@
 import org.neo4j.driver.Session;
 import org.neo4j.driver.types.Node;
 import org.neo4j.driver.types.Relationship;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -63,12 +65,17 @@ public class CypherEnterpriseExtendedTest {
 
     private static Neo4jContainerExtension neo4jContainer;
     private static Session session;
+
+
 
     @BeforeClass
     public static void beforeAll() {
         // We build the project, the artifact will be placed into ./build/libs
         neo4jContainer = createEnterpriseDB(List.of(ApocPackage.EXTENDED), true)
                 .withNeo4jConfig("dbms.transaction.timeout", "60s");
+        neo4jContainer.setWaitStrategy(Wait.defaultWaitStrategy()
+                .withStartupTimeout(Duration.ofMinutes(10)));
+        neo4jContainer.withStartupTimeout(Duration.ofMinutes(10));
         neo4jContainer.start();
         session = neo4jContainer.getSession();