NOJIRA: fix artifact names to follow Scala convention (Anand Avati via dlyubimov) This closes apache/mahout#39.
Squashed commit of the following: commit 44b1517f06a6e58c2126f47a463b207843fe02f3 Author: Anand Avati <[email protected]> Date: Mon Aug 4 15:26:05 2014 -0700 NOJIRA: fix artifact names to follow Scala convention Scala maven artifacts follow convention of appending Scala compiler version number to the name. This is necessary as binaries across Scala major version are not compatible. Signed-off-by: Anand Avati <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/00c0149b Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/00c0149b Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/00c0149b Branch: refs/heads/spark-1.0.x Commit: 00c0149b95d3621ed5991578ac534ba5fdf5ac02 Parents: 7a50a29 Author: Dmitriy Lyubimov <[email protected]> Authored: Wed Aug 6 13:23:19 2014 -0700 Committer: Dmitriy Lyubimov <[email protected]> Committed: Wed Aug 6 13:27:34 2014 -0700 ---------------------------------------------------------------------- math-scala/pom.xml | 2 +- pom.xml | 6 +++--- spark-shell/pom.xml | 6 +++--- spark/pom.xml | 14 +++----------- 4 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/00c0149b/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 95fe2c7..2a348eb 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -27,7 +27,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_2.10</artifactId> <name>Mahout Math/Scala wrappers</name> <description>High performance scientific and technical computing data structures and methods, mostly based on CERN's http://git-wip-us.apache.org/repos/asf/mahout/blob/00c0149b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 809421b..aad4c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -183,19 +183,19 @@ </dependency> <dependency> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <groupId>${project.groupId}</groupId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <version>${project.version}</version> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <classifier>tests</classifier> </dependency> <dependency> - <artifactId>mahout-spark</artifactId> + <artifactId>mahout-spark_${scala.major}</artifactId> <groupId>${project.groupId}</groupId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/00c0149b/spark-shell/pom.xml ---------------------------------------------------------------------- diff --git a/spark-shell/pom.xml b/spark-shell/pom.xml index 059270f..65df401 100644 --- a/spark-shell/pom.xml +++ b/spark-shell/pom.xml @@ -28,7 +28,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-spark-shell</artifactId> + <artifactId>mahout-spark-shell_2.10</artifactId> <name>Mahout Spark bindings shell</name> <description> Mahout Bindings for Apache Spark @@ -165,12 +165,12 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-spark</artifactId> + <artifactId>mahout-spark_${scala.major}</artifactId> </dependency> <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/00c0149b/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 03ea2a0..0946cee 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -28,7 +28,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-spark</artifactId> + <artifactId>mahout-spark_2.10</artifactId> <name>Mahout Spark bindings</name> <description> Mahout Bindings for Apache Spark @@ -294,7 +294,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> </dependency> <dependency> @@ -310,7 +310,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> @@ -324,14 +324,6 @@ <version>3.2.0</version> </dependency> - <!-- spark stuff --> - - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.major}</artifactId> - <version>${spark.version}</version> - </dependency> - <!-- scala stuff --> <dependency>
