From 6cf4e92bf7db31c0aca5f0dda6c3158f635414bf Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 9 Oct 2024 11:12:11 +0200
Subject: [PATCH] Bump native-maven-plugin from 0.10.2 to 0.10.3 (#1144)

The plugin introduced some "windows fix"[1] that causes current arg parsing to fail. Solution seems to be to split each arg in own line, but that introduced another set of challenges.

[1] https://github.com/graalvm/native-build-tools/pull/609

Supersedes https://github.com/apache/maven-mvnd/pull/1135
---
 client/pom.xml            | 58 ++++++++++++++++++++++++++-------------
 integration-tests/pom.xml |  4 +--
 pom.xml                   |  2 +-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index bbfb836b..7d2978fc 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -32,8 +32,6 @@
 
   <properties>
     <maven.compiler.release>11</maven.compiler.release>
-    <graalvm-native-static-opt />
-    <graalvm-native-glibc-opt />
     <patchelf.skip>true</patchelf.skip>
   </properties>
 
@@ -190,9 +188,19 @@
           <family>!mac</family>
         </os>
       </activation>
-      <properties>
-        <graalvm-native-static-opt>-H:+StaticExecutableWithDynamicLibC</graalvm-native-static-opt>
-      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.graalvm.buildtools</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <configuration>
+              <buildArgs combine.children="append">
+                <buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg>
+              </buildArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <profile>
@@ -206,11 +214,23 @@
         </file>
       </activation>
       <properties>
-        <graalvm-native-glibc-opt>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc
-                                  -H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12
-                                  -H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</graalvm-native-glibc-opt>
         <patchelf.skip>false</patchelf.skip>
       </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.graalvm.buildtools</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <configuration>
+              <buildArgs combine.children="append">
+                <buildArg>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc</buildArg>
+                <buildArg>-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
+                <buildArg>-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
+              </buildArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <profile>
@@ -227,17 +247,17 @@
               <skip>false</skip>
               <mainClass>org.mvndaemon.mvnd.client.DefaultClient</mainClass>
               <imageName>mvnd</imageName>
-              <buildArgs>--no-fallback
-                         -march=compatibility
-                         -H:+UnlockExperimentalVMOptions
-                         ${graalvm-native-static-opt}
-                         ${graalvm-native-glibc-opt}
-                         -H:IncludeResources=org/mvndaemon/mvnd/.*
-                         -H:IncludeResources=mvnd-bash-completion.bash
-                         -H:-ParseRuntimeOptions
-                         -H:+AddAllCharsets
-                         -H:+ReportExceptionStackTraces
-                         -ea</buildArgs>
+              <buildArgs combine.children="append">
+                <buildArg>--no-fallback</buildArg>
+                <buildArg>-march=compatibility</buildArg>
+                <buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
+                <buildArg>-H:IncludeResources=org/mvndaemon/mvnd/.*</buildArg>
+                <buildArg>-H:IncludeResources=mvnd-bash-completion.bash</buildArg>
+                <buildArg>-H:-ParseRuntimeOptions</buildArg>
+                <buildArg>-H:+AddAllCharsets</buildArg>
+                <buildArg>-H:+ReportExceptionStackTraces</buildArg>
+                <buildArg>-ea</buildArg>
+              </buildArgs>
             </configuration>
             <executions>
               <execution>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 6aff18ee..4f296874 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -106,7 +106,7 @@
             <phase>none</phase>
           </execution>
           <execution>
-            <id>mvn-39</id>
+            <id>java-test</id>
             <goals>
               <goal>test</goal>
             </goals>
@@ -192,7 +192,7 @@
             <artifactId>maven-failsafe-plugin</artifactId>
             <executions>
               <execution>
-                <id>native-39</id>
+                <id>native-test</id>
                 <goals>
                   <goal>integration-test</goal>
                   <goal>verify</goal>
diff --git a/pom.xml b/pom.xml
index 45dbb7ea..71a47048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <commons-compress.version>1.27.1</commons-compress.version>
     <!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
     <graalvm.version>24.1.0</graalvm.version>
-    <graalvm.plugin.version>0.10.2</graalvm.plugin.version>
+    <graalvm.plugin.version>0.10.3</graalvm.plugin.version>
     <groovy.version>4.0.23</groovy.version>
     <jakarta.inject.version>1.0</jakarta.inject.version>
     <jline.version>3.27.0</jline.version>