apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-17 16:07:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use amd64 arch label also on Mac

Browse Source
This commit is contained in:
Peter Palaga
2020-08-15 08:47:52 +02:00
parent 469c43091e
commit d335f0db37
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/verify.yaml vendored
View File

@@ -176,7 +176,6 @@ jobs:
fi
echo "Using VERSION=$VERSION"
echo "::set-env name=VERSION::$VERSION"
mv ./mvnd-dist.zip/mvnd-dist-*.zip ./mvnd-dist.zip/mvnd-dist.zip
- name: Create Release
id: create_release

4
daemon/pom.xml
View File

@@ -30,10 +30,6 @@
<packaging>jar</packaging>
<name>Maven Daemon</name>
<properties>
<os.arch>${os.arch}</os.arch><!-- provisio plugin does not see system properties -->
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>

10
daemon/src/main/provisio/maven-distro.xml
View File

@@ -17,28 +17,28 @@
-->
<assembly>
<artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
<artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
<artifact id="org.apache.maven:apache-maven:tar.gz:bin">
<unpack useRoot="false"
excludes="lib/slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*"/>
</artifact>
</artifactSet>
<artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/lib">
<artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/lib">
<artifact id="org.apache.maven:maven-embedder"/>
<artifactSet to="ext" ref="runtime.classpath"/>
</artifactSet>
<fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
<fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
<directory path="${basedir}/src/main/distro"/>
</fileSet>
<fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/bin">
<fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/bin">
<directory path="${basedir}/../client/target">
<include>mvnd</include>
<include>mvnd.exe</include>
</directory>
</fileSet>
<archive name="mvnd-${project.version}-${os.detected.name}-${os.arch}.zip" executable="**/bin/mvnd"/>
<archive name="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}.zip" executable="**/bin/mvnd"/>
</assembly>

2
integration-tests/pom.xml
View File

@@ -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.arch}</mvnd.home>
<mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
</properties>
<dependencies>