Skip to content
Snippets Groups Projects
Commit 5429d62d authored by Reynold Xin's avatar Reynold Xin
Browse files

Merge pull request #107 from ScrapCodes/scala-2.10

Updating to latest akka 2.2.3, which fixes our only failing test Driver Suite.
parents 0e5052ba c77ca1fe
No related branches found
No related tags found
No related merge requests found
...@@ -164,7 +164,7 @@ object SparkBuild extends Build { ...@@ -164,7 +164,7 @@ object SparkBuild extends Build {
"commons-io" % "commons-io" % "2.4" % "test" "commons-io" % "commons-io" % "2.4" % "test"
), ),
parallelExecution := false, parallelExecution := true,
/* Workaround for issue #206 (fixed after SBT 0.11.0) */ /* Workaround for issue #206 (fixed after SBT 0.11.0) */
watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task,
const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) }, const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) },
...@@ -204,8 +204,8 @@ object SparkBuild extends Build { ...@@ -204,8 +204,8 @@ object SparkBuild extends Build {
"commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407 "commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407
"org.ow2.asm" % "asm" % "4.0", "org.ow2.asm" % "asm" % "4.0",
"com.google.protobuf" % "protobuf-java" % "2.4.1", "com.google.protobuf" % "protobuf-java" % "2.4.1",
"com.typesafe.akka" %% "akka-remote" % "2.2.1" excludeAll(excludeNetty), "com.typesafe.akka" %% "akka-remote" % "2.2.3" excludeAll(excludeNetty),
"com.typesafe.akka" %% "akka-slf4j" % "2.2.1" excludeAll(excludeNetty), "com.typesafe.akka" %% "akka-slf4j" % "2.2.3" excludeAll(excludeNetty),
"net.liftweb" %% "lift-json" % "2.5.1" excludeAll(excludeNetty), "net.liftweb" %% "lift-json" % "2.5.1" excludeAll(excludeNetty),
"it.unimi.dsi" % "fastutil" % "6.4.4", "it.unimi.dsi" % "fastutil" % "6.4.4",
"colt" % "colt" % "1.2.0", "colt" % "colt" % "1.2.0",
...@@ -276,7 +276,7 @@ object SparkBuild extends Build { ...@@ -276,7 +276,7 @@ object SparkBuild extends Build {
"org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty, excludeSnappy), "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty, excludeSnappy),
"com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty), "com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty),
"org.twitter4j" % "twitter4j-stream" % "3.0.3" 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)
) )
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment