This is an automated email from the ASF dual-hosted git repository. apalumbo pushed a commit to branch mahout-14.1 in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 6366f61be8f38560902f97f1c413cdc95f3c4013 Author: Andrew Palumbo <[email protected]> AuthorDate: Mon Oct 28 23:11:35 2019 -0700 tweaks to release --- src/main/resources/assemblies/bin.xml | 1 - src/main/resources/assemblies/src.xml | 5 ++--- src/pom.xml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml index a44f7e0..9b965e4 100644 --- a/src/main/resources/assemblies/bin.xml +++ b/src/main/resources/assemblies/bin.xml @@ -8,7 +8,6 @@ <formats> <format>tar.gz</format> <format>tar.bz2</format> - <format>zip</format> </formats> <fileSets> diff --git a/src/main/resources/assemblies/src.xml b/src/main/resources/assemblies/src.xml index 909212b..23ddc0c 100644 --- a/src/main/resources/assemblies/src.xml +++ b/src/main/resources/assemblies/src.xml @@ -18,7 +18,6 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0";> <id>src</id> <formats> - <format>zip</format> <format>tar.gz</format> <format>tar.bz2</format> </formats> @@ -39,8 +38,8 @@ <include>*Dockerfile*</include> <include>*entrypoint.sh*</include> <include>src/pom.xml</include> - <include>src/main/assembly/bin.xml</include> - <include>src/main/assembly/src.xml</include> + <include>src/main/assemblies/bin.xml</include> + <include>src/main/assemblies/src.xml</include> </includes> <excludes> <exclude>**/target/**</exclude> diff --git a/src/pom.xml b/src/pom.xml index 841d1e1..3eda183 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -32,37 +32,37 @@ <version>3.1.1</version> <dependencies> <dependency> - <groupId>org.apache</groupId> - <artifactId>mahout</artifactId> + <groupId>org.apache.mahout</groupId> + <artifactId>apache-mahout-distribution</artifactId> <version>${project.version}</version> </dependency> </dependencies> <executions> <execution> - <id>bin</id> + <id>bin-assembly</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> - <skipAssembly>${mahout.skip.distribution}</skipAssembly> + <skipAssembly>false</skipAssembly> <descriptors> - <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor> + <descriptor>${project.basedir}/src/main/resources/assemblies/bin.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> - <id>srcy</id> + <id>src-assembly</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> - <skipAssembly>${mahout.skip.distribution}</skipAssembly> + <skipAssembly>false</skipAssembly> <descriptors> - <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor> + <descriptor>${project.basedir}/src/main/resources/assemblies/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>true</appendAssemblyId>
