From dbe7f70f6566cc6f5716aece29bdadddf9b5039f Mon Sep 17 00:00:00 2001
From: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
Date: Tue, 19 Sep 2023 15:32:32 +0300
Subject: [PATCH] Upgrade Neo4j to v.5

Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
---
 dependencies/pom.xml                                          | 4 ++--
 examples/integrations/neo4j/neo4j-mp/pom.xml                  | 2 +-
 examples/integrations/neo4j/neo4j-se/pom.xml                  | 2 +-
 .../test/java/io/helidon/examples/quickstart/se/MainTest.java | 2 +-
 integrations/neo4j/health/pom.xml                             | 2 +-
 .../helidon/integrations/neo4j/health/Neo4jHealthCheck.java   | 4 ++--
 integrations/neo4j/metrics/pom.xml                            | 2 +-
 integrations/neo4j/neo4j/pom.xml                              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 3cab7d66a75..3690670f0d8 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -129,7 +129,7 @@
         <version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
         <version.lib.mysql-connector-java>8.0.28</version.lib.mysql-connector-java>
         <version.lib.narayana>5.12.0.Final</version.lib.narayana>
-        <version.lib.neo4j>4.4.11</version.lib.neo4j>
+        <version.lib.neo4j>5.12.0</version.lib.neo4j>
         <version.lib.netty>4.1.94.Final</version.lib.netty>
         <version.lib.netty-io_uring>0.0.19.Final</version.lib.netty-io_uring>
         <version.lib.oci>3.21.0</version.lib.oci>
@@ -1040,7 +1040,7 @@
             <!-- Neo4j -->
             <dependency>
                 <groupId>org.neo4j.driver</groupId>
-                <artifactId>neo4j-java-driver-slim</artifactId>
+                <artifactId>neo4j-java-driver</artifactId>
                 <version>${version.lib.neo4j}</version>
             </dependency>
             <!-- Cron utils -->
diff --git a/examples/integrations/neo4j/neo4j-mp/pom.xml b/examples/integrations/neo4j/neo4j-mp/pom.xml
index 2d392f5abfb..00aa5575919 100644
--- a/examples/integrations/neo4j/neo4j-mp/pom.xml
+++ b/examples/integrations/neo4j/neo4j-mp/pom.xml
@@ -32,7 +32,7 @@
     <name>Helidon Neo4j MP integration Example</name>
 
     <properties>
-        <neo4j-harness.version>4.4.3</neo4j-harness.version>
+        <neo4j-harness.version>5.12.0</neo4j-harness.version>
     </properties>
 
     <dependencies>
diff --git a/examples/integrations/neo4j/neo4j-se/pom.xml b/examples/integrations/neo4j/neo4j-se/pom.xml
index fe6dd1a8a09..ed0340edad4 100644
--- a/examples/integrations/neo4j/neo4j-se/pom.xml
+++ b/examples/integrations/neo4j/neo4j-se/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <mainClass>io.helidon.examples.integrations.neo4j.se.Main</mainClass>
-        <neo4j-harness.version>4.4.3</neo4j-harness.version>
+        <neo4j-harness.version>5.12.0</neo4j-harness.version>
     </properties>
 
     <dependencies>
diff --git a/examples/integrations/neo4j/neo4j-se/src/test/java/io/helidon/examples/quickstart/se/MainTest.java b/examples/integrations/neo4j/neo4j-se/src/test/java/io/helidon/examples/quickstart/se/MainTest.java
index 0363c93562c..0b778663818 100644
--- a/examples/integrations/neo4j/neo4j-se/src/test/java/io/helidon/examples/quickstart/se/MainTest.java
+++ b/examples/integrations/neo4j/neo4j-se/src/test/java/io/helidon/examples/quickstart/se/MainTest.java
@@ -82,7 +82,7 @@ void testMovies() {
                 .request(JsonArray.class)
                 .await();
 
-        assertThat(result.getJsonObject(0).getString("title"), is("The Matrix Reloaded"));
+        assertThat(result.getJsonObject(0).getString("title"), is("The Matrix"));
     }
 
     @Test
diff --git a/integrations/neo4j/health/pom.xml b/integrations/neo4j/health/pom.xml
index fca20b8beab..c10c5f2b459 100644
--- a/integrations/neo4j/health/pom.xml
+++ b/integrations/neo4j/health/pom.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-java-driver-slim</artifactId>
+            <artifactId>neo4j-java-driver</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integrations/neo4j/health/src/main/java/io/helidon/integrations/neo4j/health/Neo4jHealthCheck.java b/integrations/neo4j/health/src/main/java/io/helidon/integrations/neo4j/health/Neo4jHealthCheck.java
index 9a671c8d34e..d05be275cb3 100644
--- a/integrations/neo4j/health/src/main/java/io/helidon/integrations/neo4j/health/Neo4jHealthCheck.java
+++ b/integrations/neo4j/health/src/main/java/io/helidon/integrations/neo4j/health/Neo4jHealthCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ private HealthCheckResponse runHealthCheckQuery(HealthCheckResponseBuilder build
                 var serverInfo = resultSummary.server();
 
                 var responseBuilder = builder
-                        .withData("server", serverInfo.version() + "@" + serverInfo.address())
+                        .withData("server", serverInfo.protocolVersion() + "@" + serverInfo.address())
                         .withData("edition", edition);
 
                 var databaseInfo = resultSummary.database();
diff --git a/integrations/neo4j/metrics/pom.xml b/integrations/neo4j/metrics/pom.xml
index bff63018957..15c4d037304 100644
--- a/integrations/neo4j/metrics/pom.xml
+++ b/integrations/neo4j/metrics/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-java-driver-slim</artifactId>
+            <artifactId>neo4j-java-driver</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integrations/neo4j/neo4j/pom.xml b/integrations/neo4j/neo4j/pom.xml
index fd5f81f576c..ec9602a974a 100644
--- a/integrations/neo4j/neo4j/pom.xml
+++ b/integrations/neo4j/neo4j/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-java-driver-slim</artifactId>
+            <artifactId>neo4j-java-driver</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.common</groupId>