From 0801f75313c98a9751109827e80a24c693bfee16 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Thu, 21 Mar 2024 14:54:28 -0700
Subject: [PATCH 1/2] Upgrade netty to 4.1.108.Final

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

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 0f2452bbff6..b7f42733a66 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -122,7 +122,7 @@
         <version.lib.hibernate-validator>6.2.5.Final</version.lib.hibernate-validator>
         <version.lib.mysql-connector-j>8.2.0</version.lib.mysql-connector-j>
         <version.lib.narayana>5.12.0.Final</version.lib.narayana>
-        <version.lib.netty>4.1.100.Final</version.lib.netty>
+        <version.lib.netty>4.1.108.Final</version.lib.netty>
         <version.lib.netty-io_uring>0.0.19.Final</version.lib.netty-io_uring>
         <version.lib.oci>3.26.0</version.lib.oci>
         <version.lib.oci-java-sdk-objectstorage>${version.lib.oci}</version.lib.oci-java-sdk-objectstorage>

From 51b245c6afcc85925f96517ac6c412ba83cd135c Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Fri, 22 Mar 2024 08:56:19 -0700
Subject: [PATCH 2/2] Fix for native-image

---
 .../helidon-webserver/native-image.properties                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 13c19246b8c..ba17f9af706 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, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2024 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.
@@ -56,4 +56,5 @@ Args=--allow-incomplete-classpath \
   --initialize-at-run-time=io.netty.internal.tcnative.SSLPrivateKeyMethod \
   --initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger \
   --initialize-at-run-time=io.netty.handler.ssl.BouncyCastleAlpnSslUtils \
-  --initialize-at-run-time=io.helidon.webserver.NettyInitializer
+  --initialize-at-run-time=io.helidon.webserver.NettyInitializer \
+  --initialize-at-run-time=io.netty.handler.ssl.JdkSslServerContext