You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2019/10/28 22:14:54 UTC
[mahout] 05/06: fix assembly descriptors
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 28c3ce0b2f1787a25a46fc9ad9734cbc6cd42d87
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Mon Oct 28 14:55:23 2019 -0700
fix assembly descriptors
---
community/spark-cli-drivers/pom.xml | 2 +-
engine/hdfs/pom.xml | 6 +-
engine/spark/pom.xml | 6 +-
pom.xml | 11 +-
.../{assembly => resources/assemblies}/bin.xml | 9 +-
.../{assembly => resources/assemblies}/src.xml | 0
src/pom.xml | 115 ++++++++++++---------
7 files changed, 86 insertions(+), 63 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index a5bd7a6..5ce062b 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-community</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index b2c8dcd..f1cf1ab 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -183,13 +183,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 549fcaf..60c9e21 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -252,7 +252,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index e50634b..942bbb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -616,19 +616,20 @@
<plugins>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version></version>
- <executions>
- <execution>
+
<id>bin-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
+
<skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <executions>
+ <execution>
<descriptors>
<descriptor>${project.basedir}/src/main/assembly/bin.xml</descriptor>
</descriptors>
@@ -652,7 +653,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
diff --git a/src/main/assembly/bin.xml b/src/main/resources/assemblies/bin.xml
similarity index 91%
rename from src/main/assembly/bin.xml
rename to src/main/resources/assemblies/bin.xml
index 9c4431d..a44f7e0 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/resources/assemblies/bin.xml
@@ -1,7 +1,8 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0">
<id>bin</id>
<formats>
@@ -18,7 +19,7 @@
<fileSet>
<directory>${project.base.directory}</directory>
- <outputDirectory>${project.base.directory}</outputDirectory>
+ <outputDirectory>${project.base.directory}/lib/</outputDirectory>
<includes>
<include>**README*</include>
<include>**LICENSE*</include>
@@ -45,7 +46,7 @@
<outputDirectory>docs</outputDirectory>
</fileSet>
- <!--copy bin/mahout.sh -->
+ <!--copy bin/mahout.sh and other scripts -->
<fileSet>
<directory>${project.base.directory}/bin</directory>
<fileMode>755</fileMode>
diff --git a/src/main/assembly/src.xml b/src/main/resources/assemblies/src.xml
similarity index 100%
rename from src/main/assembly/src.xml
rename to src/main/resources/assemblies/src.xml
diff --git a/src/pom.xml b/src/pom.xml
index 9b1ecb1..841d1e1 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -19,54 +19,56 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
<version>14.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>./../pom.xml</relativePath>
</parent>
<artifactId>apache-mahout-distribution</artifactId>
<name>Mahout Release Package</name>
<description>Distribution Package</description>
<packaging>pom</packaging>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
-
- <id>bin-assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>mahout</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>bin</id>
<phase>package</phase>
- <executions>
- <execution>
-
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
-
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>srcy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -77,6 +79,29 @@
<properties>
<mahout.skip.distribution>false</mahout.skip.distribution>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-core_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-hdfs_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-spark_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
</profile>
<profile>
<id>viennacl</id>
@@ -151,11 +176,7 @@
<dependencies>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-math</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-integration</artifactId>
+ <artifactId>mahout-core_2.12</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>