From 903e3b456529992d9e99543f1da9dc1fe810c43e Mon Sep 17 00:00:00 2001
From: Mike Kaplinskiy <mike.kaplinskiy@gmail.com>
Date: Tue, 11 Apr 2017 00:32:29 -0700
Subject: [PATCH] MAHOUT-1795: Build mahout under scala 2.11 (& 2.12 while
 we're here)

All previous caveats are gone as part of other changes. Build with -Dscala-2.11 to get 2.11 binaries. The default is still 2.10
---
 pom.xml                                       | 24 +++++++++++++++----
 .../src/main/assembly/dependency-reduced.xml  |  8 +++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8485c7cd6c..356f1ec2f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,9 +868,6 @@
       <id>hadoop2</id>
       <activation>
         <activeByDefault>true</activeByDefault>
-        <property>
-          <name>env.JENKINS_URL</name>
-        </property>
       </activation>
       <properties>
         <hadoop.classifier>hadoop2</hadoop.classifier>
@@ -916,6 +913,26 @@
         <checkstyle.skip>true</checkstyle.skip>
       </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>
@@ -1031,7 +1048,6 @@
     <profile>
       <id>ci</id>
       <activation>
-        <activeByDefault>false</activeByDefault>
         <property>
           <name>env.JENKINS_URL</name>
         </property>
diff --git a/spark/src/main/assembly/dependency-reduced.xml b/spark/src/main/assembly/dependency-reduced.xml
index 877fa6dce5..2e90e06974 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>