diff options
| author | Nick Pentreath <nick.pentreath@gmail.com> | 2013-02-19 13:58:05 +0200 |
|---|---|---|
| committer | Nick Pentreath <nick.pentreath@gmail.com> | 2013-02-19 13:58:05 +0200 |
| commit | 315ea069e8aeb78dde23836827bd51462208aa7a (patch) | |
| tree | 69943e269aedaf22a6267b65f1412576b2ad1a95 /project/SparkBuild.scala | |
| parent | 015893f0e8983a7e249709d9820d1bf0dd74d607 (diff) | |
| parent | 8b9c673fce1c733c7fcd8b978e84f943be9e9e35 (diff) | |
| download | spark-315ea069e8aeb78dde23836827bd51462208aa7a.tar.gz spark-315ea069e8aeb78dde23836827bd51462208aa7a.tar.bz2 spark-315ea069e8aeb78dde23836827bd51462208aa7a.zip | |
Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 18cc9ea90e..090fd65bcb 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -155,10 +155,7 @@ object SparkBuild extends Build { def examplesSettings = sharedSettings ++ Seq( name := "spark-examples", - libraryDependencies ++= Seq( - "org.twitter4j" % "twitter4j-stream" % "3.0.3", - "com.twitter" % "algebird-core_2.9.2" % "0.1.8" - ) + libraryDependencies ++= Seq("com.twitter" % "algebird-core_2.9.2" % "0.1.8") ) def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel") @@ -167,7 +164,8 @@ object SparkBuild extends Build { name := "spark-streaming", libraryDependencies ++= Seq( "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile", - "com.github.sgroschupf" % "zkclient" % "0.1" + "com.github.sgroschupf" % "zkclient" % "0.1", + "org.twitter4j" % "twitter4j-stream" % "3.0.3" ) ) ++ assemblySettings ++ extraAssemblySettings |