From 8f322e7b0ba05dfd7e8037fcb8e0ced58f7a21ce Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Fri, 23 Oct 2020 18:21:23 +0200
Subject: [PATCH] Split daemon module into daemon and dist #130

---
 .github/workflows/verify.yaml                 | 22 +++++--
 daemon/pom.xml                                | 37 -----------
 dist/pom.xml                                  | 65 +++++++++++++++++++
 {daemon => dist}/src/main/distro/bin/mvnd.sh  |  0
 {daemon => dist}/src/main/distro/bin/mvns.sh  |  0
 .../src/main/distro/mvn/bin/m2.conf           |  0
 {daemon => dist}/src/main/distro/mvn/bin/mvn  |  0
 .../src/main/distro/mvn/bin/mvn.cmd           |  0
 .../distro/mvn/conf/logging/logback-mvn.xml   |  0
 .../main/distro/mvn/conf/logging/logback.xml  |  0
 .../src/main/provisio/maven-distro.xml        |  0
 integration-tests/pom.xml                     | 15 +----
 .../org/jboss/fuse/mvnd/it}/DistroIT.java     |  2 +-
 pom.xml                                       |  7 ++
 14 files changed, 92 insertions(+), 56 deletions(-)
 create mode 100644 dist/pom.xml
 rename {daemon => dist}/src/main/distro/bin/mvnd.sh (100%)
 rename {daemon => dist}/src/main/distro/bin/mvns.sh (100%)
 rename {daemon => dist}/src/main/distro/mvn/bin/m2.conf (100%)
 rename {daemon => dist}/src/main/distro/mvn/bin/mvn (100%)
 rename {daemon => dist}/src/main/distro/mvn/bin/mvn.cmd (100%)
 rename {daemon => dist}/src/main/distro/mvn/conf/logging/logback-mvn.xml (100%)
 rename {daemon => dist}/src/main/distro/mvn/conf/logging/logback.xml (100%)
 rename {daemon => dist}/src/main/provisio/maven-distro.xml (100%)
 rename {daemon/src/test/java/org/jboss/fuse/mvnd/dist => integration-tests/src/test/java/org/jboss/fuse/mvnd/it}/DistroIT.java (99%)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 96c9ff90..f7203834 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -29,6 +29,9 @@ jobs:
 
     - uses: actions/checkout@v1
 
+    - name: Set VERSION env var
+      run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
     - name: setup-graalvm-ce
       uses: DeLaGuardo/setup-graalvm@3
       with:
@@ -50,13 +53,13 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: daemon-test-logs-linux
-        path: daemon/target/maven-distro/daemon
+        path: dist/target/mvnd-${{ env.VERSION }}-linux-amd64/daemon
 
     - name: Upload mvnd.zip
       uses: actions/upload-artifact@v2
       with:
         name: mvnd-linux-amd64.zip
-        path: daemon/target/maven-distro/mvnd-*.zip
+        path: dist/target/mvnd-*.zip
 
   windows:
     runs-on: windows-2019
@@ -97,6 +100,10 @@ jobs:
 
     - uses: actions/checkout@v1
 
+    - name: Set VERSION env var
+      shell: bash
+      run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
     - name: Skip tests when releasing from a tag
       if: startsWith(github.ref, 'refs/tags')
       shell: bash
@@ -113,13 +120,13 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: daemon-test-logs-windows
-        path: daemon/target/maven-distro/daemon
+        path: dist/target/mvnd-${{ env.VERSION }}-windows-amd64/daemon
 
     - name: Upload mvnd.zip
       uses: actions/upload-artifact@v2
       with:
         name: mvnd-windows-amd64.zip
-        path: daemon/target/maven-distro/mvnd-*.zip
+        path: dist/target/mvnd-*.zip
 
   darwin:
     runs-on: macos-10.15
@@ -127,6 +134,9 @@ jobs:
 
     - uses: actions/checkout@v1
 
+    - name: Set VERSION env var
+      run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
     - name: setup-graalvm-ce
       uses: DeLaGuardo/setup-graalvm@3
       with:
@@ -148,13 +158,13 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: daemon-test-logs-darwin
-        path: daemon/target/maven-distro/daemon
+        path: dist/target/mvnd-${{ env.VERSION }}-darwin-amd64/daemon
 
     - name: Upload mvnd.zip
       uses: actions/upload-artifact@v2
       with:
         name: mvnd-darwin-amd64.zip
-        path: daemon/target/maven-distro/mvnd-*.zip
+        path: dist/target/mvnd-*.zip
 
   deploy:
     runs-on: ubuntu-18.04
diff --git a/daemon/pom.xml b/daemon/pom.xml
index d3b19d6c..a75bd369 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -41,10 +41,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.fuse.mvnd</groupId>
-            <artifactId>mvnd-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-embedder</artifactId>
@@ -96,23 +92,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <mvnd.home>${project.basedir}/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>io.takari.maven.plugins</groupId>
                 <artifactId>takari-lifecycle-plugin</artifactId>
