From 50bfcf8c151b6857704b21731ea75125cfcfbbfe Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 4 May 2022 12:02:10 +0200
Subject: [PATCH] Use maven-mvnd as a distribution name (#638)

---
 .github/workflows/release.yaml          | 36 ++++++++++++-------------
 dist/src/main/provisio/maven-distro.xml |  2 +-
 pom.xml                                 |  1 +
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 546d8894..3fc3f056 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -66,7 +66,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            dist/target/mvnd-*.zip
+            dist/target/maven-mvnd-*.zip
 
   source:
     name: 'Build source distributions'
@@ -99,8 +99,8 @@ jobs:
         with:
           name: artifacts
           path: |
-            target/mvnd-*.zip
-            target/mvnd-*.tar.gz
+            target/maven-mvnd-*.zip
+            target/maven-mvnd-*.tar.gz
 
   release:
     runs-on: ubuntu-18.04
@@ -146,52 +146,52 @@ jobs:
           draft: true
           prerelease: false
 
-      - name: Deploy mvnd-src.zip
+      - name: Deploy maven-mvnd-src.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/mvnd-${{ env.VERSION }}-src.zip
-          asset_name: mvnd-${{ env.VERSION }}-src.zip
+          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-src.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-src.zip
           asset_content_type: application/zip
 
-      - name: Deploy mvnd-src.tar.gz
+      - name: Deploy maven-mvnd-src.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/mvnd-${{ env.VERSION }}-src.tar.gz
-          asset_name: mvnd-${{ env.VERSION }}-src.tar.gz
+          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-src.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-src.tar.gz
           asset_content_type: application/tar.gz
 
-      - name: Deploy mvnd-linux-amd64.zip
+      - name: Deploy maven-mvnd-linux-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/mvnd-${{ env.VERSION }}-linux-amd64.zip
-          asset_name: mvnd-${{ env.VERSION }}-linux-amd64.zip
+          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-linux-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-linux-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy mvnd-darwin-amd64.zip
+      - name: Deploy maven-mvnd-darwin-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/mvnd-${{ env.VERSION }}-darwin-amd64.zip
-          asset_name: mvnd-${{ env.VERSION }}-darwin-amd64.zip
+          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-darwin-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-darwin-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy mvnd-windows-amd64.zip
+      - name: Deploy maven-mvnd-windows-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/mvnd-${{ env.VERSION }}-windows-amd64.zip
-          asset_name: mvnd-${{ env.VERSION }}-windows-amd64.zip
+          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-windows-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-windows-amd64.zip
           asset_content_type: application/zip
diff --git a/dist/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
index 0b87833c..06007faa 100644
--- a/dist/src/main/provisio/maven-distro.xml
+++ b/dist/src/main/provisio/maven-distro.xml
@@ -93,6 +93,6 @@
         </directory>
     </fileSet>
 
-    <archive name="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}.zip" executable="**/bin/mvnd"/>
+    <archive name="maven-mvnd-${project.version}-${os.detected.name}-${os.detected.arch}.zip" executable="**/bin/mvnd"/>
 
 </assembly>
diff --git a/pom.xml b/pom.xml
index c6a9efa1..414b3f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -564,6 +564,7 @@ limitations under the License.</inlineHeader>
                                     <goal>single</goal>
                                 </goals>
                                 <configuration>
+                                    <finalName>maven-mvnd-${project.version}</finalName>
                                     <descriptors>
                                         <descriptor>src/main/assembly/src.xml</descriptor>
                                     </descriptors>