From 2caad03c0087fb8baafb765a95034678aba7919c Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Tue, 28 Jun 2022 10:52:31 +0100
Subject: [PATCH 1/3] Update dependencies

---
 bundle/LICENSES.txt          |  1 +
 bundle/NOTICE.txt            |  1 +
 driver/LICENSES.txt          |  1 +
 driver/NOTICE.txt            |  1 +
 pom.xml                      | 10 +++++-----
 testkit-backend/LICENSES.txt |  1 +
 testkit-backend/NOTICE.txt   |  1 +
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bundle/LICENSES.txt b/bundle/LICENSES.txt
index eb25bd282e..3966a2aff1 100644
--- a/bundle/LICENSES.txt
+++ b/bundle/LICENSES.txt
@@ -10,6 +10,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 ------------------------------------------------------------------------------
 
diff --git a/bundle/NOTICE.txt b/bundle/NOTICE.txt
index 28bc742efd..4524fcc932 100644
--- a/bundle/NOTICE.txt
+++ b/bundle/NOTICE.txt
@@ -25,6 +25,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 
 Creative Commons 0
diff --git a/driver/LICENSES.txt b/driver/LICENSES.txt
index eb25bd282e..3966a2aff1 100644
--- a/driver/LICENSES.txt
+++ b/driver/LICENSES.txt
@@ -10,6 +10,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 ------------------------------------------------------------------------------
 
diff --git a/driver/NOTICE.txt b/driver/NOTICE.txt
index 28bc742efd..4524fcc932 100644
--- a/driver/NOTICE.txt
+++ b/driver/NOTICE.txt
@@ -25,6 +25,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 
 Creative Commons 0
diff --git a/pom.xml b/pom.xml
index ec17f52625..0bdf14a33d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,15 +34,15 @@
     <!-- 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-handler.version>4.1.77.Final</netty-handler.version>
+    <netty-handler.version>4.1.78.Final</netty-handler.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.19</reactor-bom.version>
+    <reactor-bom.version>2020.0.20</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.6.0</mockito-core.version>
+    <mockito-core.version>4.6.1</mockito-core.version>
     <junit.version>5.8.2</junit.version>
     <jarchivelib.version>1.2.0</jarchivelib.version>
     <bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
@@ -50,8 +50,8 @@
     <jackson.version>2.13.3</jackson.version>
     <lombok.version>1.18.24</lombok.version>
     <svm.version>21.3.2.1</svm.version>
-    <micrometer.version>1.9.0</micrometer.version>
-    <build-resources.version>4.4.7</build-resources.version>
+    <micrometer.version>1.9.1</micrometer.version>
+    <build-resources.version>4.4.8</build-resources.version>
     <!-- To be overwritten by child projects -->
     <moduleName/>
   </properties>
diff --git a/testkit-backend/LICENSES.txt b/testkit-backend/LICENSES.txt
index 616e32986c..29bc1d60ff 100644
--- a/testkit-backend/LICENSES.txt
+++ b/testkit-backend/LICENSES.txt
@@ -13,6 +13,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 ------------------------------------------------------------------------------
 
diff --git a/testkit-backend/NOTICE.txt b/testkit-backend/NOTICE.txt
index 449102c532..7c294e5ae3 100644
--- a/testkit-backend/NOTICE.txt
+++ b/testkit-backend/NOTICE.txt
@@ -28,6 +28,7 @@ Apache Software License, Version 2.0
   Netty/Handler
   Netty/Resolver
   Netty/Transport
+  Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
 
 Creative Commons 0

From ea344c02ebe0ee65cbc0b81b4a35ba3300546b51 Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Wed, 29 Jun 2022 16:11:16 +0100
Subject: [PATCH 2/3] Migrate to netty-bom and include netty-tcnative-classes

---
 bundle/LICENSES.txt          | 1 +
 bundle/NOTICE.txt            | 1 +
 driver/LICENSES.txt          | 1 +
 driver/NOTICE.txt            | 1 +
 driver/pom.xml               | 4 ++++
 pom.xml                      | 8 +++++---
 testkit-backend/LICENSES.txt | 1 +
 testkit-backend/NOTICE.txt   | 1 +
 8 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bundle/LICENSES.txt b/bundle/LICENSES.txt
index 3966a2aff1..7d99453207 100644
--- a/bundle/LICENSES.txt
+++ b/bundle/LICENSES.txt
@@ -9,6 +9,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
diff --git a/bundle/NOTICE.txt b/bundle/NOTICE.txt
index 4524fcc932..bef2949e4f 100644
--- a/bundle/NOTICE.txt
+++ b/bundle/NOTICE.txt
@@ -24,6 +24,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
diff --git a/driver/LICENSES.txt b/driver/LICENSES.txt
index 3966a2aff1..7d99453207 100644
--- a/driver/LICENSES.txt
+++ b/driver/LICENSES.txt
@@ -9,6 +9,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
diff --git a/driver/NOTICE.txt b/driver/NOTICE.txt
index 4524fcc932..bef2949e4f 100644
--- a/driver/NOTICE.txt
+++ b/driver/NOTICE.txt
@@ -24,6 +24,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
diff --git a/driver/pom.xml b/driver/pom.xml
index 2fcd530936..5fad79247a 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -31,6 +31,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-classes</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 0bdf14a33d..0f93f13a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
     <!-- 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-handler.version>4.1.78.Final</netty-handler.version>
+    <netty-bom.version>4.1.78.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.-->
@@ -97,8 +97,10 @@
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
-        <artifactId>netty-handler</artifactId>
-        <version>${netty-handler.version}</version>
+        <artifactId>netty-bom</artifactId>
+        <version>${netty-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>io.projectreactor</groupId>
diff --git a/testkit-backend/LICENSES.txt b/testkit-backend/LICENSES.txt
index 29bc1d60ff..5cb9502753 100644
--- a/testkit-backend/LICENSES.txt
+++ b/testkit-backend/LICENSES.txt
@@ -12,6 +12,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM
diff --git a/testkit-backend/NOTICE.txt b/testkit-backend/NOTICE.txt
index 7c294e5ae3..db1c4726f4 100644
--- a/testkit-backend/NOTICE.txt
+++ b/testkit-backend/NOTICE.txt
@@ -27,6 +27,7 @@ Apache Software License, Version 2.0
   Netty/Common
   Netty/Handler
   Netty/Resolver
+  Netty/TomcatNative [OpenSSL - Classes]
   Netty/Transport
   Netty/Transport/Native/Unix/Common
   Non-Blocking Reactive Foundation for the JVM

From 0a6bdbbc0022cc519e7af7ac4666729a0399d342 Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Wed, 29 Jun 2022 16:19:03 +0100
Subject: [PATCH 3/3] Set maven-resources-plugin version

---
 bundle/pom.xml | 1 +
 pom.xml        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index 362cdbb6b9..e6aeaec491 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -58,6 +58,7 @@
     <plugins>
       <!-- Extract the original sources again -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
index 0f93f13a01..3e798f1a51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,6 +468,11 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>