diff --git a/build.gradle b/build.gradle index d20d832ad4..f4880bc9f9 100644 --- a/build.gradle +++ b/build.gradle @@ -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' : 'neo4j:4.3.3-enterprise', - 'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") : 'neo4j:4.3.3' + 'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise' : 'neo4j:4.3-enterprise', + 'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") : 'neo4j:4.3' maxHeapSize = "8G" forkEvery = 50 @@ -121,7 +121,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 = "4.3.8" + neo4jVersion = "4.3.12" // instead we apply the override logic here neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion testContainersVersion = '1.15.1' diff --git a/test-utils/src/main/java/apoc/util/TestContainerUtil.java b/test-utils/src/main/java/apoc/util/TestContainerUtil.java index ccf45d19c4..7627529f29 100644 --- a/test-utils/src/main/java/apoc/util/TestContainerUtil.java +++ b/test-utils/src/main/java/apoc/util/TestContainerUtil.java @@ -48,7 +48,7 @@ public static Neo4jContainerExtension createEnterpriseDB(File baseDir, boolean w importFolder.mkdirs(); // read neo4j version from build.gradle and use this as default - String neo4jDockerImageVersion = System.getProperty("neo4jDockerImage", "neo4j:4.3.3-enterprise"); + String neo4jDockerImageVersion = System.getProperty("neo4jDockerImage", "neo4j:4.3-enterprise"); // use a separate folder for mounting plugins jar - build/libs might contain other jars as well. File pluginsFolder = new File(baseDir, "build/plugins"); @@ -81,7 +81,7 @@ public static Neo4jContainerExtension createEnterpriseDB(File baseDir, boolean w .withFileSystemBind(canonicalPath, "/var/lib/neo4j/import") // map the "target/import" dir as the Neo4j's import dir .withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes") // .withDebugger() // uncomment this line for remote debbuging inside docker's neo4j instance - .withCreateContainerCmdModifier(cmd -> cmd.withMemory(1024 * 1024 * 1024l)) + .withCreateContainerCmdModifier(cmd -> cmd.withMemory(2024 * 1024 * 1024l)) // set uid if possible - export tests do write to "/import" .withCreateContainerCmdModifier(cmd -> {