diff options
author | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
---|---|---|
committer | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
commit | f629ba95b6a1a3508463bfdcb03efcfaa3327cb5 (patch) | |
tree | 74a4cbcd839471d8c4248c9615f5803fad28787d /project | |
parent | d4cd32330e1e4ac83b38bc922a9d3fd85f85f606 (diff) | |
download | spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.gz spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.bz2 spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.zip |
Various merge corrections
I've diff'd this patch against my own -- since they were both created
independently, this means that two sets of eyes have gone over all the
merge conflicts that were created, so I'm feeling significantly more
confident in the resulting PR.
@rxin has looked at the changes to the repl and is resoundingly
confident that they are correct.
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 26e6a8326c..476e7c5800 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -105,12 +105,6 @@ object SparkBuild extends Build { // also check the local Maven repository ~/.m2 resolvers ++= Seq(Resolver.file("Local Maven Repo", file(Path.userHome + "/.m2/repository"))), - // Shared between both core and streaming. - resolvers ++= Seq("Akka Repository" at "http://repo.akka.io/releases/"), - - // Shared between both examples and streaming. - resolvers ++= Seq("Mqtt Repository" at "https://repo.eclipse.org/content/repositories/paho-releases/"), - // For Sonatype publishing resolvers ++= Seq("sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", "sonatype-staging" at "https://oss.sonatype.org/service/local/staging/deploy/maven2/"), @@ -292,11 +286,10 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty, excludeSnappy), - "com.sksamuel.kafka" %% "kafka" % "0.8.0-beta1" + "org.apache.kafka" % "kafka_2.9.2" % "0.8.0-beta1" exclude("com.sun.jdmk", "jmxtools") exclude("com.sun.jmx", "jmxri") - exclude("net.sf.jopt-simple", "jopt-simple") - excludeAll(excludeNetty), + exclude("net.sf.jopt-simple", "jopt-simple"), "org.eclipse.paho" % "mqtt-client" % "0.4.0", "com.github.sgroschupf" % "zkclient" % "0.1" excludeAll(excludeNetty), "org.twitter4j" % "twitter4j-stream" % "3.0.3" excludeAll(excludeNetty), |