Repository: mahout Updated Branches: refs/heads/master 5a3b4f509 -> b41e140cc
MAHOUT-1969 Add Spark Profiles closes apache/mahout#329 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/b41e140c Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/b41e140c Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/b41e140c Branch: refs/heads/master Commit: b41e140cc01a58a233eb91e632ed5e1780607406 Parents: 5a3b4f5 Author: rawkintrevo <[email protected]> Authored: Thu Jun 29 08:37:18 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Thu Jun 29 08:37:18 2017 -0500 ---------------------------------------------------------------------- .travis.yml | 18 +++++++++--------- pom.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/b41e140c/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 8644436..09e49c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,39 +44,39 @@ matrix: include: # Build Spark 1.6.3 , Scala 2.10 - jdk: "openjdk7" - env: PROFILES="${PROFILES}" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10 -Pspark-1.6" SPARK_BIN=$SPARK_1_6 # Build Spark 2.0.2 , Scala 2.11 - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pspark-2.0 -Pscala-2.11" SPARK_BIN=$SPARK_2_0 # Build Spark 2.1.0 , Scala 2.11 - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pspark-2.1 -Pscala-2.11" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Pviennacl" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10 -Pviennacl" SPARK_BIN=$SPARK_1_6 # Build Spark 2.0.2 , Scala 2.11, ViennaCL - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pspark-2.0 -Pscala-2.11 -Pviennacl" SPARK_BIN=$SPARK_2_0 # Build Spark 2.1.0 , Scala 2.11, ViennaCL - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pspark-2.1 -Pscala-2.11 -Pviennacl" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL-OMP - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_1_6 # Build Spark 2.0.2 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pspark-2.0 -Pscala-2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_0 # Build Spark 2.1.0 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pspark-2.1 -Pscala-2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_1 git: depth: 10 http://git-wip-us.apache.org/repos/asf/mahout/blob/b41e140c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7090fe7..f1d2b1b 100644 --- a/pom.xml +++ b/pom.xml @@ -942,6 +942,34 @@ </properties> </profile> <profile> + <id>spark-1.6</id> + <activation> + <activeByDefault>true</activeByDefault> + <property><name>spark-1.6</name></property> + </activation> + <properties> + <spark.version>1.6.3</spark.version> + </properties> + </profile> + <profile> + <id>spark-2.0</id> + <activation> + <property><name>spark-2.0</name></property> + </activation> + <properties> + <spark.version>2.0.2</spark.version> + </properties> + </profile> + <profile> + <id>spark-2.1</id> + <activation> + <property><name>spark-2.1</name></property> + </activation> + <properties> + <spark.version>2.1.0</spark.version> + </properties> + </profile> + <profile> <!-- most of this profile lives in other places, like distribution --> <id>release.prepare</id> <properties>
