aboutsummaryrefslogtreecommitdiff
path: root/project/SparkBuild.scala
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2013-10-24 16:11:40 +0530
committerPrashant Sharma <prashant.s@imaginea.com>2013-10-24 16:11:40 +0530
commitc77ca1fed994b5a23c745dc1f6a837739b4a2138 (patch)
tree9c62aecbeee195e1ec9b32ee13eb67c24b12001a /project/SparkBuild.scala
parentbfbd7e5d9f9e556961e79135dcde8f88fa31e2bc (diff)
downloadspark-c77ca1fed994b5a23c745dc1f6a837739b4a2138.tar.gz
spark-c77ca1fed994b5a23c745dc1f6a837739b4a2138.tar.bz2
spark-c77ca1fed994b5a23c745dc1f6a837739b4a2138.zip
Updating to latest akka 2.2.3, which fixes our only failing Driver Suite
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r--project/SparkBuild.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a734558142..43db97f680 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -164,7 +164,7 @@ object SparkBuild extends Build {
"commons-io" % "commons-io" % "2.4" % "test"
),
- parallelExecution := false,
+ parallelExecution := true,
/* Workaround for issue #206 (fixed after SBT 0.11.0) */
watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task,
const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) },
@@ -204,8 +204,8 @@ object SparkBuild extends Build {
"commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407
"org.ow2.asm" % "asm" % "4.0",
"com.google.protobuf" % "protobuf-java" % "2.4.1",
- "com.typesafe.akka" %% "akka-remote" % "2.2.1" excludeAll(excludeNetty),
- "com.typesafe.akka" %% "akka-slf4j" % "2.2.1" excludeAll(excludeNetty),
+ "com.typesafe.akka" %% "akka-remote" % "2.2.3" excludeAll(excludeNetty),
+ "com.typesafe.akka" %% "akka-slf4j" % "2.2.3" excludeAll(excludeNetty),
"net.liftweb" %% "lift-json" % "2.5.1" excludeAll(excludeNetty),
"it.unimi.dsi" % "fastutil" % "6.4.4",
"colt" % "colt" % "1.2.0",
@@ -276,7 +276,7 @@ object SparkBuild extends Build {
"org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty, excludeSnappy),
"com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty),
"org.twitter4j" % "twitter4j-stream" % "3.0.3" excludeAll(excludeNetty),
- "com.typesafe.akka" %% "akka-zeromq" % "2.2.1" excludeAll(excludeNetty)
+ "com.typesafe.akka" %% "akka-zeromq" % "2.2.3" excludeAll(excludeNetty)
)
)