From 844c4b58ceffc610557676898dee20bc4d12c5fa Mon Sep 17 00:00:00 2001
From: injectives <11927660+injectives@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:22:44 +0100
Subject: [PATCH] Update dependencies (#1255)

* Update dependencies

* Migrate to netty-bom and include netty-tcnative-classes

* Set maven-resources-plugin version
---
 bundle/LICENSES.txt          |  2 ++
 bundle/NOTICE.txt            |  2 ++
 bundle/pom.xml               |  1 +
 driver/LICENSES.txt          |  2 ++
 driver/NOTICE.txt            |  2 ++
 driver/pom.xml               |  4 ++++
 examples/LICENSES.txt        |  2 ++
 examples/NOTICE.txt          |  2 ++
 pom.xml                      | 19 +++++++++++++------
 testkit-backend/LICENSES.txt |  2 ++
 testkit-backend/NOTICE.txt   |  2 ++
 11 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/bundle/LICENSES.txt b/bundle/LICENSES.txt
index eb25bd282e..7d99453207 100644
--- a/bundle/LICENSES.txt
+++ b/bundle/LICENSES.txt
@@ -9,7 +9,9 @@ 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 28bc742efd..bef2949e4f 100644
--- a/bundle/NOTICE.txt
+++ b/bundle/NOTICE.txt
@@ -24,7 +24,9 @@ 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
 
 Creative Commons 0
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 79ec8894fb..4e07d34047 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>
         <version>3.2.0</version>
         <executions>
diff --git a/driver/LICENSES.txt b/driver/LICENSES.txt
index eb25bd282e..7d99453207 100644
--- a/driver/LICENSES.txt
+++ b/driver/LICENSES.txt
@@ -9,7 +9,9 @@ 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 28bc742efd..bef2949e4f 100644
--- a/driver/NOTICE.txt
+++ b/driver/NOTICE.txt
@@ -24,7 +24,9 @@ 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
 
 Creative Commons 0
diff --git a/driver/pom.xml b/driver/pom.xml
index 0b71dff909..91115c967b 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/examples/LICENSES.txt b/examples/LICENSES.txt
index 8dd2101161..0df0d3b05e 100644
--- a/examples/LICENSES.txt
+++ b/examples/LICENSES.txt
@@ -9,7 +9,9 @@ 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
   RxJava
 ------------------------------------------------------------------------------
diff --git a/examples/NOTICE.txt b/examples/NOTICE.txt
index 68e7142ed6..f5b0903c2b 100644
--- a/examples/NOTICE.txt
+++ b/examples/NOTICE.txt
@@ -24,7 +24,9 @@ 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
   RxJava
 
diff --git a/pom.xml b/pom.xml
index 3b27e6d983..3d167f2b13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,11 +34,11 @@
     <!-- 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-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.-->
-    <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>
@@ -51,9 +51,9 @@
     <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>
+    <micrometer.version>1.9.1</micrometer.version>
     <testcontainers.version>1.17.2</testcontainers.version>
-    <build-resources.version>4.4.7</build-resources.version>
+    <build-resources.version>4.4.8</build-resources.version>
     <!-- To be overwritten by child projects -->
     <moduleName/>
   </properties>
@@ -99,8 +99,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>
@@ -487,6 +489,11 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
diff --git a/testkit-backend/LICENSES.txt b/testkit-backend/LICENSES.txt
index 616e32986c..5cb9502753 100644
--- a/testkit-backend/LICENSES.txt
+++ b/testkit-backend/LICENSES.txt
@@ -12,7 +12,9 @@ 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 449102c532..db1c4726f4 100644
--- a/testkit-backend/NOTICE.txt
+++ b/testkit-backend/NOTICE.txt
@@ -27,7 +27,9 @@ 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
 
 Creative Commons 0