helidon-io · tomas-langer · Nov 9, 2022 · Aug 2, 2022 · Oct 14, 2022 · Nov 2, 2022
diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -83,14 +83,22 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>io.helidon.build-tools</groupId>
-                        <artifactId>helidon-maven-plugin</artifactId>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>native-image</id>
+                                <id>resource-config</id>
+                                <goals>
+                                    <goal>generateResourceConfig</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                            <execution>
+                                <id>build-native-image</id>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile</goal>
                                 </goals>
+                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/applications/pom.xml b/applications/pom.xml
@@ -50,6 +50,7 @@
         <version.plugin.helidon>3.0.0</version.plugin.helidon>
         <version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
+        <version.plugin.nativeimage>0.9.16</version.plugin.nativeimage>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.protobuf>0.5.1</version.plugin.protobuf>
         <version.plugin.resources>2.7</version.plugin.resources>
@@ -170,6 +171,39 @@
                         <pluginArtifact>io.grpc:protoc-gen-grpc-java:${version.lib.grpc}:exe:${os.detected.classifier}</pluginArtifact>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.graalvm.buildtools</groupId>
+                    <artifactId>native-maven-plugin</artifactId>
+                    <version>${version.plugin.nativeimage}</version>
+                    <executions>
+                        <execution>
+                            <id>resource-config</id>
+                            <configuration>
+                                <!-- generate records for all module's resources -->
+                                <isDetectionEnabled>true</isDetectionEnabled>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>build-native-image</id>
+                            <configuration>
+                                <!-- generate an argument file for native image - great for troubleshooting -->
+                                <useArgFile>true</useArgFile>
+                                <!-- this needs to be defined to have a single set of jars on classpath,
+                                default approach would add classpath of module (from maven) and from jar (manifest) -->
+                                <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                                <imageName>${project.build.finalName}</imageName>
+                                <fallback>false</fallback>
+                                <metadataRepository>
+                                    <enabled>false</enabled>
+                                </metadataRepository>
+                                <buildArgs>
+                                    <!-- Some native image features use the svm dependencies which require additional exports -->
+                                    <arg>--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED</arg>
+                                </buildArgs>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/applications/se/pom.xml b/applications/se/pom.xml
@@ -36,14 +36,22 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>io.helidon.build-tools</groupId>
-                        <artifactId>helidon-maven-plugin</artifactId>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>native-image</id>
+                                <id>resource-config</id>
+                                <goals>
+                                    <goal>generateResourceConfig</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                            <execution>
+                                <id>build-native-image</id>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile</goal>
                                 </goals>
+                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache
@@ -1,6 +1,6 @@
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image

diff --git a/...-image/tests/mp-2/native-image.properties → ...on/helidon-common/native-image.properties b/...-image/tests/mp-2/native-image.properties → ...on/helidon-common/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2022 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.
@@ -14,7 +14,5 @@
 # limitations under the License.
 #
 
-#
-# Graal native image supports additional configuration from this property file.
-#
-Args=-H:+RemoveSaturatedTypeFlows
+# all Helidon classes should be designed for native image, exceptions configured in specific modules
+Args=--initialize-at-build-time=io.helidon
diff --git a/...elidon/helidon-common/reflect-config.json → ...common/helidon-common/reflect-config.json b/...elidon/helidon-common/reflect-config.json → ...common/helidon-common/reflect-config.json
diff --git a/...lidon/helidon-common/resource-config.json → ...ommon/helidon-common/resource-config.json b/...lidon/helidon-common/resource-config.json → ...ommon/helidon-common/resource-config.json
diff --git a/...urces/META-INF/native-image/io.helidon.config/helidon-config-yaml/native-image.properties b/...urces/META-INF/native-image/io.helidon.config/helidon-config-yaml/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2022 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.
@@ -14,4 +14,5 @@
 # limitations under the License.
 #
 
-Args=--initialize-at-build-time=io.helidon.config.yaml
+Args=--initialize-at-build-time=io.helidon.config.yaml \
+     --initialize-at-build-time=org.yaml.snakeyaml
diff --git a/...s/META-INF/native-image/io.helidon.dbclient/helidon-dbclient-jdbc/native-image.properties b/...s/META-INF/native-image/io.helidon.dbclient/helidon-dbclient-jdbc/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2020 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2022 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.
@@ -15,4 +15,5 @@
 #
 
 Args= --initialize-at-build-time=org.slf4j \
