diff options
| -rw-r--r-- | external/flume/pom.xml | 6 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/external/flume/pom.xml b/external/flume/pom.xml index f219635315..b84ca0c5e1 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -61,12 +61,16 @@ <dependency> <groupId>org.apache.flume</groupId> <artifactId>flume-ng-sdk</artifactId> - <version>1.2.0</version> + <version>1.4.0</version> <exclusions> <exclusion> <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> <dependency> 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) ) ) |