This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch release-script
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/release-script by this push:
new 020ad94b Rename maven-${version}-mvnd-mvn(39|40)-yyy to
maven-mvnd-${version}-m(39|40)-yyy
020ad94b is described below
commit 020ad94b802247fde6d81ef8c8f4a5e3daad647e
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Mar 23 07:06:01 2023 +0100
Rename maven-${version}-mvnd-mvn(39|40)-yyy to
maven-mvnd-${version}-m(39|40)-yyy
---
.github/workflows/release.yaml | 72 ++++++++++++++---------------
dist-m39/pom.xml | 2 +-
dist-m39/src/main/provisio/maven-distro.xml | 4 +-
dist-m40/pom.xml | 2 +-
dist-m40/src/main/provisio/maven-distro.xml | 4 +-
integration-tests/pom.xml | 4 +-
6 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 11395ed9..4abcd37a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -186,123 +186,123 @@ jobs:
asset_name: maven-mvnd-${{ env.VERSION }}-src.tar.gz
asset_content_type: application/tar.gz
- - name: Deploy maven-mvnd-mvn39-linux-amd64.zip
+ - name: Deploy maven-mvnd-m39-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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-linux-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.zip
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-linux-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn39-linux-amd64.tar.gz
+ - name: Deploy maven-mvnd-m39-linux-amd64.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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-linux-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.tar.gz
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-linux-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.tar.gz
asset_content_type: application/x-gzip
- - name: Deploy maven-mvnd-mvn39-darwin-amd64.zip
+ - name: Deploy maven-mvnd-m39-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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-darwin-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.zip
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-darwin-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn39-darwin-amd64.tar.gz
+ - name: Deploy maven-mvnd-m39-darwin-amd64.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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-darwin-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.tar.gz
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-darwin-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.tar.gz
asset_content_type: application/x-gzip
- - name: Deploy maven-mvnd-mvn39-windows-amd64.zip
+ - name: Deploy maven-mvnd-m39-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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-windows-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.zip
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-windows-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn39-windows-amd64.tar.gz
+ - name: Deploy maven-mvnd-m39-windows-amd64.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/dist-m39/target/maven-${{ env.VERSION
}}-mvnd-mvn39-windows-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.tar.gz
+ asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION
}}-m39-windows-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.tar.gz
asset_content_type: application/x-gzip
- - name: Deploy maven-mvnd-mvn40-linux-amd64.zip
+ - name: Deploy maven-mvnd-m40-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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-linux-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.zip
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-linux-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn40-linux-amd64.tar.gz
+ - name: Deploy maven-mvnd-m40-linux-amd64.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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-linux-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.tar.gz
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-linux-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.tar.gz
asset_content_type: application/x-gzip
- - name: Deploy maven-mvnd-mvn40-darwin-amd64.zip
+ - name: Deploy maven-mvnd-m40-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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-darwin-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.zip
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-darwin-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn40-darwin-amd64.tar.gz
+ - name: Deploy maven-mvnd-m40-darwin-amd64.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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-darwin-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.tar.gz
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-darwin-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.tar.gz
asset_content_type: application/x-gzip
- - name: Deploy maven-mvnd-mvn40-windows-amd64.zip
+ - name: Deploy maven-mvnd-m40-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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-windows-amd64.zip
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.zip
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-windows-amd64.zip
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.zip
asset_content_type: application/zip
- - name: Deploy maven-mvnd-mvn40-windows-amd64.tar.gz
+ - name: Deploy maven-mvnd-m40-windows-amd64.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/dist-m40/target/maven-${{ env.VERSION
}}-mvnd-mvn40-windows-amd64.tar.gz
- asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.tar.gz
+ asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION
}}-m40-windows-amd64.tar.gz
+ asset_name: maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.tar.gz
asset_content_type: application/x-gzip
diff --git a/dist-m39/pom.xml b/dist-m39/pom.xml
index bdd41915..d596b3e0 100644
--- a/dist-m39/pom.xml
+++ b/dist-m39/pom.xml
@@ -71,7 +71,7 @@
</goals>
<phase>package</phase>
<configuration>
-
<outputDirectory>${project.build.directory}/maven-${project.version}-mvnd-m39-${os.detected.name}-${os.detected.arch}</outputDirectory>
+
<outputDirectory>${project.build.directory}/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}</outputDirectory>
</configuration>
</execution>
</executions>
diff --git a/dist-m39/src/main/provisio/maven-distro.xml
b/dist-m39/src/main/provisio/maven-distro.xml
index 5f4c1abd..f2b2759c 100644
--- a/dist-m39/src/main/provisio/maven-distro.xml
+++ b/dist-m39/src/main/provisio/maven-distro.xml
@@ -93,10 +93,10 @@
</directory>
</fileSet>
- <archive
name="maven-${project.version}-mvnd-mvn39-${os.detected.name}-${os.detected.arch}.zip"
+ <archive
name="maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}.zip"
executable="**/bin/mvnd"/>
- <archive
name="maven-${project.version}-mvnd-mvn39-${os.detected.name}-${os.detected.arch}.tar.gz"
+ <archive
name="maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}.tar.gz"
executable="**/bin/mvnd"/>
</assembly>
diff --git a/dist-m40/pom.xml b/dist-m40/pom.xml
index 08a98724..c665b9ca 100644
--- a/dist-m40/pom.xml
+++ b/dist-m40/pom.xml
@@ -71,7 +71,7 @@
</goals>
<phase>package</phase>
<configuration>
-
<outputDirectory>${project.build.directory}/maven-${project.version}-mvnd-m40-${os.detected.name}-${os.detected.arch}</outputDirectory>
+
<outputDirectory>${project.build.directory}/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}</outputDirectory>
</configuration>
</execution>
</executions>
diff --git a/dist-m40/src/main/provisio/maven-distro.xml
b/dist-m40/src/main/provisio/maven-distro.xml
index ba287ddf..7cdea145 100644
--- a/dist-m40/src/main/provisio/maven-distro.xml
+++ b/dist-m40/src/main/provisio/maven-distro.xml
@@ -93,10 +93,10 @@
</directory>
</fileSet>
- <archive
name="maven-${project.version}-mvnd-mvn40-${os.detected.name}-${os.detected.arch}.zip"
+ <archive
name="maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}.zip"
executable="**/bin/mvnd"/>
- <archive
name="maven-${project.version}-mvnd-mvn40-${os.detected.name}-${os.detected.arch}.tar.gz"
+ <archive
name="maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}.tar.gz"
executable="**/bin/mvnd"/>
</assembly>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index caed3e52..1fe38feb 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,8 +32,8 @@
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
-
<mvnd.m39.home>${project.basedir}/../dist-m39/target/maven-${project.version}-mvnd-m39-${os.detected.name}-${os.detected.arch}</mvnd.m39.home>
-
<mvnd.m40.home>${project.basedir}/../dist-m40/target/maven-${project.version}-mvnd-m40-${os.detected.name}-${os.detected.arch}</mvnd.m40.home>
+
<mvnd.m39.home>${project.basedir}/../dist-m39/target/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}</mvnd.m39.home>
+
<mvnd.m40.home>${project.basedir}/../dist-m40/target/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}</mvnd.m40.home>
<preinstall.artifacts>org/apache/maven/surefire/surefire-providers/${surefire.version}
org/apache/maven/surefire/surefire-junit-platform/${surefire.version}
org/junit/platform/junit-platform-launcher/${junit-platform-launcher.version}
