From 63da0f2cb2235cb33730a34c25328b1d2cc6b735 Mon Sep 17 00:00:00 2001
From: Joe DiPol <joe.dipol@oracle.com>
Date: Wed, 18 Oct 2023 08:27:00 -0700
Subject: [PATCH] 3.x:  Upgrade Netty to 4.1.100.Final (#7818)

* Upgrade Netty to 4.1.100.Final
* Don't manage netty-tcnative since it is handled by netty-bom
---
 dependencies/pom.xml                                        | 2 +-
 pom.xml                                                     | 6 ------
 .../helidon-webserver/native-image.properties               | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index b69e599365c..dafa08c11ed 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -130,7 +130,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>5.12.0</version.lib.neo4j>
-        <version.lib.netty>4.1.94.Final</version.lib.netty>
+        <version.lib.netty>4.1.100.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>
         <version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
diff --git a/pom.xml b/pom.xml
index 5aacad5eec5..03488811909 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.61.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>
@@ -951,11 +950,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>
diff --git a/webserver/webserver/src/main/resources/META-INF/native-image/io.helidon.webserver/helidon-webserver/native-image.properties b/webserver/webserver/src/main/resources/META-INF/native-image/io.helidon.webserver/helidon-webserver/native-image.properties
index c7388254082..469292445e4 100644
--- a/webserver/webserver/src/main/resources/META-INF/native-image/io.helidon.webserver/helidon-webserver/native-image.properties
+++ b/webserver/webserver/src/main/resources/META-INF/native-image/io.helidon.webserver/helidon-webserver/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2019, 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.
@@ -39,6 +39,7 @@ Args=--initialize-at-run-time=io.netty.buffer.UnpooledByteBufAllocator$Instrumen
   --initialize-at-run-time=io.netty.handler.codec.marshalling.MarshallingDecoder \
   --initialize-at-run-time=io.netty.handler.codec.marshalling.MarshallingEncoder \
   --initialize-at-run-time=io.netty.handler.codec.protobuf.ProtobufDecoder \
+  --initialize-at-run-time=io.netty.handler.pcap.PcapWriteHandler$WildcardAddressHolder \
   --initialize-at-run-time=io.netty.handler.ssl.ConscryptAlpnSslEngine \
   --initialize-at-run-time=io.netty.handler.ssl.JdkNpnApplicationProtocolNegotiator \
   --initialize-at-run-time=io.netty.handler.ssl.JettyAlpnSslEngine$ClientEngine \