From 7ff4c2d399e1497966689cbe13edf2cd2a9a29b1 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Thu, 26 Sep 2013 10:48:24 +0530 Subject: fixed maven build for scala 2.10 --- bagel/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bagel') diff --git a/bagel/pom.xml b/bagel/pom.xml index 51173c32b2..feaed6d2b0 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -43,18 +43,18 @@ org.scalatest - scalatest_${scala.version} + scalatest_${scala-short.version} test org.scalacheck - scalacheck_${scala.version} + scalacheck_${scala-short.version} test - target/scala-${scala.version}/classes - target/scala-${scala.version}/test-classes + target/scala-${scala-short.version}/classes + target/scala-${scala-short.version}/test-classes org.scalatest -- cgit v1.2.3 From 7ad6921ae0657ca806704f859d5b8c9ff26633e4 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Sat, 7 Dec 2013 12:45:57 +0530 Subject: Incorporated Patrick's feedback comment on #211 and made maven build/dep-resolution atleast a bit faster. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 56 +++++-------------------------------------------------- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 15 insertions(+), 61 deletions(-) (limited to 'bagel') diff --git a/assembly/pom.xml b/assembly/pom.xml index 28b0692dff..8103534796 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-assembly_${scala-short.version} + spark-assembly_2.10 Spark Project Assembly http://spark.incubator.apache.org/ diff --git a/bagel/pom.xml b/bagel/pom.xml index c8b9c4f4cd..461e76a753 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-bagel_${scala-short.version} + spark-bagel_2.10 jar Spark Project Bagel http://spark.incubator.apache.org/ diff --git a/core/pom.xml b/core/pom.xml index e2033c9912..af605e1837 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 jar Spark Project Core http://spark.incubator.apache.org/ diff --git a/examples/pom.xml b/examples/pom.xml index a10dee7847..464ad82e33 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-examples_${scala-short.version} + spark-examples_2.10 jar Spark Project Examples http://spark.incubator.apache.org/ diff --git a/mllib/pom.xml b/mllib/pom.xml index a57bddeff3..fce5b19bb2 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-mllib_${scala-short.version} + spark-mllib_2.10 jar Spark Project ML Library http://spark.incubator.apache.org/ diff --git a/pom.xml b/pom.xml index 8700a4828f..4c11459088 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 2.10 2.10.3 0.13.0 - 2.2.1 + 2.2.3 1.7.2 1.2.17 1.0.4 @@ -116,10 +116,10 @@ - - typesafe-repo - Typesafe Repository - http://repo.typesafe.com/typesafe/releases/ + + maven-repo + Maven Repository + http://repo.maven.apache.org/maven2/ true @@ -138,17 +138,6 @@ false - - akka-repo - Akka Repository - http://repo.akka.io/releases/ - - true - - - false - - mqtt-repo MQTT Repository @@ -161,41 +150,6 @@ - - - oss-sonatype-releases - OSS Sonatype - https://oss.sonatype.org/content/repositories/releases - - true - - - false - - - - oss-sonatype-snapshots - OSS Sonatype - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - oss-sonatype - OSS Sonatype - https://oss.sonatype.org/content/groups/public - - true - - - true - - - diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index c983ea5dfb..f8a17d93cc 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-repl-bin_${scala-short.version} + spark-repl-bin_2.10 pom Spark Project REPL binary packaging http://spark.incubator.apache.org/ diff --git a/repl/pom.xml b/repl/pom.xml index ff66493229..2f27e76760 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-repl_${scala-short.version} + spark-repl_2.10 jar Spark Project REPL http://spark.incubator.apache.org/ diff --git a/streaming/pom.xml b/streaming/pom.xml index fb15681e25..ff95591b9f 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming_${scala-short.version} + spark-streaming_2.10 jar Spark Project Streaming http://spark.incubator.apache.org/ diff --git a/tools/pom.xml b/tools/pom.xml index db87b54dec..353d201f90 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -25,7 +25,7 @@ org.apache.spark - spark-tools_${scala-short.version} + spark-tools_2.10 jar Spark Project Tools http://spark.incubator.apache.org/ diff --git a/yarn/pom.xml b/yarn/pom.xml index 12bc97da8a..5cf81575c9 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -25,7 +25,7 @@ org.apache.spark - spark-yarn_${scala-short.version} + spark-yarn_2.10 jar Spark Project YARN Support http://spark.incubator.apache.org/ -- cgit v1.2.3 From 17db6a9041d5e83d7b6fe47f9c36758d0613fcd6 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Tue, 10 Dec 2013 11:34:10 +0530 Subject: Style fixes and addressed review comments at #221 --- assembly/pom.xml | 14 +++++++------- bagel/pom.xml | 10 +++++----- core/pom.xml | 18 +++++++++--------- .../scala/org/apache/spark/MapOutputTracker.scala | 9 ++++----- .../main/scala/org/apache/spark/Partitioner.scala | 6 +++--- .../apache/spark/deploy/worker/ui/WorkerWebUI.scala | 14 +++++--------- .../scala/org/apache/spark/rdd/CheckpointRDD.scala | 11 ++++------- .../main/scala/org/apache/spark/rdd/JdbcRDD.scala | 1 + .../main/scala/org/apache/spark/rdd/MappedRDD.scala | 3 ++- .../org/apache/spark/rdd/OrderedRDDFunctions.scala | 3 ++- .../scala/org/apache/spark/rdd/ShuffledRDD.scala | 3 ++- .../apache/spark/storage/BlockManagerMaster.scala | 7 +++---- .../spark/util/IndestructibleActorSystem.scala | 17 +++++++++++++++-- examples/pom.xml | 20 ++++++++++---------- mllib/pom.xml | 10 +++++----- pom.xml | 17 ++++++++--------- repl-bin/pom.xml | 6 +++--- repl/pom.xml | 14 +++++++------- streaming/pom.xml | 16 ++++++++-------- .../spark/streaming/receivers/ZeroMQReceiver.scala | 4 ++-- tools/pom.xml | 10 +++++----- yarn/pom.xml | 8 ++++---- 22 files changed, 114 insertions(+), 107 deletions(-) (limited to 'bagel') diff --git a/assembly/pom.xml b/assembly/pom.xml index 8103534796..c2cda41c6d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -41,27 +41,27 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} org.apache.spark - spark-bagel_${scala-short.version} + spark-bagel_2.10 ${project.version} org.apache.spark - spark-mllib_${scala-short.version} + spark-mllib_2.10 ${project.version} org.apache.spark - spark-repl_${scala-short.version} + spark-repl_2.10 ${project.version} org.apache.spark - spark-streaming_${scala-short.version} + spark-streaming_2.10 ${project.version} @@ -79,7 +79,7 @@ maven-shade-plugin false - ${project.build.directory}/scala-${scala-short.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar + ${project.build.directory}/scala-2.10/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar *:* @@ -128,7 +128,7 @@ org.apache.spark - spark-yarn_${scala-short.version} + spark-yarn_2.10 ${project.version} diff --git a/bagel/pom.xml b/bagel/pom.xml index 461e76a753..0f550d70d6 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -34,7 +34,7 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} @@ -43,18 +43,18 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.scalatest diff --git a/core/pom.xml b/core/pom.xml index af605e1837..71bf15c491 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -86,7 +86,7 @@ com.twitter - chill_${scala-short.version} + chill_2.10 0.3.1 @@ -96,11 +96,11 @@ com.typesafe.akka - akka-remote_${scala-short.version} + akka-remote_2.10 com.typesafe.akka - akka-slf4j_${scala-short.version} + akka-slf4j_2.10 org.scala-lang @@ -108,7 +108,7 @@ net.liftweb - lift-json_${scala-short.version} + lift-json_2.10 it.unimi.dsi @@ -120,7 +120,7 @@ com.github.scala-incubator.io - scala-io-file_${scala-short.version} + scala-io-file_2.10 org.apache.mesos @@ -166,12 +166,12 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test @@ -191,8 +191,8 @@ - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.apache.maven.plugins diff --git a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala index 88a7f24884..d36e1b13a6 100644 --- a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala +++ b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala @@ -72,12 +72,11 @@ private[spark] class MapOutputTracker extends Logging { // throw a SparkException if this fails. private def askTracker(message: Any): Any = { try { - val future = if (trackerActor.isLeft ) { - trackerActor.left.get.ask(message)(timeout) - } else { - trackerActor.right.get.ask(message)(timeout) + val future = trackerActor match { + case Left(a: ActorRef) => a.ask(message)(timeout) + case Right(b: ActorSelection) => b.ask(message)(timeout) } - return Await.result(future, timeout) + Await.result(future, timeout) } catch { case e: Exception => throw new SparkException("Error communicating with MapOutputTracker", e) diff --git a/core/src/main/scala/org/apache/spark/Partitioner.scala b/core/src/main/scala/org/apache/spark/Partitioner.scala index 62b608c088..bcec41c439 100644 --- a/core/src/main/scala/org/apache/spark/Partitioner.scala +++ b/core/src/main/scala/org/apache/spark/Partitioner.scala @@ -17,11 +17,11 @@ package org.apache.spark -import org.apache.spark.util.Utils -import org.apache.spark.rdd.RDD - import scala.reflect.ClassTag +import org.apache.spark.rdd.RDD +import org.apache.spark.util.Utils + /** * An object that defines how the elements in a key-value pair RDD are partitioned by key. * Maps each key to a partition ID, from 0 to `numPartitions - 1`. diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala index a38e32b339..6c18a3c245 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala @@ -17,23 +17,19 @@ package org.apache.spark.deploy.worker.ui -import akka.actor.ActorRef -import akka.util.Timeout +import java.io.File import scala.concurrent.duration._ -import java.io.{FileInputStream, File} - +import akka.util.Timeout import javax.servlet.http.HttpServletRequest -import org.eclipse.jetty.server.{Handler, Server} - +import org.apache.spark.Logging import org.apache.spark.deploy.worker.Worker -import org.apache.spark.{Logging} -import org.apache.spark.ui.JettyUtils +import org.apache.spark.ui.{JettyUtils, UIUtils} import org.apache.spark.ui.JettyUtils._ -import org.apache.spark.ui.UIUtils import org.apache.spark.util.Utils +import org.eclipse.jetty.server.{Handler, Server} /** * Web UI server for the standalone worker. diff --git a/core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala b/core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala index 99ea6e8ee8..a712ef1c27 100644 --- a/core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala @@ -17,16 +17,13 @@ package org.apache.spark.rdd +import java.io.IOException + import scala.reflect.ClassTag + +import org.apache.hadoop.fs.Path import org.apache.spark._ import org.apache.spark.deploy.SparkHadoopUtil -import org.apache.hadoop.mapred.{FileInputFormat, SequenceFileInputFormat, JobConf, Reporter} -import org.apache.hadoop.conf.Configuration -import org.apache.hadoop.io.{NullWritable, BytesWritable} -import org.apache.hadoop.util.ReflectionUtils -import org.apache.hadoop.fs.Path -import java.io.{File, IOException, EOFException} -import java.text.NumberFormat private[spark] class CheckpointRDDPartition(val index: Int) extends Partition {} diff --git a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala index e72f86fb13..8df8718f3b 100644 --- a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala @@ -20,6 +20,7 @@ package org.apache.spark.rdd import java.sql.{Connection, ResultSet} import scala.reflect.ClassTag + import org.apache.spark.{Logging, Partition, SparkContext, TaskContext} import org.apache.spark.util.NextIterator diff --git a/core/src/main/scala/org/apache/spark/rdd/MappedRDD.scala b/core/src/main/scala/org/apache/spark/rdd/MappedRDD.scala index eb3b19907d..8d7c288593 100644 --- a/core/src/main/scala/org/apache/spark/rdd/MappedRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/MappedRDD.scala @@ -17,9 +17,10 @@ package org.apache.spark.rdd -import org.apache.spark.{Partition, TaskContext} import scala.reflect.ClassTag +import org.apache.spark.{Partition, TaskContext} + private[spark] class MappedRDD[U: ClassTag, T: ClassTag](prev: RDD[T], f: T => U) extends RDD[U](prev) { diff --git a/core/src/main/scala/org/apache/spark/rdd/OrderedRDDFunctions.scala b/core/src/main/scala/org/apache/spark/rdd/OrderedRDDFunctions.scala index 4a465840c6..d5691f2267 100644 --- a/core/src/main/scala/org/apache/spark/rdd/OrderedRDDFunctions.scala +++ b/core/src/main/scala/org/apache/spark/rdd/OrderedRDDFunctions.scala @@ -17,9 +17,10 @@ package org.apache.spark.rdd -import org.apache.spark.{RangePartitioner, Logging} import scala.reflect.ClassTag +import org.apache.spark.{Logging, RangePartitioner} + /** * Extra functions available on RDDs of (key, value) pairs where the key is sortable through * an implicit conversion. Import `org.apache.spark.SparkContext._` at the top of your program to diff --git a/core/src/main/scala/org/apache/spark/rdd/ShuffledRDD.scala b/core/src/main/scala/org/apache/spark/rdd/ShuffledRDD.scala index 1d109a2496..3682c84598 100644 --- a/core/src/main/scala/org/apache/spark/rdd/ShuffledRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/ShuffledRDD.scala @@ -17,9 +17,10 @@ package org.apache.spark.rdd -import org.apache.spark.{Dependency, Partitioner, SparkEnv, ShuffleDependency, Partition, TaskContext} import scala.reflect.ClassTag +import org.apache.spark.{Dependency, Partition, Partitioner, ShuffleDependency, + SparkEnv, TaskContext} private[spark] class ShuffledRDDPartition(val idx: Int) extends Partition { override val index = idx diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala index e5de16fc01..e05b842476 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala @@ -157,10 +157,9 @@ private[spark] class BlockManagerMaster(var driverActor : Either[ActorRef, Actor while (attempts < AKKA_RETRY_ATTEMPTS) { attempts += 1 try { - val future = if (driverActor.isLeft ) { - driverActor.left.get.ask(message)(timeout) - } else { - driverActor.right.get.ask(message)(timeout) + val future = driverActor match { + case Left(a: ActorRef) => a.ask(message)(timeout) + case Right(b: ActorSelection) => b.ask(message)(timeout) } val result = Await.result(future, timeout) if (result == null) { diff --git a/core/src/main/scala/org/apache/spark/util/IndestructibleActorSystem.scala b/core/src/main/scala/org/apache/spark/util/IndestructibleActorSystem.scala index 69519860c6..bf71882ef7 100644 --- a/core/src/main/scala/org/apache/spark/util/IndestructibleActorSystem.scala +++ b/core/src/main/scala/org/apache/spark/util/IndestructibleActorSystem.scala @@ -1,5 +1,18 @@ -/** - * Copyright (C) 2009-2013 Typesafe Inc. +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Must be in akka.actor package as ActorSystemImpl is protected[akka]. diff --git a/examples/pom.xml b/examples/pom.xml index 464ad82e33..97f6dfea66 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -49,25 +49,25 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} provided org.apache.spark - spark-streaming_${scala-short.version} + spark-streaming_2.10 ${project.version} provided org.apache.spark - spark-mllib_${scala-short.version} + spark-mllib_2.10 ${project.version} provided org.apache.spark - spark-bagel_${scala-short.version} + spark-bagel_2.10 ${project.version} provided @@ -88,7 +88,7 @@ org.apache.kafka - kafka_2.9.2 + kafka_2.10 0.8.0-beta1 @@ -107,17 +107,17 @@ com.twitter - algebird-core_${scala-short.version} + algebird-core_2.10 0.1.11 org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test @@ -166,8 +166,8 @@ - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.apache.maven.plugins diff --git a/mllib/pom.xml b/mllib/pom.xml index fce5b19bb2..228f8c029b 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -34,7 +34,7 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} @@ -48,12 +48,12 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test @@ -63,8 +63,8 @@ - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.scalatest diff --git a/pom.xml b/pom.xml index 4c11459088..979fd0c287 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,6 @@ 1.6 - 2.10 2.10.3 0.13.0 2.2.3 @@ -205,7 +204,7 @@ com.twitter - chill_${scala-short.version} + chill_2.10 0.3.1 @@ -215,7 +214,7 @@ com.typesafe.akka - akka-actor_${scala-short.version} + akka-actor_2.10 ${akka.version} @@ -226,7 +225,7 @@ com.typesafe.akka - akka-remote_${scala-short.version} + akka-remote_2.10 ${akka.version} @@ -237,7 +236,7 @@ com.typesafe.akka - akka-slf4j_${scala-short.version} + akka-slf4j_2.10 ${akka.version} @@ -258,7 +257,7 @@ com.github.scala-incubator.io - scala-io-file_${scala-short.version} + scala-io-file_2.10 0.4.1 @@ -279,7 +278,7 @@ net.liftweb - lift-json_${scala-short.version} + lift-json_2.10 2.5.1 @@ -335,7 +334,7 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 1.9.1 test @@ -358,7 +357,7 @@ org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 1.10.0 test diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index f8a17d93cc..c2a4efa36c 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -40,18 +40,18 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} org.apache.spark - spark-bagel_${scala-short.version} + spark-bagel_2.10 ${project.version} runtime org.apache.spark - spark-repl_${scala-short.version} + spark-repl_2.10 ${project.version} runtime diff --git a/repl/pom.xml b/repl/pom.xml index 2f27e76760..bf06d730d4 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -39,18 +39,18 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} org.apache.spark - spark-bagel_${scala-short.version} + spark-bagel_2.10 ${project.version} runtime org.apache.spark - spark-mllib_${scala-short.version} + spark-mllib_2.10 ${project.version} runtime @@ -78,18 +78,18 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.apache.maven.plugins diff --git a/streaming/pom.xml b/streaming/pom.xml index ff95591b9f..298bc83161 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -48,7 +48,7 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} @@ -61,8 +61,8 @@ 1.9.11 - org.apache.kafka - kafka_2.9.2 + com.sksamuel.kafka + kafka_2.10 0.8.0-beta1 @@ -111,7 +111,7 @@ com.typesafe.akka - akka-zeromq_${scala-short.version} + akka-zeromq_2.10 ${akka.version} @@ -122,12 +122,12 @@ org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test org.scalacheck - scalacheck_${scala-short.version} + scalacheck_2.10 test @@ -151,8 +151,8 @@ - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.scalatest diff --git a/streaming/src/main/scala/org/apache/spark/streaming/receivers/ZeroMQReceiver.scala b/streaming/src/main/scala/org/apache/spark/streaming/receivers/ZeroMQReceiver.scala index ce8c56fa8a..f164d516b0 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/receivers/ZeroMQReceiver.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/receivers/ZeroMQReceiver.scala @@ -17,14 +17,14 @@ package org.apache.spark.streaming.receivers +import scala.reflect.ClassTag + import akka.actor.Actor import akka.util.ByteString import akka.zeromq._ import org.apache.spark.Logging -import scala.reflect.ClassTag - /** * A receiver to subscribe to ZeroMQ stream. */ diff --git a/tools/pom.xml b/tools/pom.xml index 353d201f90..2bad494fc5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -33,24 +33,24 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} org.apache.spark - spark-streaming_${scala-short.version} + spark-streaming_2.10 ${project.version} org.scalatest - scalatest_${scala-short.version} + scalatest_2.10 test - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.apache.maven.plugins diff --git a/yarn/pom.xml b/yarn/pom.xml index 5cf81575c9..d18ac3736d 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -33,7 +33,7 @@ org.apache.spark - spark-core_${scala-short.version} + spark-core_2.10 ${project.version} @@ -63,7 +63,7 @@ org.scalatest - scalatest_2.9.3 + scalatest_2.10 test @@ -74,8 +74,8 @@ - target/scala-${scala-short.version}/classes - target/scala-${scala-short.version}/test-classes + target/scala-2.10/classes + target/scala-2.10/test-classes org.apache.maven.plugins -- cgit v1.2.3 From 09ed7ddfa0ef8dde12304a26be776232cadc8b1e Mon Sep 17 00:00:00 2001 From: Mark Hamstra Date: Sun, 15 Dec 2013 12:39:58 -0800 Subject: Use scala.binary.version in POMs --- assembly/pom.xml | 14 +++++++------- bagel/pom.xml | 10 +++++----- core/pom.xml | 18 +++++++++--------- examples/pom.xml | 20 ++++++++++---------- mllib/pom.xml | 10 +++++----- pom.xml | 17 +++++++++-------- repl-bin/pom.xml | 6 +++--- repl/pom.xml | 14 +++++++------- streaming/pom.xml | 14 +++++++------- tools/pom.xml | 10 +++++----- yarn/pom.xml | 8 ++++---- 11 files changed, 71 insertions(+), 70 deletions(-) (limited to 'bagel') diff --git a/assembly/pom.xml b/assembly/pom.xml index c2cda41c6d..fc2adc1fbb 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -41,27 +41,27 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} org.apache.spark - spark-bagel_2.10 + spark-bagel_${scala.binary.version} ${project.version} org.apache.spark - spark-mllib_2.10 + spark-mllib_${scala.binary.version} ${project.version} org.apache.spark - spark-repl_2.10 + spark-repl_${scala.binary.version} ${project.version} org.apache.spark - spark-streaming_2.10 + spark-streaming_${scala.binary.version} ${project.version} @@ -79,7 +79,7 @@ maven-shade-plugin false - ${project.build.directory}/scala-2.10/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar + ${project.build.directory}/scala-${scala.binary.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar *:* @@ -128,7 +128,7 @@ org.apache.spark - spark-yarn_2.10 + spark-yarn_${scala.binary.version} ${project.version} diff --git a/bagel/pom.xml b/bagel/pom.xml index 0f550d70d6..cb8e79f225 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -34,7 +34,7 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} @@ -43,18 +43,18 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.scalatest diff --git a/core/pom.xml b/core/pom.xml index 3fe48fd2af..cdbaa52731 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -86,7 +86,7 @@ com.twitter - chill_2.10 + chill_${scala.binary.version} 0.3.1 @@ -96,15 +96,15 @@ ${akka.group} - akka-actor_2.10 + akka-actor_${scala.binary.version} ${akka.group} - akka-remote_2.10 + akka-remote_${scala.binary.version} ${akka.group} - akka-slf4j_2.10 + akka-slf4j_${scala.binary.version} org.scala-lang @@ -112,7 +112,7 @@ net.liftweb - lift-json_2.10 + lift-json_${scala.binary.version} it.unimi.dsi @@ -166,12 +166,12 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test @@ -191,8 +191,8 @@ - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.apache.maven.plugins diff --git a/examples/pom.xml b/examples/pom.xml index e16b1c80aa..7a7032c319 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -49,25 +49,25 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} provided org.apache.spark - spark-streaming_2.10 + spark-streaming_${scala.binary.version} ${project.version} provided org.apache.spark - spark-mllib_2.10 + spark-mllib_${scala.binary.version} ${project.version} provided org.apache.spark - spark-bagel_2.10 + spark-bagel_${scala.binary.version} ${project.version} provided @@ -88,7 +88,7 @@ com.sksamuel.kafka - kafka_2.10 + kafka_${scala.binary.version} 0.8.0-beta1 @@ -107,17 +107,17 @@ com.twitter - algebird-core_2.10 + algebird-core_${scala.binary.version} 0.1.11 org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test @@ -166,8 +166,8 @@ - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.apache.maven.plugins diff --git a/mllib/pom.xml b/mllib/pom.xml index 228f8c029b..dda3900afe 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -34,7 +34,7 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} @@ -48,12 +48,12 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test @@ -63,8 +63,8 @@ - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.scalatest diff --git a/pom.xml b/pom.xml index 58fc02e029..fd99fabc15 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,7 @@ 1.6 2.10.3 + 2.10 0.13.0 2.2.3 com.typesafe.akka @@ -206,7 +207,7 @@ com.twitter - chill_2.10 + chill_${scala.binary.version} 0.3.1 @@ -216,7 +217,7 @@ ${akka.group} - akka-actor_2.10 + akka-actor_${scala.binary.version} ${akka.version} @@ -227,7 +228,7 @@ ${akka.group} - akka-remote_2.10 + akka-remote_${scala.binary.version} ${akka.version} @@ -238,7 +239,7 @@ ${akka.group} - akka-slf4j_2.10 + akka-slf4j_${scala.binary.version} ${akka.version} @@ -249,7 +250,7 @@ ${akka.group} - akka-zeromq_2.10 + akka-zeromq_${scala.binary.version} ${akka.version} @@ -286,7 +287,7 @@ net.liftweb - lift-json_2.10 + lift-json_${scala.binary.version} 2.5.1 @@ -342,7 +343,7 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} 1.9.1 test @@ -365,7 +366,7 @@ org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} 1.10.0 test diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index c2a4efa36c..869dbdb9b0 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -40,18 +40,18 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} org.apache.spark - spark-bagel_2.10 + spark-bagel_${scala.binary.version} ${project.version} runtime org.apache.spark - spark-repl_2.10 + spark-repl_${scala.binary.version} ${project.version} runtime diff --git a/repl/pom.xml b/repl/pom.xml index bf06d730d4..b0e7877bbb 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -39,18 +39,18 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} org.apache.spark - spark-bagel_2.10 + spark-bagel_${scala.binary.version} ${project.version} runtime org.apache.spark - spark-mllib_2.10 + spark-mllib_${scala.binary.version} ${project.version} runtime @@ -78,18 +78,18 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.apache.maven.plugins diff --git a/streaming/pom.xml b/streaming/pom.xml index e27b437aae..e3b6fee9b2 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -48,7 +48,7 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} @@ -62,7 +62,7 @@ com.sksamuel.kafka - kafka_2.10 + kafka_${scala.binary.version} 0.8.0-beta1 @@ -111,16 +111,16 @@ ${akka.group} - akka-zeromq_2.10 + akka-zeromq_${scala.binary.version} org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test org.scalacheck - scalacheck_2.10 + scalacheck_${scala.binary.version} test @@ -144,8 +144,8 @@ - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.scalatest diff --git a/tools/pom.xml b/tools/pom.xml index 2bad494fc5..28f5ef14b1 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -33,24 +33,24 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} org.apache.spark - spark-streaming_2.10 + spark-streaming_${scala.binary.version} ${project.version} org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.apache.maven.plugins diff --git a/yarn/pom.xml b/yarn/pom.xml index d18ac3736d..bc64a190fd 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -33,7 +33,7 @@ org.apache.spark - spark-core_2.10 + spark-core_${scala.binary.version} ${project.version} @@ -63,7 +63,7 @@ org.scalatest - scalatest_2.10 + scalatest_${scala.binary.version} test @@ -74,8 +74,8 @@ - target/scala-2.10/classes - target/scala-2.10/test-classes + target/scala-${scala.binary.version}/classes + target/scala-${scala.binary.version}/test-classes org.apache.maven.plugins -- cgit v1.2.3