From cedf29e188b2f2a76576b342e2d57e1b830cc34f Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Wed, 28 Jun 2023 12:08:29 +0100
Subject: [PATCH 1/4] Update dependecies

---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index e547d1fbfa..a516aa6295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,26 +34,26 @@
     <!-- Please note that when updating this dependency -->
     <!-- (i.e. due to a security vulnerability or bug) that the -->
     <!-- corresponding server dependency also needs updating.-->
-    <netty-bom.version>4.1.86.Final</netty-bom.version>
+    <netty-bom.version>4.1.94.Final</netty-bom.version>
     <!-- Please note that when updating this dependency -->
     <!-- (i.e. due to a security vulnerability or bug) that the -->
     <!-- corresponding server dependency also needs updating.-->
-    <reactor-bom.version>2020.0.25</reactor-bom.version>
+    <reactor-bom.version>2020.0.33</reactor-bom.version>
     <rxjava.version>2.2.21</rxjava.version>
     <slf4j-api.version>1.7.36</slf4j-api.version>
     <hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
-    <mockito-core.version>4.9.0</mockito-core.version>
-    <junit.version>5.9.1</junit.version>
+    <mockito-core.version>4.11.0</mockito-core.version>
+    <junit.version>5.9.3</junit.version>
     <testng-engine.version>1.0.4</testng-engine.version>
     <jarchivelib.version>1.2.0</jarchivelib.version>
     <bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
-    <logback-classic.version>1.2.11</logback-classic.version>
-    <jackson.version>2.14.1</jackson.version>
-    <lombok.version>1.18.24</lombok.version>
-    <svm.version>21.3.4</svm.version>
-    <micrometer.version>1.10.2</micrometer.version>
-    <testcontainers.version>1.17.6</testcontainers.version>
-    <build-resources.version>4.4.15</build-resources.version>
+    <logback-classic.version>1.4.8</logback-classic.version>
+    <jackson.version>2.15.2</jackson.version>
+    <lombok.version>1.18.28</lombok.version>
+    <svm.version>21.3.6</svm.version>
+    <micrometer.version>1.11.1</micrometer.version>
+    <testcontainers.version>1.18.3</testcontainers.version>
+    <build-resources.version>4.4.22</build-resources.version>
     <!-- To be overwritten by child projects -->
     <moduleName/>
   </properties>

From cdac60e456b1102270deb84d16063c3bb886590d Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <11927660+injectives@users.noreply.github.com>
Date: Thu, 25 May 2023 13:48:13 +0100
Subject: [PATCH 2/4] Update invalid bookmark tests (#1426)

---
 .../neo4j/driver/integration/async/AsyncTransactionIT.java | 3 ++-
 .../neo4j/driver/integration/reactive/RxTransactionIT.java | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
index f1ef9d0850..8156412600 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
@@ -278,7 +278,8 @@ void shouldFailBoBeginTxWithInvalidBookmark() {
                 .asyncSession(builder().withBookmarks(parse("InvalidBookmark")).build());
 
         ClientException e = assertThrows(ClientException.class, () -> await(session.beginTransactionAsync()));
-        assertThat(e.getMessage(), containsString("InvalidBookmark"));
+        assertTrue(e.getMessage().contains("InvalidBookmark")
+                || e.getMessage().contains("Parsing of supplied bookmarks failed"));
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
index b77d9f7ddb..0f8fadcaa9 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
@@ -269,11 +269,12 @@ void shouldNotAllowNewQueriesAfterAnIncorrectQuery() {
 
     @Test
     void shouldFailBoBeginTxWithInvalidBookmark() {
-        RxSession session = neo4j.driver()
+        var session = neo4j.driver()
                 .rxSession(builder().withBookmarks(parse("InvalidBookmark")).build());
 
-        ClientException e = assertThrows(ClientException.class, () -> await(session.beginTransaction()));
-        assertThat(e.getMessage(), containsString("InvalidBookmark"));
+        var e = assertThrows(ClientException.class, () -> await(session.beginTransaction()));
+        assertTrue(e.getMessage().contains("InvalidBookmark")
+                || e.getMessage().contains("Parsing of supplied bookmarks failed"));
     }
 
     @Test

From 3a24c05d921b859091ab25f2379c594230987db2 Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Wed, 28 Jun 2023 13:03:08 +0100
Subject: [PATCH 3/4] Update variable declarations

---
 .../neo4j/driver/integration/reactive/RxTransactionIT.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
index 0f8fadcaa9..5f09accbbf 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java
@@ -269,10 +269,10 @@ void shouldNotAllowNewQueriesAfterAnIncorrectQuery() {
 
     @Test
     void shouldFailBoBeginTxWithInvalidBookmark() {
-        var session = neo4j.driver()
+        RxSession session = neo4j.driver()
                 .rxSession(builder().withBookmarks(parse("InvalidBookmark")).build());
 
-        var e = assertThrows(ClientException.class, () -> await(session.beginTransaction()));
+        ClientException e = assertThrows(ClientException.class, () -> await(session.beginTransaction()));
         assertTrue(e.getMessage().contains("InvalidBookmark")
                 || e.getMessage().contains("Parsing of supplied bookmarks failed"));
     }

From 666c9b7746e9960a75a83d9b0cebc3179d40a84c Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Wed, 28 Jun 2023 14:53:36 +0100
Subject: [PATCH 4/4] Update Logback to 1.2.12

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a516aa6295..3fad2ece76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <testng-engine.version>1.0.4</testng-engine.version>
     <jarchivelib.version>1.2.0</jarchivelib.version>
     <bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
-    <logback-classic.version>1.4.8</logback-classic.version>
+    <logback-classic.version>1.2.12</logback-classic.version>
     <jackson.version>2.15.2</jackson.version>
     <lombok.version>1.18.28</lombok.version>
     <svm.version>21.3.6</svm.version>