You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2024/10/09 09:12:32 UTC
(maven-mvnd) branch master updated: Bump native-maven-plugin from 0.10.2 to 0.10.3 (#1143)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new 06eb5fd2 Bump native-maven-plugin from 0.10.2 to 0.10.3 (#1143)
06eb5fd2 is described below
commit 06eb5fd2a9a1a83083380633e2922807e6318a6f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Oct 9 11:12:26 2024 +0200
Bump native-maven-plugin from 0.10.2 to 0.10.3 (#1143)
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/1133
---
client/pom.xml | 58 +++++++++++++++++++++++++++++++++++++++-------------------
pom.xml | 3 +--
2 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 92e8fb69..d577689e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -31,8 +31,6 @@
<name>Maven Daemon - Client</name>
<properties>
- <graalvm-native-static-opt />
- <graalvm-native-glibc-opt />
<patchelf.skip>true</patchelf.skip>
</properties>
@@ -161,9 +159,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>
@@ -177,11 +185,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>
@@ -195,17 +215,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/pom.xml b/pom.xml
index dcb90b7a..43dc199b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,9 +78,8 @@
<apiguardian-api.version>1.0.0</apiguardian-api.version>
<assertj.version>3.26.3</assertj.version>
<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>
<jansi.version>2.4.1</jansi.version>