still broken, but profile order matters
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/d108041d Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/d108041d Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/d108041d Branch: refs/heads/master Commit: d108041d92faa0327339e478305222022b858329 Parents: aedb024 Author: Trevor Grant <trevor.d.gr...@gmail.com> Authored: Tue Aug 1 18:55:48 2017 -0500 Committer: Trevor Grant <trevor.d.gr...@gmail.com> Committed: Tue Aug 1 18:55:48 2017 -0500 ---------------------------------------------------------------------- .travis.yml | 18 +++++++++--------- math-scala/pom.xml | 12 ++++++++++++ pom.xml | 2 +- spark/pom.xml | 1 + 4 files changed, 23 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/d108041d/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 09e49c5..a1e53ba 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} -Pscala-2.10 -Pspark-1.6" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10,spark-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} -Pspark-2.0 -Pscala-2.11" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pscala-2.11,spark-2.0" SPARK_BIN=$SPARK_2_0 # Build Spark 2.1.0 , Scala 2.11 - replace -D... with profiles when available - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Pspark-2.1 -Pscala-2.11" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pspark-2.1,scala-2.11" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Pscala-2.10 -Pviennacl" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10,viennacl" 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} -Pspark-2.0 -Pscala-2.11 -Pviennacl" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pscala-2.11,spark-2.0,viennacl" 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} -Pspark-2.1 -Pscala-2.11 -Pviennacl" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pscala-2.11,spark-2.1,viennacl" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL-OMP - jdk: "openjdk7" - env: PROFILES="${PROFILES} -Pscala-2.10 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_1_6 + env: PROFILES="${PROFILES} -Pscala-2.10,spark-1.6,viennacl-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} -Pspark-2.0 -Pscala-2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_0 + env: PROFILES="${PROFILES} -Pscala-2.11,spark-2.0,viennacl-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} -Pspark-2.1 -Pscala-2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_1 + env: PROFILES="${PROFILES} -Pscala-2.11,spark-2.1,viennacl-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/d108041d/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index b79cc1f..ddf89c7 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -252,12 +252,24 @@ </profile> <profile> <id>scala-2.10</id> + <activation> + <property> + <name>scala.compat.version</name> + <value>2.10</value> + </property> + </activation> <modules> <module>scala-2.10</module> </modules> </profile> <profile> <id>scala-2.11</id> + <activation> + <property> + <name>scala.compat.version</name> + <value>2.11</value> + </property> + </activation> <modules> <module>scala-2.11</module> </modules> http://git-wip-us.apache.org/repos/asf/mahout/blob/d108041d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e054941..7ed46ad 100644 --- a/pom.xml +++ b/pom.xml @@ -924,7 +924,7 @@ <profile> <id>scala-2.10</id> <activation> - <property><name>!*scala*</name></property> + <property><name>!scala-2.11</name></property> </activation> <properties> <scala.compat.version>2.10</scala.compat.version> http://git-wip-us.apache.org/repos/asf/mahout/blob/d108041d/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 0ba87cd..113cc60 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -241,6 +241,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.compat.version}</artifactId> + <version>3.0.3</version> </dependency> </dependencies>
