[mahout] branch master updated: (nojira) tweak dependency-reduced jar back to spark module

[apalumbo]

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 1882239  (nojira) tweak  dependency-reduced jar back to spark module
1882239 is described below

commit 1882239aaad460a5ab71007b136281ee828fd5ee
Author: Andrew Palumbo <apalu...@apache.org>
AuthorDate: Fri May 17 15:10:39 2019 -0700

    (nojira) tweak  dependency-reduced jar back to spark module
---
 .../src/main/assembly/dependency-reduced.xml       | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

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 9522c66..ed2e008 100644
--- a/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml
+++ b/community/spark-cli-drivers/src/main/assembly/dependency-reduced.xml
@@ -14,9 +14,9 @@
  limitations under the License.
 -->
 <assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
+        
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+        
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
   http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
   <id>dependency-reduced</id>
   <formats>
@@ -27,24 +27,25 @@
     <dependencySet>
       <unpack>true</unpack>
       <unpackOptions>
-      <excludes>
-         <exclude>META-INF/LICENSE</exclude>
-      </excludes>
+        <!-- MAHOUT-1126 -->
+        <excludes>
+          <exclude>META-INF/LICENSE</exclude>
+        </excludes>
       </unpackOptions>
       <scope>runtime</scope>
       <outputDirectory>/</outputDirectory>
       <useTransitiveFiltering>true</useTransitiveFiltering>
-      <!--<includes>-->
-        <!--&lt;!&ndash; guava only included to get Preconditions in 
mahout-math and mahout-hdfs &ndash;&gt;-->
-        <!--<include>com.google.guava:guava</include>-->
-        <include>com.github.scopt_2.11</include>
-        <!--&lt;!&ndash;<include>com.tdunning:t-digest</include>&ndash;&gt;-->
-        <!--<include>org.apache.commons:commons-math3</include>-->
-        <!--<include>it.unimi.dsi:fastutil</include>-->
-        
<!--<include>org.apache.mahout:mahout-native-viennacl_${scala.compat.version}</include>-->
-        
<!--<include>org.apache.mahout:mahout-native-viennacl-omp_${scala.compat.version}</include>-->
-        <!--<include>org.bytedeco:javacpp</include>-->
-      <!--</includes>-->
+      <includes>
+        <!-- guava only included to get Preconditions in mahout-math and 
mahout-hdfs -->
+<!--        <include>com.google.guava:guava</include>-->
+        <include>com.github.scopt_${scala.compat.version}</include>
+        <!--<include>com.tdunning:t-digest</include>-->
+<!--        <include>org.apache.commons:commons-math3</include>-->
+<!--        <include>it.unimi.dsi:fastutil</include>-->
+<!--        
<include>org.apache.mahout:mahout-native-viennacl_${scala.compat.version}</include>-->
+<!--        
<include>org.apache.mahout:mahout-native-viennacl-omp_${scala.compat.version}</include>-->
+<!--        <include>org.bytedeco:javacpp</include>-->
+      </includes>
     </dependencySet>
   </dependencySets>
 </assembly>