This is an automated email from the ASF dual-hosted git repository.

slachiewicz 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 b96275e6 Support quoted values in mvnd.jvmArgs
b96275e6 is described below

commit b96275e6b5cb6f9ea31d75c3815538e83e40896f
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Fri Nov 6 22:26:23 2026 +0100

    Support quoted values in mvnd.jvmArgs
    
    Fixes #1547
---
 .../org/mvndaemon/mvnd/client/DaemonConnector.java | 44 +++++++++++++++++++---
 .../mvndaemon/mvnd/client/DaemonConnectorTest.java | 19 ++++++++++
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git 
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java 
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 3c08a16e..38eb017d 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -333,6 +333,44 @@ public class DaemonConnector {
                 "Timeout waiting to connect to the Maven daemon.\n" + 
diag.describe());
     }
 
+    /**
+     * Splits the value of {@code mvnd.jvmArgs} into arguments. Whitespace 
separates arguments, and double or single
+     * quotes group characters (including whitespace) into the current 
argument. The quotes themselves are removed
+     * and there is no other escaping. An unterminated quote extends to the 
end of the input.
+     */
+    static List<String> splitJvmArgs(String jvmArgs) {
+        List<String> result = new ArrayList<>();
+        StringBuilder current = new StringBuilder();
+        boolean inArg = false;
+        char quote = 0;
+        for (int i = 0; i < jvmArgs.length(); i++) {
+            char c = jvmArgs.charAt(i);
+            if (quote != 0) {
+                if (c == quote) {
+                    quote = 0;
+                } else {
+                    current.append(c);
+                }
+            } else if (c == '"' || c == '\'') {
+                quote = c;
+                inArg = true;
+            } else if (Character.isWhitespace(c)) {
+                if (inArg) {
+                    result.add(current.toString());
+                    current.setLength(0);
+                    inArg = false;
+                }
+            } else {
+                current.append(c);
+                inArg = true;
+            }
+        }
+        if (inArg) {
+            result.add(current.toString());
+        }
+        return result;
+    }
+
     static String newId() {
         return String.format("%08x", new Random().nextInt());
     }
@@ -412,11 +450,7 @@ public class DaemonConnector {
             // jvm args
             String jvmArgs = parameters.jvmArgs();
             if (jvmArgs != null) {
-                for (String arg : jvmArgs.split(" ")) {
-                    if (!arg.isEmpty()) {
-                        args.add(arg);
-                    }
-                }
+                args.addAll(splitJvmArgs(jvmArgs));
             }
             // memory
             String minHeapSize = parameters.minHeapSize();
diff --git 
a/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java 
b/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
index 4137b88f..5c58bd4a 100644
--- a/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
+++ b/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.client;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.common.DaemonException;
@@ -40,6 +41,24 @@ public class DaemonConnectorTest {
         assertEquals(8, id.length());
     }
 
+    @Test
+    public void splitsJvmArgs() {
+        assertEquals(List.of(), DaemonConnector.splitJvmArgs(""));
+        assertEquals(List.of(), DaemonConnector.splitJvmArgs("   "));
+        assertEquals(List.of("-Xmx1g", "-Dfoo=bar"), 
DaemonConnector.splitJvmArgs("-Xmx1g -Dfoo=bar"));
+        assertEquals(List.of("-Xmx1g", "-Dfoo=bar"), 
DaemonConnector.splitJvmArgs("  -Xmx1g   -Dfoo=bar "));
+        assertEquals(
+                List.of("-Djavax.net.ssl.trustStore=/my trust/store.jks", 
"-Dx=y"),
+                DaemonConnector.splitJvmArgs("\"-Djavax.net.ssl.trustStore=/my 
trust/store.jks\" -Dx=y"));
+        assertEquals(
+                List.of("-Djavax.net.ssl.trustStore=/my trust/store.jks"),
+                DaemonConnector.splitJvmArgs("-Djavax.net.ssl.trustStore=\"/my 
trust/store.jks\""));
+        assertEquals(List.of("-Da=b c", "-Dd=e f"), 
DaemonConnector.splitJvmArgs("'-Da=b c' -Dd='e f'"));
+        assertEquals(List.of("-Da=it's", "x"), 
DaemonConnector.splitJvmArgs("\"-Da=it's\" x"));
+        assertEquals(List.of("", "a"), DaemonConnector.splitJvmArgs("\"\" a"));
+        assertEquals(List.of("-Da=b c"), DaemonConnector.splitJvmArgs("-Da=\"b 
c"));
+    }
+
     @Test
     public void connectsOnlyToLoopback() throws Exception {
         assertDoesNotThrow(

Reply via email to