4.x: backport native-image fixes + support -Dnative.image.skip and -D…

…native.image.buildStatic (#7972) Signed-off-by: tvallin <[email protected]> Co-authored-by: Romain Grecourt <[email protected]>
helidon-io · Nov 9, 2023 · 50dec45 · 50dec45
1 parent 93d7f26
commit 50dec45
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 5 deletions.
diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -77,14 +77,12 @@
                                 <goals>
                                     <goal>generateResourceConfig</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                             <execution>
                                 <id>build-native-image</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -184,13 +184,15 @@
                     <executions>
                         <execution>
                             <id>resource-config</id>
+                            <phase>package</phase>
                             <configuration>
                                 <!-- generate records for all module's resources -->
                                 <isDetectionEnabled>true</isDetectionEnabled>
                             </configuration>
                         </execution>
                         <execution>
                             <id>build-native-image</id>
+                            <phase>package</phase>
                             <configuration>
                                 <!-- generate an argument file for native image - great for troubleshooting -->
                                 <useArgFile>true</useArgFile>
@@ -214,6 +216,58 @@
         </pluginManagement>
     </build>
     <profiles>
+        <profile>
+            <id>native-image-skip</id>
+            <activation>
+                <property>
+                    <name>native.image.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>resource-config</id>
+                                <phase>none</phase>
+                            </execution>
+                            <execution>
+                                <id>build-native-image</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-image-static</id>
+            <activation>
+                <property>
+                    <name>native.image.buildStatic</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-native-image</id>
+                                <configuration>
+                                    <buildArgs combine.children="append">
+                                        <arg>--static</arg>
+                                    </buildArgs>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>helidon-cli</id>
             <activation>

diff --git a/applications/se/pom.xml b/applications/se/pom.xml
@@ -66,14 +66,12 @@
                                 <goals>
                                     <goal>generateResourceConfig</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                             <execution>
                                 <id>build-native-image</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-quickstart-se/Dockerfile.native
@@ -33,7 +33,7 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn clean package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources