Re-layout the distro so that mvn is not in bin #91

daemon/src/main/distro/bin/mvns

@@ -196,7 +196,7 @@ exec "$JAVACMD" \
   -Dmvnd.logging=mvns \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
   "-Dmvnd.home=${MAVEN_HOME}" \
-  "-Dmaven.home=${MAVEN_HOME}" \
+  "-Dmaven.home=${MAVEN_HOME}/mvn" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} --builder smart --threads 0.5C "$@"

daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java

@@ -200,11 +200,11 @@ public class DaemonMavenCli {
         // Make sure the Maven home directory is an absolute path to save us from confusion with say drive-relative
         // Windows paths.
         //
-        String mavenHome = System.getProperty("mvnd.home");
+        String mvndHome = System.getProperty("mvnd.home");
 
-        if (mavenHome != null) {
-            System.setProperty("mvnd.home", new File(mavenHome).getAbsolutePath());
-            System.setProperty("maven.home", new File(mavenHome).getAbsolutePath());
+        if (mvndHome != null) {
+            System.setProperty("mvnd.home", new File(mvndHome).getAbsolutePath());
+            System.setProperty("maven.home", new File(mvndHome + "/mvn").getAbsolutePath());
         }
     }
 

daemon/src/main/provisio/maven-distro.xml

@@ -17,14 +17,14 @@
 -->
 <assembly>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/mvn">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin">
             <unpack useRoot="false"
                     excludes="lib/slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*,lib/jansi-*.jar,lib/jansi-native/*"/>
         </artifact>
     </artifactSet>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/lib/ext">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/mvn/lib/ext">
         <artifact id="org.jboss.fuse.mvnd:mvnd-daemon:${project.version}">
             <exclusion id="org.codehaus.plexus:plexus-classworlds"/>
             <exclusion id="*:cdi-api"/>

daemon/src/test/java/org/jboss/fuse/mvnd/dist/DistroIT.java

@@ -37,17 +37,18 @@ public class DistroIT {
     @Test
     void noDuplicateJars() {
         final Path mavenHome = Paths.get(System.getProperty("mvnd.home"));
-        Set<Avc> mavenLibs = streamJars(mavenHome, "lib", "boot").collect(Collectors.toCollection(TreeSet::new));
+        Set<Avc> mavenLibs = streamJars(mavenHome, "mvn/lib", "mvn/boot").collect(Collectors.toCollection(TreeSet::new));
         Assertions.assertFalse(mavenLibs.isEmpty());
-        final List<Avc> mvndJars = streamJars(mavenHome, "lib/ext").collect(Collectors.toList());
+        final List<Avc> mvndJars = streamJars(mavenHome, "mvn/lib/ext").collect(Collectors.toList());
         Assertions.assertFalse(mvndJars.isEmpty());
 
         final List<Avc> dups = mvndJars.stream()
                 .filter(avc -> mavenLibs.stream().anyMatch(mvnAvc -> mvnAvc.sameArtifactId(avc)))
                 .collect(Collectors.toList());
 
-        final String msg = mavenHome.resolve("lib/ext") + " contains duplicates available in " + mavenHome.resolve("lib")
-                + " or " + mavenHome.resolve("lib");
+        final String msg = mavenHome.resolve("mvn/lib/ext") + " contains duplicates available in "
+                + mavenHome.resolve("mvn/lib")
+                + " or " + mavenHome.resolve("mvn/lib");
         Assertions.assertEquals(new ArrayList<String>(), dups, msg);
     }