From 1302ab3a28fe6eadd1e0bfde263d0fdda996d00f Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 18 Dec 2020 08:38:24 +0100
Subject: [PATCH] mvnd fails when version range is used in extensions.xml,
 fixes #275

---
 .../main/java/org/mvndaemon/mvnd/client/DaemonParameters.java   | 2 +-
 daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java   | 2 +-
 .../src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java | 2 +-
 .../src/test/projects/extensions/.mvn/extensions.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index cf5cb031..5945825e 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -361,7 +361,7 @@ public class DaemonParameters {
                 List<String> extensions = readCoreExtensionsDescriptor(multiModuleProjectDirectory()).stream()
                         .map(e -> e.getGroupId() + ":" + e.getArtifactId() + ":" + e.getVersion())
                         .collect(Collectors.toList());
-                return String.join(",", extensions);
+                return String.join(";", extensions);
             } catch (IOException | XmlPullParserException e) {
                 throw new RuntimeException("Unable to parse core extensions", e);
             }
diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index d270dd80..9e9c304b 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -439,7 +439,7 @@ public class DaemonMavenCli {
         CoreExtensionEntry coreEntry = CoreExtensionEntry.discoverFrom(coreRealm);
 
         List<CoreExtension> extensions = Stream
-                .of(Environment.MVND_CORE_EXTENSIONS.asString().split(","))
+                .of(Environment.MVND_CORE_EXTENSIONS.asString().split(";"))
                 .filter(s -> s != null && !s.isEmpty())
                 .map(s -> {
                     String[] parts = s.split(":");
diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
index b3953855..de76da28 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
+++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
@@ -49,7 +49,7 @@ public class ExtensionsNativeIT {
         client.execute(o, "-v").assertSuccess();
         assertDaemonRegistrySize(1);
         DaemonInfo daemon = registry.getAll().iterator().next();
-        assertTrue(daemon.getOptions().contains("mvnd.coreExtensions=io.takari.aether:takari-local-repository:0.11.3"));
+        assertTrue(daemon.getOptions().contains("mvnd.coreExtensions=io.takari.aether:takari-local-repository:[0.11.3,)"));
 
         registry.awaitIdle(daemon.getUid());
 
diff --git a/integration-tests/src/test/projects/extensions/.mvn/extensions.xml b/integration-tests/src/test/projects/extensions/.mvn/extensions.xml
index a9e180cd..89065ff7 100644
--- a/integration-tests/src/test/projects/extensions/.mvn/extensions.xml
+++ b/integration-tests/src/test/projects/extensions/.mvn/extensions.xml
@@ -20,6 +20,6 @@
     <extension>
         <groupId>io.takari.aether</groupId>
         <artifactId>takari-local-repository</artifactId>
-        <version>0.11.3</version>
+        <version>[0.11.3,)</version>
     </extension>
 </extensions>