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 2019/11/04 05:56:49 UTC
[mahout] 01/02: scala-2.12 changes
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch mahout-14.1
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 70287115c2be807bc9f47e4637ea37f1b885a94d
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sun Nov 3 21:39:37 2019 -0800
scala-2.12 changes
---
bin/compute-classpath.sh | 2 +-
buildtools/change-scala-version.sh | 2 +-
buildtools/pom.xml | 8 +++++++-
community/community-engines/flink-batch/pom.xml | 6 +++---
community/community-engines/h2o/pom.xml | 4 ++--
community/community-engines/pom.xml | 4 ++--
community/pom.xml | 4 ++--
community/spark-cli-drivers/pom.xml | 12 ++++++------
core/pom.xml | 4 ++--
distribution/pom.xml | 4 ++--
engine/hdfs/pom.xml | 4 ++--
engine/pom.xml | 2 +-
engine/spark/pom.xml | 4 ++--
pom.xml | 8 ++++----
14 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 05c7814..ee7d4f0 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -50,7 +50,7 @@ if [ -z "$SPARK_SCALA_VERSION" ]; then
elif [[ -d "$ASSEMBLY_DIR1" ]]; then
export SPARK_SCALA_VERSION="2.11"
else
- export SPARK_SCALA_VERSION="2.12"
+ export SPARK_SCALA_VERSION="2.11"
fi
fi
diff --git a/buildtools/change-scala-version.sh b/buildtools/change-scala-version.sh
index a1bb76e..b4128ca 100755
--- a/buildtools/change-scala-version.sh
+++ b/buildtools/change-scala-version.sh
@@ -19,7 +19,7 @@
# A BIG Shoutout to the Bros and Bro-ettes at Apache Spark for this
-set -e
+set -ex
VALID_VERSIONS=( 2.10 2.11 2.12 )
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 727f6bd..1a78de4 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-buildtools</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<name>Mahout Build Tools</name>
<packaging>jar</packaging>
@@ -144,4 +144,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/mahout-buildtools-14.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/mahout-buildtools-14.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/tags/mahout-buildtools-14.1</url>
+ </scm>
</project>
diff --git a/community/community-engines/flink-batch/pom.xml b/community/community-engines/flink-batch/pom.xml
index 7034833..136a66c 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.12</artifactId>
+ <artifactId>mahout-community-engines_2.11</artifactId>
<version>`14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-flink-batch_2.12</artifactId>
+ <artifactId>mahout-flink-batch_2.11</artifactId>
<name>-- Mahout Flink Engine (Community)</name>
<description>
Mahout Bindings for Apache Flink
@@ -125,7 +125,7 @@
<!-- enable scalatest -->
<plugin>
- <groupId>org.scalatest_2.12</groupId>
+ <groupId>org.scalatest_2.11</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 1a4a521..c54b6b2 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.12</artifactId>
+ <artifactId>mahout-community-engines_2.11</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-h2o_2.12</artifactId>
+ <artifactId>mahout-h2o_2.11</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 82b1bf6..464148a 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.12</artifactId>
+ <artifactId>mahout-community_2.11</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
</tag>
</scm>-->
- <artifactId>mahout-community-engines_2.12</artifactId>
+ <artifactId>mahout-community-engines_2.11</artifactId>
<name>- Mahout Community Supported Engines</name>
<description>Not officially maintained Mahout Engines
</description>
diff --git a/community/pom.xml b/community/pom.xml
index 70bda7d..1f1f402 100644
--- a/community/pom.xml
+++ b/community/pom.xml
@@ -23,12 +23,12 @@
<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-community</artifactId>
-<version>14.2-SNAPSHOT</version>
+<version>14.1-SNAPSHOT</version>
<name>Mahout Community</name>
<description>Not officially maintained, but still very useful scripts to use Mahout with.
</description>
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 1fcf151..dcc5024 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-community</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-spark-cli-drivers_2.12</artifactId>
+ <artifactId>mahout-spark-cli-drivers_2.11</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.12</artifactId>
+ <artifactId>scalatest_2.11</artifactId>
</dependency>
<!-- <dependency>-->
@@ -71,13 +71,13 @@
<!-- our stuff -->
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_2.12</artifactId>
+ <artifactId>mahout-spark_2.11</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_2.12</artifactId>
+ <artifactId>mahout-core_2.11</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.12</artifactId>
+ <artifactId>mahout-spark_2.11</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index e50f34f..e220d84 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.12</artifactId>
+ <artifactId>mahout-core_2.11</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 1a6944a..b9671c7 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>mahout</artifactId>
<groupId>org.apache.mahout</groupId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
@@ -75,7 +75,7 @@
</goals>
<configuration>
<attach>true</attach>
- <finalName>apache-mahout-${project.version}</finalName>
+ <finalName>apache-mahout-${project.version}-${scala.compat.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
<descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 09dc99f..f18327a 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- modules inherit parent's group id and version. -->
- <artifactId>mahout-hdfs_2.12</artifactId>
+ <artifactId>mahout-hdfs_2.11</artifactId>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/pom.xml b/engine/pom.xml
index bb06a79..1912d7e 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 1638ab6..5e1da62 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-spark_2.12</artifactId>
+ <artifactId>mahout-spark_2.11</artifactId>
<name>- Mahout Spark Engine</name>
<description>
Mahout Bindings for Apache Spark
diff --git a/pom.xml b/pom.xml
index 8c10e84..7f47f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
@@ -99,7 +99,7 @@
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
- <tag>mahout-14.1
+ <tag>mahout-14.1_${scala.compat.version}
</tag>
</scm>
@@ -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.12.8</scala.version>
- <scala.compat.version>2.12</scala.compat.version>
+ <scala.version>2.11.8</scala.version>
+ <scala.compat.version>2.11</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>