Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout

zhouyonglong · Jul 24, 2017 · 47a9362 · 47a9362
2 parents ef5820f + 8c14b30
commit 47a9362
Show file tree

Hide file tree

Showing 15 changed files with 691 additions and 34 deletions.
diff --git a/buildtools/build-all-release-jars.sh b/buildtools/build-all-release-jars.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+#   This file compiles all varients of scala and spark required for
+#   release assemblies
+#
+
+cd ../
+mvn clean
+mvn -Pscala-2.10,spark-1.6,viennacl,viennacl-omp -DskipTests
+mvn -Pscala-2.11,spark-2.0,viennacl,viennacl-omp -DskipTests
+cd spark
+mvn -Pscala-2.11,spark-2.1 -DskipTests
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -37,19 +37,50 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
+          <!-- Add more executions here to create more tarballs on release -->
           <execution>
-            <id>bin-assembly</id>
+            <id>scala_2.10_spark-1.6-assembly</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
             <configuration>
               <skipAssembly>${mahout.skip.distribution}</skipAssembly>
               <descriptors>
-                <descriptor>src/main/assembly/bin.xml</descriptor>
+                <descriptor>src/main/assembly/scala-2.10_spark-1.6.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
-              <appendAssemblyId>false</appendAssemblyId>
+              <appendAssemblyId>true</appendAssemblyId>
+            </configuration>
+          </execution>
+          <execution>
+            <id>scala-2.11_spark-2.0-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+              <descriptors>
+                <descriptor>src/main/assembly/scala-2.11_spark-2.0.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <appendAssemblyId>true</appendAssemblyId>
+            </configuration>
+          </execution>
+          <execution>
+            <id>scala-2.11_spark-2.1-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+              <descriptors>
+                <descriptor>src/main/assembly/scala-2.11_spark-2.1.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <appendAssemblyId>true</appendAssemblyId>
             </configuration>
           </execution>
           <execution>
@@ -79,6 +110,8 @@
         <mahout.skip.distribution>false</mahout.skip.distribution>
       </properties>
     </profile>
+
+
     <profile>
       <id>viennacl</id>
         <dependencies>
@@ -105,6 +138,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 +183,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 +223,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>

diff --git a/distribution/src/main/assembly/bin.xml → ...rc/main/assembly/scala-2.10_spark-1.6.xml b/distribution/src/main/assembly/bin.xml → ...rc/main/assembly/scala-2.10_spark-1.6.xml
@@ -18,7 +18,7 @@
 <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 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>bin</id>
+  <id>scala-2.10_spark-1.6</id>
   <formats>
     <format>dir</format>
     <format>tar.gz</format>
@@ -118,8 +118,7 @@
     <fileSet>
       <directory>${project.basedir}/../math-scala/target</directory>
       <includes>
-        <include>mahout-*.jar</include>
-        <include>mahout-*.job</include>
+        <include>mahout-*2.10*.jar</include>
       </includes>
       <excludes>
         <exclude>*sources.jar</exclude>
@@ -131,8 +130,8 @@
     <fileSet>
       <directory>${project.basedir}/../spark/target</directory>
       <includes>
-        <include>mahout-*.jar</include>
-        <include>mahout-*.job</include>
+        <include>mahout-*2.10*.jar</include>
+        <include>mahout-*2.10*dependency-reduced.jar</include>
       </includes>
       <excludes>
         <exclude>*sources.jar</exclude>
@@ -157,7 +156,7 @@
     <fileSet>
       <directory>${project.basedir}/../viennacl/target</directory>
       <includes>
-        <include>mahout-*.jar</include>
+        <include>mahout-*2.10*.jar</include>
       </includes>
       <excludes>
         <exclude>*sources.jar</exclude>
@@ -169,7 +168,7 @@
     <fileSet>
       <directory>${project.basedir}/../viennacl-omp/target</directory>
       <includes>
-        <include>mahout-*.jar</include>
+        <include>mahout-*2.10*.jar</include>
       </includes>
       <excludes>
         <exclude>*sources.jar</exclude>