@@ -125,22 +104,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
-                <artifactId>provisio-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>maven-distro</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>provision</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/dist/pom.xml b/dist/pom.xml
new file mode 100644
index 00000000..25095da9
--- /dev/null
+++ b/dist/pom.xml
@@ -0,0 +1,65 @@
+<!--
+
+    Copyright 2019 the original author or authors.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jboss.fuse.mvnd</groupId>
+        <artifactId>mvnd</artifactId>
+        <version>0.0.9-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>mvnd-dist</artifactId>
+
+    <packaging>pom</packaging>
+    <name>Maven Daemon Distribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.fuse.mvnd</groupId>
+            <artifactId>mvnd-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.fuse.mvnd</groupId>
+            <artifactId>mvnd-daemon</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
+                <artifactId>provisio-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-distro</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>provision</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/daemon/src/main/distro/bin/mvnd.sh b/dist/src/main/distro/bin/mvnd.sh
similarity index 100%
rename from daemon/src/main/distro/bin/mvnd.sh
rename to dist/src/main/distro/bin/mvnd.sh
diff --git a/daemon/src/main/distro/bin/mvns.sh b/dist/src/main/distro/bin/mvns.sh
similarity index 100%
rename from daemon/src/main/distro/bin/mvns.sh
rename to dist/src/main/distro/bin/mvns.sh
diff --git a/daemon/src/main/distro/mvn/bin/m2.conf b/dist/src/main/distro/mvn/bin/m2.conf
similarity index 100%
rename from daemon/src/main/distro/mvn/bin/m2.conf
rename to dist/src/main/distro/mvn/bin/m2.conf
diff --git a/daemon/src/main/distro/mvn/bin/mvn b/dist/src/main/distro/mvn/bin/mvn
similarity index 100%
rename from daemon/src/main/distro/mvn/bin/mvn
rename to dist/src/main/distro/mvn/bin/mvn
diff --git a/daemon/src/main/distro/mvn/bin/mvn.cmd b/dist/src/main/distro/mvn/bin/mvn.cmd
similarity index 100%
rename from daemon/src/main/distro/mvn/bin/mvn.cmd
rename to dist/src/main/distro/mvn/bin/mvn.cmd
diff --git a/daemon/src/main/distro/mvn/conf/logging/logback-mvn.xml b/dist/src/main/distro/mvn/conf/logging/logback-mvn.xml
similarity index 100%
rename from daemon/src/main/distro/mvn/conf/logging/logback-mvn.xml
rename to dist/src/main/distro/mvn/conf/logging/logback-mvn.xml
diff --git a/daemon/src/main/distro/mvn/conf/logging/logback.xml b/dist/src/main/distro/mvn/conf/logging/logback.xml
similarity index 100%
rename from daemon/src/main/distro/mvn/conf/logging/logback.xml
rename to dist/src/main/distro/mvn/conf/logging/logback.xml
diff --git a/daemon/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
similarity index 100%
rename from daemon/src/main/provisio/maven-distro.xml
rename to dist/src/main/provisio/maven-distro.xml
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index a61c8e76..45e84c9b 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
-        <mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
+        <mvnd.home>${project.basedir}/../dist/target/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
     </properties>
 
     <dependencies>
@@ -48,17 +48,8 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.fuse.mvnd</groupId>
-            <artifactId>mvnd-daemon</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.fuse.mvnd</groupId>
-            <artifactId>mvnd-common</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.fuse.mvnd</groupId>
-            <artifactId>mvnd-client</artifactId>
+            <artifactId>mvnd-dist</artifactId>
+            <type>pom</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/daemon/src/test/java/org/jboss/fuse/mvnd/dist/DistroIT.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/DistroIT.java
similarity index 99%
rename from daemon/src/test/java/org/jboss/fuse/mvnd/dist/DistroIT.java
rename to integration-tests/src/test/java/org/jboss/fuse/mvnd/it/DistroIT.java
index ab2d96aa..c64018c3 100644
--- a/daemon/src/test/java/org/jboss/fuse/mvnd/dist/DistroIT.java
+++ b/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/DistroIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.fuse.mvnd.dist;
+package org.jboss.fuse.mvnd.it;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/pom.xml b/pom.xml
index eca05ccc..51cc50b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
         <module>common</module>
         <module>client</module>
         <module>daemon</module>
+        <module>dist</module>
         <module>integration-tests</module>
     </modules>
 
@@ -168,6 +169,12 @@
                 <artifactId>mvnd-common</artifactId>
                 <version>0.0.9-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.fuse.mvnd</groupId>
+                <artifactId>mvnd-dist</artifactId>
+                <type>pom</type>
+                <version>0.0.9-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.fuse.mvnd</groupId>
                 <artifactId>mvnd-daemon</artifactId>