aboutsummaryrefslogtreecommitdiff
path: root/streaming/pom.xml
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 /streaming/pom.xml
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 'streaming/pom.xml')
-rw-r--r--streaming/pom.xml38
1 files changed, 21 insertions, 17 deletions
diff --git a/streaming/pom.xml b/streaming/pom.xml
index bcbed1644a..339fcd2a39 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -32,10 +32,16 @@
<url>http://spark.incubator.apache.org/</url>
<repositories>
- <!-- A repository in the local filesystem for the Kafka JAR, which we modified for Scala 2.9 -->
<repository>
- <id>lib</id>
- <url>file://${project.basedir}/lib</url>
+ <id>apache-repo</id>
+ <name>Apache Repository</name>
+ <url>https://repository.apache.org/content/repositories/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -56,9 +62,18 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>kafka</artifactId>
- <version>0.7.2-spark</version> <!-- Comes from our in-project repository -->
- <scope>provided</scope>
+ <artifactId>kafka_2.9.2</artifactId>
+ <version>0.8.0-beta1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
@@ -76,17 +91,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.github.sgroschupf</groupId>
- <artifactId>zkclient</artifactId>
- <version>0.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.twitter4j</groupId>
<artifactId>twitter4j-stream</artifactId>
<version>3.0.3</version>