From bc95ac1b51c84ac8cbc7d6fe1454e6c2294ed498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kraus?= <tomas.kraus@oracle.com>
Date: Tue, 23 Jul 2024 16:08:31 +0200
Subject: [PATCH 1/2] Issue #9025 - Fixed native image build for webserver.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
---
 .../native-image.properties                                 | 1 +
 tests/integration/jpa/appl/pom.xml                          | 6 ++++++
 2 files changed, 7 insertions(+)

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 a47c4d45cf0..f424543b7b1 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
@@ -20,6 +20,7 @@ Args=--no-fallback \
       --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-run-time=org.glassfish.hk2.utilities.CleanerFactory \
       --initialize-at-build-time=io.helidon \
       --initialize-at-build-time=io.netty \
       --initialize-at-build-time=org.yaml.snakeyaml \
diff --git a/tests/integration/jpa/appl/pom.xml b/tests/integration/jpa/appl/pom.xml
index 2ea0cee9b08..6f39cb1991c 100644
--- a/tests/integration/jpa/appl/pom.xml
+++ b/tests/integration/jpa/appl/pom.xml
@@ -298,6 +298,12 @@
                 </property>
             </activation>
             <id>native-image</id>
+            <dependencies>
+                <dependency>
+                    <groupId>io.helidon.integrations.graal</groupId>
+                    <artifactId>helidon-graal-native-image-extension</artifactId>
+                </dependency>
+            </dependencies>
             <build>
                 <plugins>
                     <plugin>

From 3e04d91b06991177c347c8be07a93a02c53ef44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kraus?= <tomas.kraus@oracle.com>
Date: Tue, 23 Jul 2024 17:40:40 +0200
Subject: [PATCH 2/2] Issue #9025 - Removed duplicate dependency.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
---
 tests/integration/jpa/appl/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/integration/jpa/appl/pom.xml b/tests/integration/jpa/appl/pom.xml
index 6f39cb1991c..2ea0cee9b08 100644
--- a/tests/integration/jpa/appl/pom.xml
+++ b/tests/integration/jpa/appl/pom.xml
@@ -298,12 +298,6 @@
                 </property>
             </activation>
             <id>native-image</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.helidon.integrations.graal</groupId>
-                    <artifactId>helidon-graal-native-image-extension</artifactId>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>