mvnd native executable is not passing -Dkey=val to the daemon #157

apache · Oct 27, 2020 · 59a9bba · 59a9bba
1 parent 6e46188
commit 59a9bba
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -122,6 +122,7 @@
                                 -H:IncludeResources=org/jboss/fuse/mvnd/.*
                                 -H:IncludeResources=org/jline/utils/.*
                                 -H:IncludeResources=org/fusesource/jansi/jansi.properties
+                                -H:-ParseRuntimeOptions
                             </buildArgs>
                         </configuration>
                     </plugin>

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -88,7 +88,6 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
         boolean version = false;
         boolean showVersion = false;
         boolean debug = false;
-        final Properties commandLineProperties = new Properties();
         for (String arg : argv) {
             switch (arg) {
             case "-v":
@@ -111,9 +110,9 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
                 if (arg.startsWith("-D")) {
                     final int eqPos = arg.indexOf('=');
                     if (eqPos >= 0) {
-                        commandLineProperties.setProperty(arg.substring(2, eqPos), arg.substring(eqPos + 1));
+                        System.setProperty(arg.substring(2, eqPos), arg.substring(eqPos + 1));
                     } else {
-                        commandLineProperties.setProperty(arg.substring(2), "");
+                        System.setProperty(arg.substring(2), "");
                     }
                 }
                 args.add(arg);

diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/ModuleAndPluginNativeIT.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/ModuleAndPluginNativeIT.java
@@ -42,11 +42,14 @@ public class ModuleAndPluginNativeIT {
     @Test
     void cleanInstall() throws IOException, InterruptedException {
         final Path helloPath = layout.multiModuleProjectDirectory().resolve("hello/target/hello.txt");
-        try {
-            Files.deleteIfExists(helloPath);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not delete " + helloPath);
-        }
+        final Path helloPropertyPath = layout.multiModuleProjectDirectory().resolve("hello/target/hello.property.txt");
+        Stream.of(helloPath, helloPropertyPath).forEach(p -> {
+            try {
+                Files.deleteIfExists(p);
+            } catch (IOException e) {
+                throw new RuntimeException("Could not delete " + p);
+            }
+        });
 
         final Path localMavenRepo = layout.getLocalMavenRepository();
         TestUtils.deleteDir(localMavenRepo);
@@ -59,10 +62,13 @@ void cleanInstall() throws IOException, InterruptedException {
         /* Build #1: with "Hello" output to target/hello.txt */
         {
             final ClientOutput output = Mockito.mock(ClientOutput.class);
-            client.execute(output, "clean", "install", "-e", "-Dmvnd.log.level=DEBUG").assertSuccess();
+            client.execute(output, "clean", "install", "-e", "-Dmvnd.log.level=DEBUG", "-Dhello.property=Hello1")
+                    .assertSuccess();
 
             Assertions.assertThat(helloPath).exists();
             Assertions.assertThat(helloPath).usingCharset(StandardCharsets.UTF_8).hasContent("Hello");
+            Assertions.assertThat(helloPropertyPath).exists();
+            Assertions.assertThat(helloPropertyPath).usingCharset(StandardCharsets.UTF_8).hasContent("Hello1");
             Stream.of(installedJars).forEach(jar -> Assertions.assertThat(jar).exists());
         }
 
@@ -75,10 +81,12 @@ void cleanInstall() throws IOException, InterruptedException {
             final ClientOutput output = Mockito.mock(ClientOutput.class);
             client.execute(output,
                     "clean",
-                    "install", "-e", "-Dmvnd.log.level=DEBUG").assertSuccess();
+                    "install", "-e", "-Dmvnd.log.level=DEBUG", "-Dhello.property=Hello2").assertSuccess();
 
             Assertions.assertThat(helloPath).exists();
             Assertions.assertThat(helloPath).usingCharset(StandardCharsets.UTF_8).hasContent("Hi");
+            Assertions.assertThat(helloPropertyPath).exists();
+            Assertions.assertThat(helloPropertyPath).usingCharset(StandardCharsets.UTF_8).hasContent("Hello2");
             Stream.of(installedJars).forEach(jar -> Assertions.assertThat(jar).exists());
         }
 

diff --git a/...nd-plugin/plugin/src/main/java/org/jboss/fuse/mvnd/test/module/plugin/mojo/HelloMojo.java b/...nd-plugin/plugin/src/main/java/org/jboss/fuse/mvnd/test/module/plugin/mojo/HelloMojo.java
@@ -35,13 +35,17 @@ public class HelloMojo extends AbstractMojo {
     @Parameter
     File file;
 
+    @Parameter(property = "hello.property", defaultValue = "Hello")
+    String property;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
 
         try {
             final Path path = file.toPath();
             Files.createDirectories(path.getParent());
             Files.write(path, "Hello".getBytes(StandardCharsets.UTF_8));
+            Files.write(path.getParent().resolve("hello.property.txt"), property.getBytes(StandardCharsets.UTF_8));
         } catch (IOException e) {
             throw new RuntimeException("", e);
         }