diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-24 18:08:26 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-24 18:08:26 +0530 |
| commit | ad88f083a627ba38e99b1b135a82a1fcfd107444 (patch) | |
| tree | bd6571711c8a1983360e4a61b40f1d917f690e17 /project/SparkBuild.scala | |
| parent | 185bb9525a3a48313cd5e446e1b80d2d697465d8 (diff) | |
| download | spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.tar.gz spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.tar.bz2 spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.zip | |
scala 2.10 and master merge
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 2571e54b04..7b61e2ba3e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -178,10 +178,10 @@ object SparkBuild extends Build { def streamingSettings = sharedSettings ++ Seq( name := "spark-streaming", libraryDependencies ++= Seq( - "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile", - "com.github.sgroschupf" % "zkclient" % "0.1", - "org.twitter4j" % "twitter4j-stream" % "3.0.3", - "com.typesafe.akka" % "akka-zeromq" % "2.0.3" + "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile", + "com.github.sgroschupf" % "zkclient" % "0.1", + "org.twitter4j" % "twitter4j-stream" % "3.0.3", + "com.typesafe.akka" % "akka-zeromq" % "2.1-M1" excludeAll(ExclusionRule(name = "akka-actor"), ExclusionRule(organization = "org.scala-lang")) ) ) ++ assemblySettings ++ extraAssemblySettings |