You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/11 18:46:58 UTC
[1/2] git commit: Upgrade Kafka dependecy to 0.8.0 release version
Updated Branches:
refs/heads/master 92ad18b00 -> 4216178d5
Upgrade Kafka dependecy to 0.8.0 release version
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/dd7fd0c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/dd7fd0c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/dd7fd0c4
Branch: refs/heads/master
Commit: dd7fd0c4433398b2e0a86e008a4d64dafc2f11be
Parents: 12f414e
Author: jerryshao <sa...@intel.com>
Authored: Fri Jan 10 08:53:59 2014 +0800
Committer: jerryshao <sa...@intel.com>
Committed: Fri Jan 10 08:56:11 2014 +0800
----------------------------------------------------------------------
external/kafka/pom.xml | 4 ++--
project/SparkBuild.scala | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/dd7fd0c4/external/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index f782e0e..23b2fea 100644
--- a/external/kafka/pom.xml
+++ b/external/kafka/pom.xml
@@ -45,9 +45,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sksamuel.kafka</groupId>
+ <groupId>org.apache.kafka</groupId>
<artifactId>kafka_${scala.binary.version}</artifactId>
- <version>0.8.0-beta1</version>
+ <version>0.8.0</version>
<exclusions>
<exclusion>
<groupId>com.sun.jmx</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/dd7fd0c4/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index bd5816e..c1a5c4d 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -90,7 +90,7 @@ object SparkBuild extends Build {
lazy val maybeYarn = if (isYarnEnabled) Seq[ClasspathDependency](if (isNewHadoop) yarn else yarnAlpha) else Seq[ClasspathDependency]()
lazy val maybeYarnRef = if (isYarnEnabled) Seq[ProjectReference](if (isNewHadoop) yarn else yarnAlpha) else Seq[ProjectReference]()
- lazy val externalTwitter = Project("external-twitter", file("external/twitter"), settings = twitterSettings)
+ lazy val externalTwitter = Project("external-twitter", file("external/twitter"), settings = twitterSettings)
.dependsOn(streaming % "compile->compile;test->test")
lazy val externalKafka = Project("external-kafka", file("external/kafka"), settings = kafkaSettings)
@@ -98,23 +98,23 @@ object SparkBuild extends Build {
lazy val externalFlume = Project("external-flume", file("external/flume"), settings = flumeSettings)
.dependsOn(streaming % "compile->compile;test->test")
-
+
lazy val externalZeromq = Project("external-zeromq", file("external/zeromq"), settings = zeromqSettings)
.dependsOn(streaming % "compile->compile;test->test")
-
+
lazy val externalMqtt = Project("external-mqtt", file("external/mqtt"), settings = mqttSettings)
.dependsOn(streaming % "compile->compile;test->test")
lazy val allExternal = Seq[ClasspathDependency](externalTwitter, externalKafka, externalFlume, externalZeromq, externalMqtt)
lazy val allExternalRefs = Seq[ProjectReference](externalTwitter, externalKafka, externalFlume, externalZeromq, externalMqtt)
-
+
lazy val examples = Project("examples", file("examples"), settings = examplesSettings)
.dependsOn(core, mllib, bagel, streaming, externalTwitter) dependsOn(allExternal: _*)
// Everything except assembly, tools and examples belong to packageProjects
lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib) ++ maybeYarnRef
- lazy val allProjects = packageProjects ++ allExternalRefs ++ Seq[ProjectReference](examples, tools, assemblyProj)
+ lazy val allProjects = packageProjects ++ allExternalRefs ++ Seq[ProjectReference](examples, tools, assemblyProj)
def sharedSettings = Defaults.defaultSettings ++ Seq(
organization := "org.apache.spark",
@@ -320,7 +320,7 @@ object SparkBuild extends Build {
def streamingSettings = sharedSettings ++ Seq(
name := "spark-streaming",
libraryDependencies ++= Seq(
- "commons-io" % "commons-io" % "2.4"
+ "commons-io" % "commons-io" % "2.4"
)
)
@@ -387,19 +387,19 @@ object SparkBuild extends Build {
"org.twitter4j" % "twitter4j-stream" % "3.0.3" excludeAll(excludeNetty)
)
)
-
+
def kafkaSettings() = sharedSettings ++ Seq(
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")
excludeAll(excludeNetty)
)
)
-
+
def flumeSettings() = sharedSettings ++ Seq(
name := "spark-streaming-flume",
libraryDependencies ++= Seq(
[2/2] git commit: Merge pull request #373 from jerryshao/kafka-upgrade
Posted by pw...@apache.org.
Merge pull request #373 from jerryshao/kafka-upgrade
Upgrade Kafka dependecy to 0.8.0 release version
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4216178d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4216178d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4216178d
Branch: refs/heads/master
Commit: 4216178d5e81fad911b69e75f5a272e63d3d208a
Parents: 92ad18b dd7fd0c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 11 09:46:48 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 11 09:46:48 2014 -0800
----------------------------------------------------------------------
external/kafka/pom.xml | 4 ++--
project/SparkBuild.scala | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4216178d/project/SparkBuild.scala
----------------------------------------------------------------------