From f117dc6d0d1349c28b7e1c8cf7729d1aafde5d25 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei.zaharia@gmail.com>
Date: Tue, 10 Sep 2013 06:39:25 +0000
Subject: [PATCH] Add explicit jets3t dependency, which is excluded in
 hadoop-client

---
 core/pom.xml             | 5 +++++
 pom.xml                  | 5 +++++
 project/SparkBuild.scala | 1 +
 3 files changed, 11 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index b5c5194524..14cd520aaf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,6 +36,11 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.java.dev.jets3t</groupId>
+      <artifactId>jets3t</artifactId>
+      <version>0.7.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
diff --git a/pom.xml b/pom.xml
index d05449ebd8..bb03a92de8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>net.java.dev.jets3t</groupId>
+        <artifactId>jets3t</artifactId>
+        <version>0.7.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-yarn-api</artifactId>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a60b553b5a..087c6d8a8d 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -208,6 +208,7 @@ object SparkBuild extends Build {
       "io.netty" % "netty-all" % "4.0.0.Beta2",
       "org.apache.derby" % "derby" % "10.4.2.0" % "test",
       "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm),
+      "net.java.dev.jets3t" % "jets3t" % "0.7.1",
       "org.apache.avro" % "avro" % "1.7.4",
       "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty),
       "com.codahale.metrics" % "metrics-core" % "3.0.0",
-- 
GitLab