diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-07-16 21:41:28 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-07-16 21:41:28 -0700 |
| commit | cad48edb70c58a48f66851e963f51db712ab7863 (patch) | |
| tree | 1182c04c4c729110745cdb62ca4e2fda96298377 /project | |
| parent | 7e74ab5b0f4e15a3bb8c05792e5c7c0970775587 (diff) | |
| parent | 2748e73eb9bb3f08b116c58ea404a6e76f9cbff9 (diff) | |
| download | spark-cad48edb70c58a48f66851e963f51db712ab7863.tar.gz spark-cad48edb70c58a48f66851e963f51db712ab7863.tar.bz2 spark-cad48edb70c58a48f66851e963f51db712ab7863.zip | |
Merge pull request #708 from ScrapCodes/dependencies-upgrade
Dependency upgrade Akka 2.0.3 -> 2.0.5
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7a4d4c4575..e9819b877d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -169,9 +169,9 @@ object SparkBuild extends Build { "org.ow2.asm" % "asm" % "4.0", "com.google.protobuf" % "protobuf-java" % "2.4.1", "de.javakaffee" % "kryo-serializers" % "0.22", - "com.typesafe.akka" % "akka-actor" % "2.0.3" excludeAll(excludeNetty), - "com.typesafe.akka" % "akka-remote" % "2.0.3" excludeAll(excludeNetty), - "com.typesafe.akka" % "akka-slf4j" % "2.0.3" excludeAll(excludeNetty), + "com.typesafe.akka" % "akka-actor" % "2.0.5" excludeAll(excludeNetty), + "com.typesafe.akka" % "akka-remote" % "2.0.5" excludeAll(excludeNetty), + "com.typesafe.akka" % "akka-slf4j" % "2.0.5" excludeAll(excludeNetty), "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "net.liftweb" % "lift-json_2.9.2" % "2.5", @@ -251,7 +251,7 @@ object SparkBuild extends Build { "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty), "com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty), "org.twitter4j" % "twitter4j-stream" % "3.0.3" excludeAll(excludeNetty), - "com.typesafe.akka" % "akka-zeromq" % "2.0.3" excludeAll(excludeNetty) + "com.typesafe.akka" % "akka-zeromq" % "2.0.5" excludeAll(excludeNetty) ) ) ++ assemblySettings ++ extraAssemblySettings |