From 7d50ef13c985a1cc9006c42845e00c17b1c4cec1 Mon Sep 17 00:00:00 2001
From: Yin Huai <huai@cse.ohio-state.edu>
Date: Tue, 27 May 2014 13:39:05 -0700
Subject: [PATCH] Explicitly add commons-codec 1.5 as a dependency.

---
 pom.xml                  | 5 +++++
 project/SparkBuild.scala | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 86264d1132ec4..7bf9f135fd340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,11 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.3.2</version>
       </dependency>
+      <dependency>
+	  <groupId>commons-codec</groupId>
+	    <artifactId>commons-codec</artifactId>
+	    <version>1.5</version>
+      </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b9d92340ff75b..8ef1e91f609fb 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -348,6 +348,7 @@ object SparkBuild extends Build {
         "org.apache.mesos"           % "mesos"            % "0.18.1" classifier("shaded-protobuf") exclude("com.google.protobuf", "protobuf-java"),
         "commons-net"                % "commons-net"      % "2.2",
         "net.java.dev.jets3t"        % "jets3t"           % jets3tVersion excludeAll(excludeCommonsLogging),
+        "commons-codec"              % "commons-codec"    % "1.5", // Prevent jets3t from including the older version of commons-codec
         "org.apache.derby"           % "derby"            % "10.4.2.0"                     % "test",
         "org.apache.hadoop"          % hadoopClient       % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm),
         "org.apache.curator"         % "curator-recipes"  % "2.4.0" excludeAll(excludeJBossNetty),