Repository: mahout Updated Branches: refs/heads/master 901ef03b4 -> fde08a9a5
Revert "NOJIRA: Spark migration to 1.2.1, minor unit test bug fixes" (note: this is now tracked on spark-1.2 branch to fix remaining issues with Spark 1.2 integration). This reverts commit 0c672bbcd95b8f757d7faccc09d980c62576f41c. Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/fde08a9a Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/fde08a9a Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/fde08a9a Branch: refs/heads/master Commit: fde08a9a57af94511fddc501dcff09fbd7825d48 Parents: 901ef03 Author: Dmitriy Lyubimov <[email protected]> Authored: Tue Feb 24 11:51:58 2015 -0800 Committer: Dmitriy Lyubimov <[email protected]> Committed: Tue Feb 24 11:51:58 2015 -0800 ---------------------------------------------------------------------- h2o/pom.xml | 8 ++++---- math-scala/pom.xml | 4 ++-- .../main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala | 2 ++ pom.xml | 2 +- spark-shell/pom.xml | 4 ++-- spark/pom.xml | 6 +++--- .../mahout/sparkbindings/test/DistributedSparkSuite.scala | 5 ----- 7 files changed, 14 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/h2o/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/pom.xml b/h2o/pom.xml index 0789adf..aa333e1 100644 --- a/h2o/pom.xml +++ b/h2o/pom.xml @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala_${scala.major}</artifactId> + <artifactId>mahout-math-scala_2.10</artifactId> <version>${project.version}</version> </dependency> @@ -219,7 +219,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala_${scala.major}</artifactId> + <artifactId>mahout-math-scala_2.10</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> @@ -249,8 +249,8 @@ <!-- scala stuff --> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.major}</artifactId> - <version>2.2.4</version> + <artifactId>scalatest_2.10</artifactId> + <version>2.0</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 9ca1d05..66309d6 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -175,7 +175,7 @@ <dependency> <groupId>com.github.scopt</groupId> - <artifactId>scopt_${scala.major}</artifactId> + <artifactId>scopt_2.10</artifactId> <version>3.2.0</version> </dependency> @@ -189,7 +189,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.major}</artifactId> - <version>2.2.4</version> + <version>2.0</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala index 3f35602..d8d04e2 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala @@ -134,6 +134,8 @@ object RLikeDrmOps { implicit def ops2Drm[K: ClassTag](ops: DrmLikeOps[K]): DrmLike[K] = ops.drm + implicit def cp2cpops[K: ClassTag](cp: CheckpointedDrm[K]): CheckpointedOps[K] = new CheckpointedOps(cp) + /** * This is probably dangerous since it triggers implicit checkpointing with default storage level * setting. http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c5a1141..ca66522 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <slf4j.version>1.7.5</slf4j.version> <scala.major>2.10</scala.major> <scala.version>2.10.4</scala.version> - <spark.version>1.2.1</spark.version> + <spark.version>1.1.0</spark.version> <h2o.version>0.1.16</h2o.version> </properties> <issueManagement> http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/spark-shell/pom.xml ---------------------------------------------------------------------- diff --git a/spark-shell/pom.xml b/spark-shell/pom.xml index 003c2a7..65df401 100644 --- a/spark-shell/pom.xml +++ b/spark-shell/pom.xml @@ -188,8 +188,8 @@ <!-- scala stuff --> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.major}</artifactId> - <version>2.2.4</version> + <artifactId>scalatest_2.10</artifactId> + <version>2.0</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 2622e58..f61f988 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -321,8 +321,8 @@ <dependency> <groupId>com.github.scopt</groupId> - <artifactId>scopt_${scala.major}</artifactId> - <version>3.3.0</version> + <artifactId>scopt_2.10</artifactId> + <version>3.2.0</version> </dependency> <!-- scala stuff --> @@ -330,7 +330,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.major}</artifactId> - <version>2.2.4</version> + <version>2.0</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/fde08a9a/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala ---------------------------------------------------------------------- diff --git a/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala b/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala index f40bcb7..29c8bea 100644 --- a/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala +++ b/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala @@ -58,11 +58,6 @@ trait DistributedSparkSuite extends DistributedMahoutSuite with LoggerConfigurat } - override protected def afterAll(configMap: ConfigMap): Unit = { - super.afterAll(configMap) - resetContext() - } - override protected def beforeAll(configMap: ConfigMap): Unit = { super.beforeAll(configMap) initContext()
