Skip to content

Commit ded17d2

Browse files
committed
Bump native-maven-plugin from 0.10.2 to 0.10.3
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] graalvm/native-build-tools#609
1 parent 31a212a commit ded17d2

File tree

2 files changed

+40
-20
lines changed

2 files changed

+40
-20
lines changed

client/pom.xml

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
<name>Maven Daemon - Client</name>
3232

3333
<properties>
34-
<graalvm-native-static-opt />
35-
<graalvm-native-glibc-opt />
3634
<patchelf.skip>true</patchelf.skip>
3735
</properties>
3836

@@ -161,9 +159,19 @@
161159
<family>!mac</family>
162160
</os>
163161
</activation>
164-
<properties>
165-
<graalvm-native-static-opt>-H:+StaticExecutableWithDynamicLibC</graalvm-native-static-opt>
166-
</properties>
162+
<build>
163+
<plugins>
164+
<plugin>
165+
<groupId>org.graalvm.buildtools</groupId>
166+
<artifactId>native-maven-plugin</artifactId>
167+
<configuration>
168+
<buildArgs combine.self="append">
169+
<buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg>
170+
</buildArgs>
171+
</configuration>
172+
</plugin>
173+
</plugins>
174+
</build>
167175
</profile>
168176

169177
<profile>
@@ -177,11 +185,23 @@
177185
</file>
178186
</activation>
179187
<properties>
180-
<graalvm-native-glibc-opt>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc
181-
-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12
182-
-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</graalvm-native-glibc-opt>
183188
<patchelf.skip>false</patchelf.skip>
184189
</properties>
190+
<build>
191+
<plugins>
192+
<plugin>
193+
<groupId>org.graalvm.buildtools</groupId>
194+
<artifactId>native-maven-plugin</artifactId>
195+
<configuration>
196+
<buildArgs combine.self="append">
197+
<buildArg>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc</buildArg>
198+
<buildArg>-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
199+
<buildArg>-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
200+
</buildArgs>
201+
</configuration>
202+
</plugin>
203+
</plugins>
204+
</build>
185205
</profile>
186206

187207
<profile>
@@ -195,17 +215,17 @@
195215
<skip>false</skip>
196216
<mainClass>org.mvndaemon.mvnd.client.DefaultClient</mainClass>
197217
<imageName>mvnd</imageName>
198-
<buildArgs>--no-fallback
199-
-march=compatibility
200-
-H:+UnlockExperimentalVMOptions
201-
${graalvm-native-static-opt}
202-
${graalvm-native-glibc-opt}
203-
-H:IncludeResources=org/mvndaemon/mvnd/.*
204-
-H:IncludeResources=mvnd-bash-completion.bash
205-
-H:-ParseRuntimeOptions
206-
-H:+AddAllCharsets
207-
-H:+ReportExceptionStackTraces
208-
-ea</buildArgs>
218+
<buildArgs combine.self="append">
219+
<buildArg>--no-fallback</buildArg>
220+
<buildArg>-march=compatibility</buildArg>
221+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
222+
<buildArg>-H:IncludeResources=org/mvndaemon/mvnd/.*</buildArg>
223+
<buildArg>-H:IncludeResources=mvnd-bash-completion.bash</buildArg>
224+
<buildArg>-H:-ParseRuntimeOptions</buildArg>
225+
<buildArg>-H:+AddAllCharsets</buildArg>
226+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
227+
<buildArg>-ea</buildArg>
228+
</buildArgs>
209229
</configuration>
210230
<executions>
211231
<execution>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<commons-compress.version>1.27.1</commons-compress.version>
8181
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
8282
<graalvm.version>24.0.2</graalvm.version>
83-
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
83+
<graalvm.plugin.version>0.10.3</graalvm.plugin.version>
8484
<groovy.version>4.0.22</groovy.version>
8585
<jakarta.inject.version>1.0</jakarta.inject.version>
8686
<jansi.version>2.4.1</jansi.version>

0 commit comments

Comments
 (0)