Repository: mahout Updated Branches: refs/heads/master 48d6ca517 -> a799ead59
MAHOUT-1795 Create Scala 2.11 Profiles apache/mahout#179 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/a799ead5 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/a799ead5 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/a799ead5 Branch: refs/heads/master Commit: a799ead59aa77cab0596f72bbe40872b59367e35 Parents: 48d6ca5 Author: Mike Kaplinskiy <[email protected]> Authored: Mon Jun 26 16:49:09 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Mon Jun 26 16:49:09 2017 -0500 ---------------------------------------------------------------------- pom.xml | 24 +++++++++++++++++---- spark/src/main/assembly/dependency-reduced.xml | 8 +++---- 2 files changed, 24 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/a799ead5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6c939b4..7090fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -876,9 +876,6 @@ <id>hadoop2</id> <activation> <activeByDefault>true</activeByDefault> - <property> - <name>env.JENKINS_URL</name> - </property> </activation> <properties> <hadoop.classifier>hadoop2</hadoop.classifier> @@ -925,6 +922,26 @@ </properties> </profile> <profile> + <id>scala-2.10</id> + <activation> + <property><name>!scala-2.11</name></property> + </activation> + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + </properties> + </profile> + <profile> + <id>scala-2.11</id> + <activation> + <property><name>scala-2.11</name></property> + </activation> + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + </properties> + </profile> + <profile> <!-- most of this profile lives in other places, like distribution --> <id>release.prepare</id> <properties> @@ -1039,7 +1056,6 @@ <profile> <id>ci</id> <activation> - <activeByDefault>false</activeByDefault> <property> <name>env.JENKINS_URL</name> </property> http://git-wip-us.apache.org/repos/asf/mahout/blob/a799ead5/spark/src/main/assembly/dependency-reduced.xml ---------------------------------------------------------------------- diff --git a/spark/src/main/assembly/dependency-reduced.xml b/spark/src/main/assembly/dependency-reduced.xml index 877fa6d..2e90e06 100644 --- a/spark/src/main/assembly/dependency-reduced.xml +++ b/spark/src/main/assembly/dependency-reduced.xml @@ -38,14 +38,14 @@ <includes> <!-- guava only included to get Preconditions in mahout-math and mahout-hdfs --> <include>com.google.guava:guava</include> - <include>com.github.scopt</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_2.10</include> - <include>org.apache.mahout:mahout-native-viennacl-omp_2.10</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> \ No newline at end of file +</assembly>
