You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2020/01/14 05:38:37 UTC
[mahout] branch master updated: prepare for scala_2.12 binaries
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 53ec8f3 prepare for scala_2.12 binaries
53ec8f3 is described below
commit 53ec8f3a1b0b4038b6eab0a4140970274801affd
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Mon Jan 13 21:38:23 2020 -0800
prepare for scala_2.12 binaries
---
bin/compute-classpath.sh | 6 +++---
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 | 10 +++++-----
core/pom.xml | 4 ++--
distribution/pom.xml | 2 +-
engine/hdfs/pom.xml | 2 +-
engine/spark/pom.xml | 2 +-
engine/spark/src/main/assembly/dependency-reduced.xml | 4 ++--
.../main/scala/org/apache/mahout/sparkbindings/package.scala | 4 ++--
pom.xml | 4 ++--
12 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index ee7d4f0..4ec4eb9 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -34,7 +34,7 @@ FWDIR="$SPARK_HOME"
if [ -z "$SPARK_SCALA_VERSION" ]; then
ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10"
- ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11"
+ ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.12"
ASSEMBLY_DIR3="$FWDIR/assembly/target/scala-2.12"
@@ -48,9 +48,9 @@ if [ -z "$SPARK_SCALA_VERSION" ]; then
if [[ -d "$ASSEMBLY_DIR1" ]]; then
export SPARK_SCALA_VERSION="2.10"
elif [[ -d "$ASSEMBLY_DIR1" ]]; then
- export SPARK_SCALA_VERSION="2.11"
+ export SPARK_SCALA_VERSION="2.12"
else
- export SPARK_SCALA_VERSION="2.11"
+ export SPARK_SCALA_VERSION="2.12"
fi
fi
diff --git a/community/community-engines/flink-batch/pom.xml b/community/community-engines/flink-batch/pom.xml
index 0e6dc60..08d5457 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 c54b6b2..1a4a521 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 464148a..82b1bf6 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 e1b8dbe..1fcf151 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>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest_2.11</artifactId>
+ <artifactId>scalatest_2.12</artifactId>
</dependency>
<!-- <dependency>-->
@@ -71,13 +71,13 @@
<!-- our stuff -->
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_2.11</artifactId>
+ <artifactId>mahout-spark_2.12</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_2.11</artifactId>
+ <artifactId>mahout-core_2.12</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_2.11</artifactId>
+ <artifactId>mahout-spark_2.12</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index c370b7f..5dc7dee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<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 b22e0bf..fac856e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -26,7 +26,7 @@
<version>14.2-SNAPSHOT</version>
</parent>
- <artifactId>distribution_2.11</artifactId>
+ <artifactId>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 9ed5f96..09dc99f 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 0753ee7..1638ab6 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..0e56fa8 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
@@ -265,8 +265,8 @@ package object sparkbindings {
// no need for mapreduce jar in Spark
// 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
+ // vcl jars: mahout-native-viennacl_2.12.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 454bedb..c540ef1 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>