diff options
| author | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
| commit | e2d25d2dfeb1d43d1e36f169250d8efef4ac232a (patch) | |
| tree | d911a37f5aacc89bc3a1c76d41842e1c156aec6a /project/SparkBuild.scala | |
| parent | 8038da232870fe016e73122a2ef110ac8e56ca1e (diff) | |
| parent | b93f9d42f21f03163734ef97b2871db945e166da (diff) | |
| download | spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.gz spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.bz2 spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.zip | |
Merge branch 'master' into graphx
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c2b1c0c35c..d508603e24 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -252,6 +252,7 @@ object SparkBuild extends Build { "org.ow2.asm" % "asm" % "4.0", "org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), "org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), + "org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test", "net.liftweb" %% "lift-json" % "2.5.1" excludeAll(excludeNetty), "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", @@ -398,7 +399,7 @@ object SparkBuild extends Build { name := "spark-streaming-kafka", libraryDependencies ++= Seq( "com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty), - "com.sksamuel.kafka" %% "kafka" % "0.8.0-beta1" + "org.apache.kafka" %% "kafka" % "0.8.0" exclude("com.sun.jdmk", "jmxtools") exclude("com.sun.jmx", "jmxri") exclude("net.sf.jopt-simple", "jopt-simple") |