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
commit 213583f6c1cc61eac480287d6e87bcdcacd7d6af Author: Andrew Palumbo <[email protected]> AuthorDate: Sat Dec 14 18:14:03 2019 -0800 prepare for scala 2.12 release --- README.md | 4 ++-- community/community-engines/flink-batch/pom.xml | 6 +++--- community/community-engines/h2o/pom.xml | 6 +++--- community/community-engines/pom.xml | 6 +++--- community/mahout-mr/integration/pom.xml | 2 +- community/mahout-mr/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, 35 insertions(+), 35 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 0e6dc60..a3412e8 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> - <version>14.1-SNAPSHOT</version> + <artifactId>mahout-community-engines</artifactId> + <version>14.1_2.12-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 diff --git a/community/community-engines/h2o/pom.xml b/community/community-engines/h2o/pom.xml index c54b6b2..b697b53 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> - <version>14.1-SNAPSHOT</version> + <artifactId>mahout-community-engines</artifactId> + <version>14.1_2.12-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..ab3e6fd 100644 --- a/community/community-engines/pom.xml +++ b/community/community-engines/pom.xml @@ -22,8 +22,8 @@ <parent> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-community_2.11</artifactId> - <version>14.1-SNAPSHOT</version> + <artifactId>mahout-community</artifactId> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,7 +36,7 @@ </tag> </scm>--> - <artifactId>mahout-community-engines_2.11</artifactId> + <artifactId>mahout-community-engines</artifactId> <name>- Mahout Community Supported Engines</name> <description>Not officially maintained Mahout Engines </description> diff --git a/community/mahout-mr/integration/pom.xml b/community/mahout-mr/integration/pom.xml index 11ab705..8b09cd3 100644 --- a/community/mahout-mr/integration/pom.xml +++ b/community/mahout-mr/integration/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-mr</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/mahout-mr/pom.xml b/community/mahout-mr/pom.xml index 747221e..ccc908b 100644 --- a/community/mahout-mr/pom.xml +++ b/community/mahout-mr/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>community</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <!-- modules inherit parent's group id and version. --> - <artifactId>mahout-mr_12</artifactId> + <artifactId>mahout-mr_2.12</artifactId> <name>- Mahout Classic (Map-Reduce Based Machine Learning)</name> <description>Scalable machine learning libraries</description> diff --git a/community/pom.xml b/community/pom.xml index 0f30d53..b51678c 100644 --- a/community/pom.xml +++ b/community/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1</version> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-community</artifactId> - <version>14.1</version> + <version>14.1_2.12-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 1aaaacc..882b6af 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.1</version> + <version>14.1_2.12-SNAPSHOT</version> <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 151a2a4..c314a01 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1</version> + <version>14.1_2.12-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 85059e1..47a6afd 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -23,10 +23,10 @@ <parent> <artifactId>mahout</artifactId> <groupId>org.apache.mahout</groupId> - <version>14.1</version> + <version>14.1_2.12-SNAPSHOT</version> </parent> - <artifactId>distribution</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 a60cb28..74918d2 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.1</version> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </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/pom.xml b/engine/pom.xml index 10a806d..7ab4430 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1</version> + <version>14.1_2.12-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index ae79e6b..d3a4015 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.1</version> + <version>14.1_2.12-SNAPSHOT</version> <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/pom.xml b/pom.xml index 0b9abc4..25319b1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1</version> + <version>14.1_2.12-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Mahout</name> @@ -99,7 +99,7 @@ <connection>scm:git:[email protected]: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_${scala.compat.version} + <tag>mahout-14.1_2.12 </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.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>
