diff options
| author | tmalaska <ted.malaska@cloudera.com> | 2014-04-24 20:31:17 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-24 20:31:17 -0700 |
| commit | d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90 (patch) | |
| tree | f8353a46fcd1db4a749c3b1c822c9f28e0b56c1a /project | |
| parent | e53eb4f0159ebd4d72c4bbc3586fdfc66ccacab7 (diff) | |
| download | spark-d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90.tar.gz spark-d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90.tar.bz2 spark-d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90.zip | |
SPARK-1584: Upgrade Flume dependency to 1.4.0
Updated the Flume dependency in the maven pom file and the scala build file.
Author: tmalaska <ted.malaska@cloudera.com>
Closes #507 from tmalaska/master and squashes the following commits:
79492c8 [tmalaska] excluded all thrift
159c3f1 [tmalaska] fixed the flume pom file issues
5bf56a7 [tmalaska] Upgrade flume version
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b8af2bbd2e..9cbc188c4d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -313,6 +313,7 @@ object SparkBuild extends Build { val excludeCurator = ExclusionRule(organization = "org.apache.curator") val excludePowermock = ExclusionRule(organization = "org.powermock") val excludeFastutil = ExclusionRule(organization = "it.unimi.dsi") + val excludeThrift = ExclusionRule(organization = "org.apache.thrift") def sparkPreviousArtifact(id: String, organization: String = "org.apache.spark", version: String = "0.9.0-incubating", crossVersion: String = "2.10"): Option[sbt.ModuleID] = { @@ -607,7 +608,7 @@ object SparkBuild extends Build { name := "spark-streaming-flume", previousArtifact := sparkPreviousArtifact("spark-streaming-flume"), libraryDependencies ++= Seq( - "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty) + "org.apache.flume" % "flume-ng-sdk" % "1.4.0" % "compile" excludeAll(excludeNetty, excludeThrift) ) ) |