From d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90 Mon Sep 17 00:00:00 2001
From: tmalaska <ted.malaska@cloudera.com>
Date: Thu, 24 Apr 2014 20:31:17 -0700
Subject: 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
---
 external/flume/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'external')

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>
-- 
cgit v1.2.3