Move back mvn script into the mvn/bin folder to avoid conflicts, fixes …

…#787 (#803)
apache · Mar 10, 2023 · d771375 · d771375
1 parent c2e4ee2
commit d771375
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 21 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
@@ -345,8 +345,8 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
             // classpath
             String mvndAgentPath = null;
             String plexusClassworldsPath = null;
-            try (DirectoryStream<Path> jarPaths =
-                    Files.newDirectoryStream(mvndHome.resolve("lib").resolve("ext"))) {
+            try (DirectoryStream<Path> jarPaths = Files.newDirectoryStream(
+                    mvndHome.resolve("mvn").resolve("lib").resolve("ext"))) {
                 for (Path jar : jarPaths) {
                     String s = jar.getFileName().toString();
                     if (s.endsWith(".jar")) {
@@ -356,7 +356,8 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
                     }
                 }
             }
-            try (DirectoryStream<Path> jarPaths = Files.newDirectoryStream(mvndHome.resolve("boot"))) {
+            try (DirectoryStream<Path> jarPaths =
+                    Files.newDirectoryStream(mvndHome.resolve("mvn").resolve("boot"))) {
                 for (Path jar : jarPaths) {
                     String s = jar.getFileName().toString();
                     if (s.endsWith(".jar")) {
@@ -367,7 +368,7 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
                 }
             }
             if (mvndAgentPath == null) {
-                throw new IllegalStateException("Could not find mvnd-agent jar in lib/ext/");
+                throw new IllegalStateException("Could not find mvnd-agent jar in mvn/lib/ext/");
             }
             if (plexusClassworldsPath == null) {
                 throw new IllegalStateException("Could not find plexus-classworlds jar in boot/");
@@ -428,8 +429,8 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
             }
 
             Environment.MVND_HOME.addSystemProperty(args, mvndHome.toString());
-            args.add("-Dmaven.home=" + mvndHome);
-            args.add("-Dmaven.conf=" + mvndHome.resolve("conf"));
+            args.add("-Dmaven.home=" + mvndHome.resolve("mvn"));
+            args.add("-Dmaven.conf=" + mvndHome.resolve("mvn").resolve("conf"));
             args.add("-Dclassworlds.conf=" + mvndHome.resolve("bin").resolve("mvnd-server.conf"));
 
             Environment.MVND_JAVA_HOME.addSystemProperty(

diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -124,8 +124,11 @@ private String mvndHomeFromExecutable() {
             if (mvndH != null) {
                 Path mvndDaemon =
                         Paths.get("mvnd-daemon-" + BuildProperties.getInstance().getVersion() + ".jar");
-                if (Files.exists(mvndH.resolve("lib").resolve(mvndDaemon))
-                        || Files.exists(mvndH.resolve("lib").resolve("ext").resolve(mvndDaemon))) {
+                if (Files.exists(mvndH.resolve("mvn").resolve("lib").resolve(mvndDaemon))
+                        || Files.exists(mvndH.resolve("mvn")
+                                .resolve("lib")
+                                .resolve("ext")
+                                .resolve(mvndDaemon))) {
                     return mvndH.toString();
                 }
             }
@@ -239,8 +242,9 @@ public Path multiModuleProjectDirectory(Path projectDir) {
 
     public Path logbackConfigurationPath() {
         return property(Environment.MVND_LOGBACK)
-                .orDefault(() ->
-                        mvndHome().resolve("conf/logging/logback-mvnd.xml").toString())
+                .orDefault(() -> mvndHome()
+                        .resolve("mvn/conf/logging/logback-server.xml")
+                        .toString())
                 .orFail()
                 .asPath();
     }

diff --git a/dist-m39/src/main/provisio/maven-distro.xml b/dist-m39/src/main/provisio/maven-distro.xml
@@ -17,14 +17,14 @@
 -->
 <assembly>
 
-    <artifactSet to="/">
+    <artifactSet to="/mvn">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin:${maven3.version}">
             <unpack useRoot="false"
                     excludes="conf/logging/*,lib/maven-slf4j-provider*" />
         </artifact>
     </artifactSet>
 
-    <artifactSet to="/lib">
+    <artifactSet to="/mvn/lib">
         <artifact id="ch.qos.logback:logback-classic">
             <exclusion id="*:*"/>
         </artifact>
@@ -33,7 +33,7 @@
         </artifact>
     </artifactSet>
 
-    <artifactSet to="/lib/ext">
+    <artifactSet to="/mvn/lib/ext">
         <artifact id="io.takari.maven:takari-smart-builder:${takari-smart-builder.version}">
             <exclusion id="*:*"/>
         </artifact>

diff --git a/dist-m40/src/main/provisio/maven-distro.xml b/dist-m40/src/main/provisio/maven-distro.xml
@@ -17,14 +17,14 @@
 -->
 <assembly>
 
-    <artifactSet to="/">
+    <artifactSet to="/mvn">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin:${maven4.version}">
             <unpack useRoot="false"
                     excludes="conf/logging/*,lib/maven-slf4j-provider*,lib/plexus-utils-3.*" />
         </artifact>
     </artifactSet>
 
-    <artifactSet to="/lib">
+    <artifactSet to="/mvn/lib">
         <artifact id="ch.qos.logback:logback-classic">
             <exclusion id="*:*"/>
         </artifact>
@@ -33,7 +33,7 @@
         </artifact>
     </artifactSet>
 
-    <artifactSet to="/lib/ext">
+    <artifactSet to="/mvn/lib/ext">
         <artifact id="io.takari.maven:takari-smart-builder:${takari-smart-builder.version}">
             <exclusion id="*:*"/>
         </artifact>

diff --git a/dist/src/main/distro/bin/mvnd.conf → dist/src/main/distro/bin/mvnd-client.conf b/dist/src/main/distro/bin/mvnd.conf → dist/src/main/distro/bin/mvnd-client.conf
@@ -16,7 +16,7 @@
 # under the License.
 main is org.mvndaemon.mvnd.client.DefaultClient from plexus.core
 
-set maven.home default ${mvnd.home}
+set maven.home default ${mvnd.home}/mvn
 set maven.conf default ${maven.home}/conf
 
 set logback.configurationFile default ${maven.conf}/logging/logback-client.xml

diff --git a/dist/src/main/distro/bin/mvnd-server.conf b/dist/src/main/distro/bin/mvnd-server.conf
@@ -16,9 +16,12 @@
 # under the License.
 main is org.mvndaemon.mvnd.daemon.Server from plexus.core
 
-set maven.home default ${mvnd.home}
+set maven.home default ${mvnd.home}/mvn
 set maven.conf default ${maven.home}/conf
 
+set logback.configurationFile default ${maven.conf}/logging/logback-server.xml
+set logback.configurationFile.fallback default ${maven.conf}/logging/logback.xml
+
 [plexus.core]
 load       ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar

diff --git a/dist/src/main/distro/bin/mvnd.cmd b/dist/src/main/distro/bin/mvnd.cmd
@@ -197,7 +197,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   %MAVEN_OPTS% ^
   %MAVEN_DEBUG_OPTS% ^
   -classpath %CLASSWORLDS_JAR% ^
-  "-Dclassworlds.conf=%MVND_HOME%\bin\mvnd.conf"
+  "-Dclassworlds.conf=%MVND_HOME%\bin\mvnd-client.conf" ^
   "-Dmvnd.home=%MVND_HOME%" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%

diff --git a/dist/src/main/distro/bin/mvnd.sh b/dist/src/main/distro/bin/mvnd.sh
@@ -219,7 +219,7 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "${CLASSWORLDS_JAR}" \
-  "-Dclassworlds.conf=${MVND_HOME}/bin/mvnd.conf" \
+  "-Dclassworlds.conf=${MVND_HOME}/bin/mvnd-client.conf" \
   "-Dmvnd.home=${MVND_HOME}" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"
diff --git a/dist/src/main/distro/bin/mvn → dist/src/main/distro/mvn/bin/mvn b/dist/src/main/distro/bin/mvn → dist/src/main/distro/mvn/bin/mvn
diff --git a/dist/src/main/distro/bin/mvn.cmd → dist/src/main/distro/mvn/bin/mvn.cmd b/dist/src/main/distro/bin/mvn.cmd → dist/src/main/distro/mvn/bin/mvn.cmd
diff --git a/dist/src/main/distro/bin/mvn.conf → dist/src/main/distro/mvn/bin/mvn.conf b/dist/src/main/distro/bin/mvn.conf → dist/src/main/distro/mvn/bin/mvn.conf
@@ -18,6 +18,9 @@ main is org.apache.maven.cli.MavenCli from plexus.core
 
 set maven.conf default ${maven.home}/conf
 
+set logback.configurationFile default ${maven.conf}/logging/logback-mvn.xml
+set logback.configurationFile.fallback default ${maven.conf}/logging/logback.xml
+
 [plexus.core]
 load       ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar

diff --git a/dist/src/main/distro/bin/mvnDebug → dist/src/main/distro/mvn/bin/mvnDebug b/dist/src/main/distro/bin/mvnDebug → dist/src/main/distro/mvn/bin/mvnDebug
diff --git a/dist/src/main/distro/bin/mvnDebug.cmd → dist/src/main/distro/mvn/bin/mvnDebug.cmd b/dist/src/main/distro/bin/mvnDebug.cmd → dist/src/main/distro/mvn/bin/mvnDebug.cmd
diff --git a/...in/distro/conf/logging/logback-client.xml → ...istro/mvn/conf/logging/logback-client.xml b/...in/distro/conf/logging/logback-client.xml → ...istro/mvn/conf/logging/logback-client.xml
diff --git a/...main/distro/conf/logging/logback-mvnd.xml → ...istro/mvn/conf/logging/logback-server.xml b/...main/distro/conf/logging/logback-mvnd.xml → ...istro/mvn/conf/logging/logback-server.xml
diff --git a/.../src/main/distro/conf/logging/logback.xml → .../main/distro/mvn/conf/logging/logback.xml b/.../src/main/distro/conf/logging/logback.xml → .../main/distro/mvn/conf/logging/logback.xml
diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java
@@ -52,7 +52,7 @@ void version() throws IOException, InterruptedException {
                         "-DforceStdout",
                         "--raw-streams")
                 .assertSuccess();
-        String conf = parameters.mvndHome().resolve("conf").toString();
+        String conf = parameters.mvndHome().resolve("mvn").resolve("conf").toString();
         assertTrue(
                 o.getMessages().stream().anyMatch(m -> m.toString().contains(conf)), "Output should contain " + conf);
     }