mahout git commit: MAHOUT-1999 Automate Multi-artifact release

r***@apache.org

2017-07-24 20:33:17 UTC

Repository: mahout
Updated Branches:
refs/heads/master 9595d30ad -> 8c14b309c

MAHOUT-1999 Automate Multi-artifact release

Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/8c14b309
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/8c14b309
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/8c14b309

Branch: refs/heads/master
Commit: 8c14b309cb4319cb304b68328bc646a3ec48f55d
Parents: 9595d30
Author: rawkintrevo <***@gmail.com>
Authored: Mon Jul 24 15:33:08 2017 -0500
Committer: rawkintrevo <***@gmail.com>
Committed: Mon Jul 24 15:33:08 2017 -0500

----------------------------------------------------------------------
buildtools/build-all-release-jars.sh | 30 +++
distribution/pom.xml | 39 ++-
distribution/src/main/assembly/bin.xml | 250 -------------------
.../src/main/assembly/scala-2.10_spark-1.6.xml | 249 ++++++++++++++++++
.../src/main/assembly/scala-2.11_spark-2.0.xml | 249 ++++++++++++++++++
.../src/main/assembly/scala-2.11_spark-2.1.xml | 249 ++++++++++++++++++
pom.xml | 4 +-
website/oldsite/developers/how-to-release.md | 15 +-
8 files changed, 825 insertions(+), 260 deletions(-)
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/buildtools/build-all-release-jars.sh
----------------------------------------------------------------------
diff --git a/buildtools/build-all-release-jars.sh b/buildtools/build-all-release-jars.sh
new file mode 100755
index 0000000..cdb87b6
--- /dev/null
+++ 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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ec89df1..bbf6fa0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -37,8 +37,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
+ 
<execution>
- <id>bin-assembly</id>
+ <id>scala_2.10_spark-1.6-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -46,10 +47,40 @@
<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>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 522f48a..0000000
--- a/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/../examples/target/dependency</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>mahout-*</exclude>
- <exclude>hadoop-*</exclude>
- <exclude>junit-*</exclude>
- </excludes>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../examples/target/dependency</directory>
- <includes>
- <include>mahout-collections*.jar</include>
- </includes>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../examples/target/dependency</directory>
- <includes>
- <include>hadoop-*.jar</include>
- </includes>
- <outputDirectory>lib/hadoop</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../math/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../hdfs/target</directory>
- <includes>
- <include>mahout-*.job</include>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../mr/target</directory>
- <includes>
- <include>mahout-*.job</include>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../integration/target</directory>
- <includes>
- <include>mahout-*.job</include>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../examples/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- <include>mahout-*.job</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../math-scala/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- <include>mahout-*.job</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../spark/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- <include>mahout-*.job</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../flink/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- <include>mahout-*.job</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../viennacl/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../viennacl-omp/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../collections/target/apidocs</directory>
- <outputDirectory>docs/mahout-collections</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../math/target/apidocs</directory>
- <outputDirectory>docs/mahout-math</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../hdfs/target/apidocs</directory>
- <outputDirectory>docs/mahout-hdfs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../mr/target/apidocs</directory>
- <outputDirectory>docs/mahout-mr</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../integration/target/apidocs</directory>
- <outputDirectory>docs/mahout-integration</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../examples/target/apidocs</directory>
- <outputDirectory>docs/mahout-examples</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
- <outputDirectory>docs/mahout-math-scala</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../spark/target/site/scaladocs</directory>
- <outputDirectory>docs/mahout-spark</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory/>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/README*</include>
- <include>**/LICENSE*</include>
- <include>**/NOTICE*</include>
- <include>**/*.properties</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../src/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../examples/bin</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/distribution/src/main/assembly/scala-2.10_spark-1.6.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/scala-2.10_spark-1.6.xml b/distribution/src/main/assembly/scala-2.10_spark-1.6.xml
new file mode 100644
index 0000000..2cc2095
--- /dev/null
+++ b/distribution/src/main/assembly/scala-2.10_spark-1.6.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>scala-2.10_spark-1.6</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>mahout-*</exclude>
+ <exclude>hadoop-*</exclude>
+ <exclude>junit-*</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>mahout-collections*.jar</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>hadoop-*.jar</include>
+ </includes>
+ <outputDirectory>lib/hadoop</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target</directory>
+ <includes>
+ <include>mahout-*2.10*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target</directory>
+ <includes>
+ <include>mahout-*2.10*.jar</include>
+ <include>mahout-*2.10*dependency-reduced.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../flink/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl/target</directory>
+ <includes>
+ <include>mahout-*2.10*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl-omp/target</directory>
+ <includes>
+ <include>mahout-*2.10*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../collections/target/apidocs</directory>
+ <outputDirectory>docs/mahout-collections</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target/apidocs</directory>
+ <outputDirectory>docs/mahout-math</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target/apidocs</directory>
+ <outputDirectory>docs/mahout-hdfs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target/apidocs</directory>
+ <outputDirectory>docs/mahout-mr</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target/apidocs</directory>
+ <outputDirectory>docs/mahout-integration</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/apidocs</directory>
+ <outputDirectory>docs/mahout-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-math-scala</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-spark</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/README*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/*.properties</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../src/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/bin</directory>
+ <outputDirectory>examples/bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>work</exclude>
+ <exclude>work/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/distribution/src/main/assembly/scala-2.11_spark-2.0.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/scala-2.11_spark-2.0.xml b/distribution/src/main/assembly/scala-2.11_spark-2.0.xml
new file mode 100644
index 0000000..5c6b646
--- /dev/null
+++ b/distribution/src/main/assembly/scala-2.11_spark-2.0.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>scala-2.11_spark-2.0</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>mahout-*</exclude>
+ <exclude>hadoop-*</exclude>
+ <exclude>junit-*</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>mahout-collections*.jar</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>hadoop-*.jar</include>
+ </includes>
+ <outputDirectory>lib/hadoop</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target</directory>
+ <includes>
+ <include>mahout-*2.11*spark_2.0.jar</include>
+ <include>mahout-*2.11*dependency-reduced.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../flink/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl-omp/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../collections/target/apidocs</directory>
+ <outputDirectory>docs/mahout-collections</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target/apidocs</directory>
+ <outputDirectory>docs/mahout-math</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target/apidocs</directory>
+ <outputDirectory>docs/mahout-hdfs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target/apidocs</directory>
+ <outputDirectory>docs/mahout-mr</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target/apidocs</directory>
+ <outputDirectory>docs/mahout-integration</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/apidocs</directory>
+ <outputDirectory>docs/mahout-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-math-scala</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-spark</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/README*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/*.properties</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../src/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/bin</directory>
+ <outputDirectory>examples/bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>work</exclude>
+ <exclude>work/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/distribution/src/main/assembly/scala-2.11_spark-2.1.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/scala-2.11_spark-2.1.xml b/distribution/src/main/assembly/scala-2.11_spark-2.1.xml
new file mode 100644
index 0000000..7c614ec
--- /dev/null
+++ b/distribution/src/main/assembly/scala-2.11_spark-2.1.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>scala-2.11_spark-2.1</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>mahout-*</exclude>
+ <exclude>hadoop-*</exclude>
+ <exclude>junit-*</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>mahout-collections*.jar</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
+ <includes>
+ <include>hadoop-*.jar</include>
+ </includes>
+ <outputDirectory>lib/hadoop</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target</directory>
+ <includes>
+ <include>mahout-*2.11*spark_2.1.jar</include>
+ <include>mahout-*2.11*dependency-reduced.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../flink/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../viennacl-omp/target</directory>
+ <includes>
+ <include>mahout-*2.11*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../collections/target/apidocs</directory>
+ <outputDirectory>docs/mahout-collections</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math/target/apidocs</directory>
+ <outputDirectory>docs/mahout-math</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../hdfs/target/apidocs</directory>
+ <outputDirectory>docs/mahout-hdfs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../mr/target/apidocs</directory>
+ <outputDirectory>docs/mahout-mr</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../integration/target/apidocs</directory>
+ <outputDirectory>docs/mahout-integration</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target/apidocs</directory>
+ <outputDirectory>docs/mahout-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-math-scala</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-spark</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/README*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/*.properties</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../src/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/bin</directory>
+ <outputDirectory>examples/bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>work</exclude>
+ <exclude>work/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 025ee50..419d290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -944,8 +944,7 @@
<profile>
<id>spark-1.6</id>
<activation>
- <activeByDefault>true</activeByDefault>
- <property><name>spark-1.6</name></property>
+ <property><name>!spark-2.*</name></property>
</activation>
<properties>
<spark.version>1.6.3</spark.version>
@@ -1112,6 +1111,7 @@
</plugins>
</build>
</profile>
+
</profiles>
<reporting>
<plugins>

http://git-wip-us.apache.org/repos/asf/mahout/blob/8c14b309/website/oldsite/developers/how-to-release.md
----------------------------------------------------------------------
diff --git a/website/oldsite/developers/how-to-release.md b/website/oldsite/developers/how-to-release.md
index adb93be..b3c4b28 100644
--- a/website/oldsite/developers/how-to-release.md
+++ b/website/oldsite/developers/how-to-release.md
@@ -45,7 +45,12 @@ warnings)
1. Check that all tests pass after a clean compile: `mvn clean test`
1. Check that there are no remaining unresolved Jira issues with the upcoming version number listed as the "Fix" version
1. Publish any previously unpublished third-party dependenciess: [Thirdparty Dependencies](thirdparty-dependencies.html)
-1. *Confirm whether the viennacl/etc profiles should be in here* Build and preview resulting artifacts: `mvn -Pmahout-release,apache-release,hadoop2 package`
+1. Build and preview resulting artifacts:
+ ```bash
+ cd buildtools
+ ./build-all-release-jars.sh
+ ```
+1. Make sure packages will come out looking right

<a name="HowToRelease-Makingarelease"></a>
## Making a release
@@ -84,9 +89,9 @@ warnings)

* *Clarify which env var is better or choose one* Set environment variable `MAVEN_OPTS` to `-Xmx1024m` to ensure the tests can run: `export JAVA_OPTIONS="-Xmx1g"`
* If you are outside the US, then svn.apache.org may not resolve to the main US-based Subversion servers. (Compare the IP address you get for svn.apache.org with svn.us.apache.org to see if they are different.) This will cause problems during the release since it will create a revision and then immediately access, but, there is a replication lag of perhaps a minute to the non-US servers. To temporarily force using the US-based server, edit your equivalent of /etc/hosts and map the IP address of svn.us.apache.org to svn.apache.org.
-* *Confirm whether the viennacl/etc profiles should be in here* Create the release candidate: `mvn -Pmahout-release,apache-release,hadoop2 release:prepare release:perform`
+* Create the release candidate: `mvn -Pmahout-release,apache-release release:prepare release:perform`
* If you have problems authenticating to svn.apache.org, try adding to the command line `-Dusername=USERNAME -Dpassword=PASSWORD`
-* If there is an issue first try doing: `mvn -Dmahout-release,apache-release,hadoop2 release:rollback` followed by `mvn -Dmahout-release,apache-release,hadoop2 release:clean` as this will likely save you time and do the right thing. You may also have to rollback the version numbers in the POM files. If you want to skip test cases while rebuilding, use `mvn -DpreparationGoals="clean compile" release:prepare release:perform`
+* If there is an issue first try doing: `mvn -Dmahout-release,apache-release release:rollback` followed by `mvn -Dmahout-release,apache-release,hadoop2 release:clean` as this will likely save you time and do the right thing. You may also have to rollback the version numbers in the POM files. If you want to skip test cases while rebuilding, use `mvn -DpreparationGoals="clean compile" release:prepare release:perform`
* Review the artifacts, etc. on the Apache Repository (using Sonatype's Nexus application) site: https://repository.apache.org/. You will need to login using your ASF SVN credentials and then browse to the staging area.
* Once you have reviewed the artifacts, you will need to "Close" out
the staging area under Nexus, which then makes the artifacts available for
@@ -101,8 +106,8 @@ release:perform target
* If there's a problem, you need to unwind the release and start all over.

```
-mvn -Pmahout-release,apache-release,hadoop2 versions:set -DnewVersion=PREVIOUS_SNAPSHOT
-mvn -Pmahout-release,apache-release,hadoop2 versions:commit
+mvn -Pmahout-release,apache-release versions:set -DnewVersion=PREVIOUS_SNAPSHOT
+mvn -Pmahout-release,apache-release versions:commit
git commit
git push --delete apache <tagname> (deletes the remote tag)
git tag -d tagname (deletes the local tag)