aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-10-21 23:31:38 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-10-21 23:31:38 -0700
commit731c94e91d310eadb58ec5ff3338b430f10fdefb (patch)
tree439912d78b338df612dc134565e3e0590452bacc /project
parent48952d67e6dde25faaba241b9deba737b83a5372 (diff)
parentc23cd72b4bbcbf5f615636095c69e9a2e39bfbdd (diff)
downloadspark-731c94e91d310eadb58ec5ff3338b430f10fdefb.tar.gz
spark-731c94e91d310eadb58ec5ff3338b430f10fdefb.tar.bz2
spark-731c94e91d310eadb58ec5ff3338b430f10fdefb.zip
Merge pull request #56 from jerryshao/kafka-0.8-dev
Upgrade Kafka 0.7.2 to Kafka 0.8.0-beta1 for Spark Streaming Conflicts: streaming/pom.xml
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala9
1 files changed, 6 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 965c4f3a63..17f480e3f0 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -278,13 +278,16 @@ object SparkBuild extends Build {
def streamingSettings = sharedSettings ++ Seq(
name := "spark-streaming",
resolvers ++= Seq(
- "Akka Repository" at "http://repo.akka.io/releases/"
+ "Akka Repository" at "http://repo.akka.io/releases/",
+ "Apache repo" at "https://repository.apache.org/content/repositories/releases"
),
libraryDependencies ++= Seq(
"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.0.5" excludeAll(excludeNetty)
+ "com.typesafe.akka" % "akka-zeromq" % "2.0.5" excludeAll(excludeNetty),
+ "org.apache.kafka" % "kafka_2.9.2" % "0.8.0-beta1"
+ exclude("com.sun.jdmk", "jmxtools")
+ exclude("com.sun.jmx", "jmxri")
)
)