From 8cdbe8fe72f1909beb369b7f75affc64e7c2d4f3 Mon Sep 17 00:00:00 2001
From: Joe DiPol <joe.dipol@oracle.com>
Date: Mon, 8 Apr 2024 15:22:10 -0700
Subject: [PATCH] 3.x:  resolve native-image warnings after Netty upgrade
 (#7084)

* Fixes 5878: native-image warnings after Netty upgrade
---
 .../graal/native-image-extension/pom.xml      | 31 +++++++++++++++++++
 .../native-image.properties                   |  5 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/integrations/graal/native-image-extension/pom.xml b/integrations/graal/native-image-extension/pom.xml
index dd7b6dd3f91..17966094ef9 100644
--- a/integrations/graal/native-image-extension/pom.xml
+++ b/integrations/graal/native-image-extension/pom.xml
@@ -34,6 +34,9 @@
          to have a bad module-info.  So for now we skip generating javadocs.
         -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <version.lib.lz4>1.3.0</version.lib.lz4>
+        <version.lib.jboss-marshalling>2.1.1.Final</version.lib.jboss-marshalling>
+        <version.lib.zstd-jni>1.5.6-2</version.lib.zstd-jni>
     </properties>
 
     <dependencies>
@@ -58,6 +61,34 @@
             <artifactId>graal-sdk</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <!-- These are Netty dependencies needed to silence warnings at native-image compile time -->
+        <!-- These are not used at runtime and are only provided to silence native-image warnings -->
+        <!-- See https://github.com/helidon-io/helidon/issues/5878 for details -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
+            <version>${version.lib.lz4}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+            <version>${version.lib.jboss-marshalling}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.luben</groupId>
+            <artifactId>zstd-jni</artifactId>
+            <version>${version.lib.zstd-jni}</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/integrations/graal/native-image-extension/src/main/resources/META-INF/native-image/io.helidon.integrations.graal/helidon-graal-native-image-extension/native-image.properties b/integrations/graal/native-image-extension/src/main/resources/META-INF/native-image/io.helidon.integrations.graal/helidon-graal-native-image-extension/native-image.properties
index 06cb9320c31..a47c4d45cf0 100644
--- a/integrations/graal/native-image-extension/src/main/resources/META-INF/native-image/io.helidon.integrations.graal/helidon-graal-native-image-extension/native-image.properties
+++ b/integrations/graal/native-image-extension/src/main/resources/META-INF/native-image/io.helidon.integrations.graal/helidon-graal-native-image-extension/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.
@@ -17,6 +17,9 @@
 Args=--no-fallback \
       --features=io.helidon.integrations.graal.nativeimage.extension.HelidonReflectionFeature \
       --initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger \
+      --initialize-at-run-time=io.netty.handler.codec.compression.Lz4XXHash32 \
+      --initialize-at-run-time=io.netty.handler.codec.compression.ZstdDecoder \
+      --initialize-at-run-time=io.netty.handler.codec.compression.ZstdConstants \
       --initialize-at-build-time=io.helidon \
       --initialize-at-build-time=io.netty \
       --initialize-at-build-time=org.yaml.snakeyaml \