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/05/17 00:04:37 UTC
[mahout] branch master updated: (nojira) fix path for spark-cli copy
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/master by this push:
new d84b964 (nojira) fix path for spark-cli copy
d84b964 is described below
commit d84b96486f7c1cfb4e31eeab788719bf82ba5e7c
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu May 16 17:03:54 2019 -0700
(nojira) fix path for spark-cli copy
---
community/spark-cli-drivers/pom.xml | 6 +++---
.../spark-cli-drivers/src/main/assembly/dependency-reduced.xml | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 1185d1d..5e1ed5f 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -84,7 +84,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/dependency-reduced.xml</descriptor>
+ <descriptor>"src/main/assembly/dependency-reduced.xml"</descriptor>
</descriptors>
</configuration>
</execution>
@@ -131,8 +131,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <copy file="target/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" tofile="${project.basedir}/../../../../lib/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" />
- <copy file="target/spark-cli-drivers_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="${project.basedir}/../../../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" />
+ <copy file="target/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" tofile="${project.basedir}/../../lib/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" />
+ <copy file="target/spark-cli-drivers_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="${project.basedir}/../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" />
</tasks>
</configuration>
<goals>
diff --git a/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml b/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml
index 5cf7d7e..9522c66 100644
--- a/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml
+++ b/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml
@@ -27,7 +27,6 @@
<dependencySet>
<unpack>true</unpack>
<unpackOptions>
- <!-- MAHOUT-1126 -->
<excludes>
<exclude>META-INF/LICENSE</exclude>
</excludes>
@@ -38,7 +37,7 @@
<!--<includes>-->
<!--<!– guava only included to get Preconditions in mahout-math and mahout-hdfs –>-->
<!--<include>com.google.guava:guava</include>-->
- <!--<include>com.github.scopt_2.11</include>-->
+ <include>com.github.scopt_2.11</include>
<!--<!–<include>com.tdunning:t-digest</include>–>-->
<!--<include>org.apache.commons:commons-math3</include>-->
<!--<include>it.unimi.dsi:fastutil</include>-->