Repository: mahout Updated Branches: refs/heads/master ef5820f22 -> 74766e309 (forced update)
MAHOUT-1998 Naming Spark Artifacts closes apache/mahout#330 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/74766e30 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/74766e30 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/74766e30 Branch: refs/heads/master Commit: 74766e309cb371059ce73fe2f7a585d6757662a4 Parents: 2be27b3 Author: rawkintrevo <[email protected]> Authored: Tue Jul 11 08:57:34 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Tue Jul 11 08:58:24 2017 -0500 ---------------------------------------------------------------------- distribution/pom.xml | 6 ++++++ pom.xml | 3 +++ spark/pom.xml | 12 +++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/74766e30/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 2297ac3..ec89df1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -105,6 +105,8 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.mahout</groupId> @@ -148,6 +150,8 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.mahout</groupId> @@ -186,6 +190,8 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.mahout</groupId> http://git-wip-us.apache.org/repos/asf/mahout/blob/74766e30/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f1d2b1b..025ee50 100644 --- a/pom.xml +++ b/pom.xml @@ -949,6 +949,7 @@ </activation> <properties> <spark.version>1.6.3</spark.version> + <spark.compat.version>1.6</spark.compat.version> </properties> </profile> <profile> @@ -958,6 +959,7 @@ </activation> <properties> <spark.version>2.0.2</spark.version> + <spark.compat.version>2.0</spark.compat.version> </properties> </profile> <profile> @@ -967,6 +969,7 @@ </activation> <properties> <spark.version>2.1.0</spark.version> + <spark.compat.version>2.1</spark.compat.version> </properties> </profile> <profile> http://git-wip-us.apache.org/repos/asf/mahout/blob/74766e30/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index cc19b3f..f93933a 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -130,7 +130,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-spark_${scala.compat.version}-${version}.jar" tofile="../mahout-spark_${scala.compat.version}-${version}.jar" /> + <copy file="target/mahout-spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" tofile="../mahout-spark_${scala.compat.version}-${version}spark_${spark.compat.version}.jar" /> <copy file="target/mahout-spark_${scala.compat.version}-${version}-dependency-reduced.jar" tofile="../mahout-spark_${scala.compat.version}-${version}-dependency-reduced.jar" /> </tasks> </configuration> @@ -154,6 +154,16 @@ </goals> <phase>package</phase> </execution> + <execution> + <id>default-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>spark_${spark.compat.version}</classifier> + </configuration> + </execution> </executions> </plugin> <!-- remove jars from top directory on clean -->
