From b153de053994a4b98a18a772647e67f4e984053a Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 20 Dec 2022 12:02:47 -0800
Subject: [PATCH 1/2] Upgrade netty to 4.1.86.Final and use netty bom

---
 dependencies/pom.xml | 77 +++++---------------------------------------
 pom.xml              |  6 ----
 2 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 7f97b9430be..708ef299c69 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -122,7 +122,7 @@
         <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.3</version.lib.neo4j>
-        <version.lib.netty>4.1.77.Final</version.lib.netty>
+        <version.lib.netty>4.1.86.Final</version.lib.netty>
         <version.lib.netty-io_uring>0.0.8.Final</version.lib.netty-io_uring>
         <version.lib.oci>2.37.0</version.lib.oci>
         <version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
@@ -350,31 +350,6 @@
                 <artifactId>parsson-media</artifactId>
                 <version>${version.lib.parsson}</version>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler-proxy</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http2</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-buffer</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>yasson</artifactId>
@@ -1234,55 +1209,12 @@
             <!-- END OF Section 2: third party dependencies used by examples -->
 
             <!-- Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-dns</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-resolver-dns</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-epoll</artifactId>
-                <version>${version.lib.netty}</version>
-                <classifier>linux-x86_64</classifier>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-epoll</artifactId>
-                <version>${version.lib.netty}</version>
-                <classifier>linux-aarch64</classifier>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-kqueue</artifactId>
-                <version>${version.lib.netty}</version>
-                <classifier>osx-x86_64</classifier>
-            </dependency>
             <dependency>
                 <groupId>io.netty.incubator</groupId>
                 <artifactId>netty-incubator-transport-native-io_uring</artifactId>
                 <version>${version.lib.netty-io_uring}</version>
                 <classifier>linux-x86_64</classifier>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-unix-common</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-common</artifactId>
-                <version>${version.lib.netty}</version>
-            </dependency>
             <dependency>
                 <!-- required for dependency convergence, used from guava and perfmark-api -->
                 <groupId>com.google.errorprone</groupId>
@@ -1455,6 +1387,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${version.lib.netty}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>com.oracle.database.jdbc</groupId>
                 <artifactId>ojdbc-bom</artifactId>
diff --git a/pom.xml b/pom.xml
index 194816e7f71..8b45bfbfb3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,6 @@
         <version.lib.junit4>4.13.1</version.lib.junit4>
         <version.lib.kafka-junit5>3.2.3</version.lib.kafka-junit5>
         <version.lib.mockito>2.23.4</version.lib.mockito>
-        <version.lib.netty.tcnative>2.0.52.Final</version.lib.netty.tcnative>
         <version.lib.restito>0.9.1</version.lib.restito>
         <version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
         <version.lib.rxjava>2.2.10</version.lib.rxjava>
@@ -956,11 +955,6 @@
                 <artifactId>restito</artifactId>
                 <version>${version.lib.restito}</version>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-tcnative-boringssl-static</artifactId>
-                <version>${version.lib.netty.tcnative}</version>
-            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>

From 099abe12df2ac6c0fc5423482e9ab7d9e270071b Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 20 Dec 2022 12:51:39 -0800
Subject: [PATCH 2/2] Update test for new netty version

---
 .../io/helidon/reactive/webserver/TestNettyRejectRequest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java b/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java
index 3c31eb8dbda..a5f09f4b86d 100644
--- a/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java
+++ b/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java
@@ -77,6 +77,6 @@ void testBadHeader() throws Exception {
 
         assertThat(headers, hasHeader(Http.Header.CONTENT_LENGTH));
         assertThat(status, is(Http.Status.BAD_REQUEST_400));
-        assertThat(entity, containsString("prohibited characters"));
+        assertThat(entity, containsString("invalid character"));
     }
 }