+  --initialize-at-build-time=com.zaxxer.hikari \
   --initialize-at-run-time=com.zaxxer.hikari.metrics.dropwizard.CodaHaleMetricsTracker
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -52,7 +52,7 @@
         <version.lib.google-oauth-client>1.33.3</version.lib.google-oauth-client>
         <version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
         <version.lib.google-protobuf>3.21.7</version.lib.google-protobuf>
-        <version.lib.graalvm>21.3.0</version.lib.graalvm>
+        <version.lib.graalvm>22.3.0</version.lib.graalvm>
         <version.lib.graphql-java>17.4</version.lib.graphql-java>
         <version.lib.graphql-java.extended.scalars>17.1</version.lib.graphql-java.extended.scalars>
         <version.lib.gson>2.8.9</version.lib.gson>
@@ -969,11 +969,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.graalvm.nativeimage</groupId>
-                <artifactId>svm</artifactId>
-                <version>${version.lib.graalvm}</version>
-            </dependency>
             <!-- Kafka support -->
             <dependency>
                 <groupId>org.apache.kafka</groupId>

diff --git a/docs/includes/guides/graalnative.adoc b/docs/includes/guides/graalnative.adoc
@@ -42,7 +42,7 @@ set the `GRAALVM_HOME` environment variable to point at your GraalVM installatio
 [source,bash]
 ----
 # Your path might be different
-export GRAALVM_HOME=/usr/local/graalvm-ce-21.3.0/Contents/Home/
+export GRAALVM_HOME=/usr/local/graalvm-ce-22.3.0/Contents/Home/
 ----
 
 Then install the optional `native-image` command:

diff --git a/etc/dependency-check-suppression.xml b/etc/dependency-check-suppression.xml
@@ -18,119 +18,119 @@
 -->
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21248</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21271</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21277</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21282</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21283</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21291</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21293</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21294</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21296</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21299</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21305</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21340</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21341</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21349</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21360</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21365</cve>
 </suppress>
 <suppress>
    <notes><![CDATA[
-   file name: graal-sdk-21.3.0.jar
+   file name: graal-sdk-22.3.0.jar
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/org\.graalvm\..*/.*@.*$</packageUrl>
    <cve>CVE-2022-21366</cve>

diff --git a/etc/scripts/includes/pipeline-env.sh b/etc/scripts/includes/pipeline-env.sh
@@ -47,7 +47,7 @@ if [ -z "${__PIPELINE_ENV_INCLUDED__}" ]; then
     . ${WS_DIR}/etc/scripts/includes/error_handlers.sh
 
     if [ -z "${GRAALVM_HOME}" ]; then
-        export GRAALVM_HOME="/tools/graalvm-ce-java17-21.3.0"
+        export GRAALVM_HOME="/tools/graalvm-ce-java17-22.3.0"
     fi
 
     require_env() {

diff --git a/examples/integrations/neo4j/neo4j-mp/Dockerfile.native b/examples/integrations/neo4j/neo4j-mp/Dockerfile.native
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image

diff --git a/examples/integrations/neo4j/neo4j-se/Dockerfile.native b/examples/integrations/neo4j/neo4j-se/Dockerfile.native
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image

diff --git a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image

diff --git a/examples/quickstarts/helidon-quickstart-mp/README.md b/examples/quickstarts/helidon-quickstart-mp/README.md
@@ -80,7 +80,7 @@ You can build a native executable in 2 different ways:
 ### Local build
 
 Download Graal VM at https://www.graalvm.org/downloads. We recommend
-version `21.3.0` or later.
+version `22.3.0` or later.
 
 ```
 # Setup the environment

diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-quickstart-se/Dockerfile.native
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image

diff --git a/examples/quickstarts/helidon-quickstart-se/README.md b/examples/quickstarts/helidon-quickstart-se/README.md
@@ -80,7 +80,7 @@ You can build a native executable in 2 different ways:
 ### Local build
 
 Download Graal VM at https://www.graalvm.org/downloads. We recommend
-version `21.3.0` or later.
+version `22.3.0` or later.
 
 ```
 # Setup the environment

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM ghcr.io/graalvm/graalvm-ce:java17-21.3.0 as build
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.0 as build
 
 # Install native-image
 RUN gu install native-image