This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/master by this push:
new adea0b5 (nojira)[release] modify scala versions across the project to
_2.12 for 2.12 release
adea0b5 is described below
commit adea0b5d1328b0c622a5377ec71c49f296e4d3a4
Author: Andrew Palumbo <[email protected]>
AuthorDate: Fri Jan 31 22:09:27 2020 -0800
(nojira)[release] modify scala versions across the project to _2.12 for
2.12 release
---
README.md | 4 ++--
community/community-engines/flink-batch/pom.xml | 6 +++---
community/community-engines/h2o/pom.xml | 4 ++--
community/community-engines/pom.xml | 4 ++--
community/spark-cli-drivers/pom.xml | 2 +-
core/pom.xml | 2 +-
distribution/pom.xml | 2 +-
engine/hdfs/pom.xml | 2 +-
engine/spark/pom.xml | 2 +-
engine/spark/src/main/assembly/dependency-reduced.xml | 4 ++--
.../org/apache/mahout/sparkbindings/package.scala | 2 +-
pom.xml | 9 +++------
.../latest/tutorials/misc/mahout-in-zeppelin/index.md | 18 +++++++++---------
13 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/README.md b/README.md
index 09ca2e1..12a060b 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ To use the Samsara environment you'll need to include both
the engine neutral ma
```
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-math-scala_2.11</artifactId>
+ <artifactId>mahout-math-scala_2.12</artifactId>
<version>${mahout.version}</version>
</dependency>
```
@@ -52,7 +52,7 @@ and a dependency for back end engine translation, e.g:
```
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_2.11</artifactId>
+ <artifactId>mahout-spark_2.12</artifactId>
<version>${mahout.version}</version>
</dependency>
```
diff --git a/community/community-engines/flink-batch/pom.xml
b/community/community-engines/flink-batch/pom.xml
index cf29e02..3e33d35 100644
--- a/community/community-engines/flink-batch/pom.xml
+++ b/community/community-engines/flink-batch/pom.xml
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-community-engines_2.11</artifactId>
+ <artifactId>mahout-community-engines_2.12</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-flink-batch_2.11</artifactId>
+ <artifactId>mahout-flink-batch_2.12</artifactId>
<name>-- Mahout Flink Engine (Community)</name>
<description>
Mahout Bindings for Apache Flink
@@ -125,7 +125,7 @@
<!-- enable scalatest -->
<plugin>
- <groupId>org.scalatest_2.11</groupId>
+ <groupId>org.scalatest_2.12</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<executions>
<execution>
diff --git a/community/community-engines/h2o/pom.xml
b/community/community-engines/h2o/pom.xml
index 608100b..666bbb1 100644
--- a/community/community-engines/h2o/pom.xml
+++ b/community/community-engines/h2o/pom.xml
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-community-engines_2.11</artifactId>
+ <artifactId>mahout-community-engines_2.12</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-h2o_2.11</artifactId>
+ <artifactId>mahout-h2o_2.12</artifactId>
<name>-- Mahout H2O Engine (Community)</name>
<description>
H2O Backend for Mahout DSL
diff --git a/community/community-engines/pom.xml
b/community/community-engines/pom.xml
index 52f4acb..ebce3da 100644
--- a/community/community-engines/pom.xml
+++ b/community/community-engines/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-community_2.11</artifactId>
+ <artifactId>mahout-community_2.12</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
</tag>
</scm>
- <artifactId>mahout-community-engines_2.11</artifactId>
+ <artifactId>mahout-community-engines_2.12</artifactId>
<name>- Mahout Community Supported Engines</name>
<description>Not officially maintained Mahout Engines
</description>
diff --git a/community/spark-cli-drivers/pom.xml
b/community/spark-cli-drivers/pom.xml
index 5a7a058..a5bb3f4 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-spark-cli-drivers_2.11</artifactId>
+ <artifactId>mahout-spark-cli-drivers_2.12</artifactId>
<name>- Mahout Spark CLI Drivers</name>
<description>These drivers will allow you to compile a handy Apache Spark
App which utilizes Apache Mahout.
</description>
diff --git a/core/pom.xml b/core/pom.xml
index b2fab2b..e92c2be 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-core_2.11</artifactId>
+ <artifactId>mahout-core_2.12</artifactId>
<name>Mahout Core</name>
<description>High performance scientific and technical computing data
structures and methods,
mostly based on CERN's Colt Java API
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1826494..340420a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -26,7 +26,7 @@
<version>14.1-SNAPSHOT</version>
</parent>
- <artifactId>apache-mahout-distribution_2.11</artifactId>
+ <artifactId>apache-mahout-distribution_2.12</artifactId>
<name>Mahout Release Package</name>
<description>Distribution Package</description>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 092416c..83b24cc 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -28,7 +28,7 @@
</parent>
<!-- modules inherit parent's group id and version. -->
- <artifactId>mahout-hdfs_2.11</artifactId>
+ <artifactId>mahout-hdfs_2.12</artifactId>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index df573c8..33a05c2 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-spark_2.11</artifactId>
+ <artifactId>mahout-spark_2.12</artifactId>
<name>- Mahout Spark Engine</name>
<description>
Mahout Bindings for Apache Spark
diff --git a/engine/spark/src/main/assembly/dependency-reduced.xml
b/engine/spark/src/main/assembly/dependency-reduced.xml
index 78a03cd..d30f458 100644
--- a/engine/spark/src/main/assembly/dependency-reduced.xml
+++ b/engine/spark/src/main/assembly/dependency-reduced.xml
@@ -42,8 +42,8 @@
<!-- <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.11</include>
- <include>org.apache.mahout:mahout-native-viennacl-omp_2.11</include>
+ <include>org.apache.mahout:mahout-native-viennacl_2.12</include>
+ <include>org.apache.mahout:mahout-native-viennacl-omp_2.12</include>
<include>org.bytedeco:javacpp</include>
</includes>
</dependencySet>
diff --git
a/engine/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
b/engine/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
index b0b5a29..4ca2827 100644
--- a/engine/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
+++ b/engine/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
@@ -266,7 +266,7 @@ package object sparkbindings {
// j.matches(".*mahout-mr-\\d.*\\.jar") ||
j.matches(".*spark_\\d.*\\.jar") ||
// vcl jars: mahout-native-viennacl_2.11.jar,
- // mahout-native-viennacl-omp_2.11.jar
+ // mahout-native-viennacl-omp_2.12.jar
// j.matches(".*mahout-native-viennacl_\\d.*\\\\.jar") ||
// j.matches(".*mahout-native-viennacl-omp_\\d.*\\.jar")||
j.matches(".*mahout-native-viennacl*.jar")||
diff --git a/pom.xml b/pom.xml
index 110a836..000b7ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<mjavadoc.version>2.10.3</mjavadoc.version>
<slf4j.version>1.7.22</slf4j.version>
- <scala.version>2.11.8</scala.version>
- <scala.compat.version>2.11</scala.compat.version>
+ <scala.version>2.12.8</scala.version>
+ <scala.compat.version>2.12</scala.compat.version>
<source.plugin.version>3.0.1</source.plugin.version>
<spark.version>2.4.3</spark.version>
<spark.compat.version>2.4</spark.compat.version>
@@ -541,7 +541,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
@@ -560,7 +559,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -606,7 +604,6 @@
<releaseProfile>apache.releases.https</releaseProfile>
</releaseProfiles>
<goals>
- <goal>sign</goal>
<goal>deploy</goal>
</goals>
<arguments>-Papache-release ${arguments}</arguments>
@@ -630,7 +627,7 @@
<executions>
<execution>
<id>source-release-assembly</id>
- <phase>dont-exeute</phase>
+ <phase>none</phase>
</execution>
</executions>
</plugin>
diff --git a/website/docs/latest/tutorials/misc/mahout-in-zeppelin/index.md
b/website/docs/latest/tutorials/misc/mahout-in-zeppelin/index.md
index f5b15c0..4a4d07c 100644
--- a/website/docs/latest/tutorials/misc/mahout-in-zeppelin/index.md
+++ b/website/docs/latest/tutorials/misc/mahout-in-zeppelin/index.md
@@ -118,19 +118,19 @@ Where `/path/to/mahout` is the path to the directory
where you've built mahout.
<th>exclude</th>
</tr>
<tr>
- <td>/path/to/mahout/core_2.11-0.14.jar</td>
+ <td>/path/to/mahout/core_2.12-0.14.jar</td>
<td></td>
</tr>
<tr>
- <td>path/to/mahout/mahout-hdfs_2.11-0.14.jar</td>
+ <td>path/to/mahout/mahout-hdfs_2.12-0.14.jar</td>
<td></td>
</tr>
<tr>
- <td>/path/to/mahout/mahout-spark_2.11-0.14.jar</td>
+ <td>/path/to/mahout/mahout-spark_2.12-0.14.jar</td>
<td></td>
</tr>
<tr>
-
<td>/path/to/mahout/mahout-spark_2.11-0.14.jar-dependeny-reduced.jar</td>
+
<td>/path/to/mahout/mahout-spark_2.12-0.14.jar-dependeny-reduced.jar</td>
<td></td>
</tr>
</table>
@@ -149,15 +149,15 @@ Where `/path/to/mahout` is the path to the directory
where you've built mahout.
<td></td>
</tr>
<tr>
- <td>org.apache.mahout:mahout-hdfs-scala_2.11:0.14</td>
+ <td>org.apache.mahout:mahout-hdfs-scala_2.12:0.14</td>
<td></td>
</tr>
<tr>
- <td>org.apache.mahout:mahout-spark_2.11:0.14</td>
+ <td>org.apache.mahout:mahout-spark_2.12:0.14</td>
<td></td>
</tr>
<tr>
- <td>org.apache.mahout:mahout-native-viennacl-omp_2.11:0.14</td>
+ <td>org.apache.mahout:mahout-native-viennacl-omp_2.12:0.14</td>
<td></td>
</tr>
@@ -175,12 +175,12 @@ _**OPTIONALLY**_ You can add **one** of the following
artifacts for CPU/GPU acce
<th>type of native solver</th>
</tr>
<tr>
- <td>org.apache.mahout:mahout-native-viennacl_2.11:0.14</td>
+ <td>org.apache.mahout:mahout-native-viennacl_2.12:0.14</td>
<td></td>
<td>ViennaCL GPU Accelerated</td>
</tr>
<tr>
- <td>org.apache.mahout:mahout-native-viennacl-omp_2.11:0.14</td>
+ <td>org.apache.mahout:mahout-native-viennacl-omp_2.12:0.14</td>
<td></td>
<td>ViennaCL-OMP CPU Accelerated (use this if you don't have a good
graphics card)</td>
</tr>
