Merge pull request #58 from tjwatson/issue57
diff --git a/atomos-parent/pom.xml b/atomos-parent/pom.xml
index 34f1093..67509fc 100644
--- a/atomos-parent/pom.xml
+++ b/atomos-parent/pom.xml
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.17.100</version>
+ <version>3.17.200</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -296,7 +296,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>1.2.2</version>
+ <version>1.2.6</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/atomos.examples/atomos.examples.substrate.lib/pom.xml b/atomos.examples/atomos.examples.substrate.lib/pom.xml
index d7c8c87..d5bfdda 100644
--- a/atomos.examples/atomos.examples.substrate.lib/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.lib/pom.xml
@@ -167,13 +167,14 @@
</executions>
</plugin>
<plugin>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>native-image-maven-plugin</artifactId>
- <version>21.0.0</version>
+ <groupId>org.graalvm.buildtools</groupId>
+ <artifactId>native-maven-plugin</artifactId>
+ <version>0.9.11</version>
<executions>
<execution>
+ <id>build-native</id>
<goals>
- <goal>native-image</goal>
+ <goal>build</goal>
</goals>
<phase>package</phase>
</execution>
@@ -190,6 +191,7 @@
--initialize-at-build-time=org.eclipse.jetty.util.log.Log
--initialize-at-build-time=org.eclipse.jetty.util.log.StdErrLog
--initialize-at-build-time=org.eclipse.jetty.util.Uptime
+ --initialize-at-build-time=org.eclipse.jetty.util.ModuleLocation
--initialize-at-build-time=org.eclipse.jetty.server.HttpOutput
--initialize-at-build-time=org.apache.felix.atomos
--initialize-at-build-time=javax.servlet
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index 8cad31e..1d76a95 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -106,6 +106,7 @@
<additionalInitializeAtBuildTime>org.eclipse.jetty.util.log.StdErrLog</additionalInitializeAtBuildTime>
<additionalInitializeAtBuildTime>org.eclipse.jetty.util.Uptime</additionalInitializeAtBuildTime>
<additionalInitializeAtBuildTime>org.eclipse.jetty.server.HttpOutput</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.util.ModuleLocation</additionalInitializeAtBuildTime>
</additionalInitializeAtBuildTime>
<resourceConfigurationFiles>
<resourceConfigurationFile>additionalResourceConfig.json</resourceConfigurationFile>
diff --git a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
index 49b728c..f463077 100644
--- a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
+++ b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
@@ -154,7 +154,7 @@
new InputStreamReader(versionProcess.getInputStream())).lines())
{
final Optional<String> versionLine = lines.filter(
- l -> l.contains("GraalVM Version")).findFirst();
+ l -> l.contains("GraalVM")).findFirst();
if (versionLine.isPresent())
{
return versionLine.get();
