From 22c1d23fd781fe39df14de72cf0040bebee0a37e Mon Sep 17 00:00:00 2001 From: Gerrit Meier Date: Wed, 22 Feb 2023 09:40:26 +0100 Subject: [PATCH] GH-2681 - Upgrade Neo4j container to 5. --- .../spring_boot/ReactiveTemplateExampleTest.java | 2 +- .../multiple_ctx_imperative/MultipleContextsIT.java | 12 ++++++------ .../data/neo4j/test/Neo4jExtension.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleTest.java b/src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleTest.java index 0a161a00a..9fb7a89ee 100644 --- a/src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleTest.java +++ b/src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleTest.java @@ -48,7 +48,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; // tag::faq.template-reactive-pt2[] class ReactiveTemplateExampleTest { - @Container private static Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:4.4"); + @Container private static Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:5"); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/src/test/java/org/springframework/data/neo4j/integration/multiple_ctx_imperative/MultipleContextsIT.java b/src/test/java/org/springframework/data/neo4j/integration/multiple_ctx_imperative/MultipleContextsIT.java index d74ca5ce9..0497e8909 100644 --- a/src/test/java/org/springframework/data/neo4j/integration/multiple_ctx_imperative/MultipleContextsIT.java +++ b/src/test/java/org/springframework/data/neo4j/integration/multiple_ctx_imperative/MultipleContextsIT.java @@ -53,21 +53,21 @@ import org.testcontainers.junit.jupiter.Testcontainers; public class MultipleContextsIT { @Container - private static Neo4jContainer container1 = new Neo4jContainer<>("neo4j:4.4") - .withAdminPassword("secret1"); + private static Neo4jContainer container1 = new Neo4jContainer<>("neo4j:5") + .withAdminPassword("verysecret1"); @Container - private static Neo4jContainer container2 = new Neo4jContainer<>("neo4j:4.4") - .withAdminPassword("secret2"); + private static Neo4jContainer container2 = new Neo4jContainer<>("neo4j:5") + .withAdminPassword("verysecret2"); @DynamicPropertySource static void neo4jSettings(DynamicPropertyRegistry registry) { registry.add("database1.url", container1::getBoltUrl); - registry.add("database1.password", () -> "secret1"); + registry.add("database1.password", () -> "verysecret1"); registry.add("database2.url", container2::getBoltUrl); - registry.add("database2.password", () -> "secret2"); + registry.add("database2.password", () -> "verysecret2"); } @Test // DATAGRAPH-1441 diff --git a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java index 8463cd5d4..05756eda7 100644 --- a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java +++ b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java @@ -293,7 +293,7 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback { private final String repository = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_REPOSITORY)).orElse("neo4j"); - private final String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION)).orElse("4.4"); + private final String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION)).orElse("5"); private final boolean containerReuseSupported = TestcontainersConfiguration .getInstance().environmentSupportsReuse();