From 60b89fe6b09ff896a30d74204876da883e307de7 Mon Sep 17 00:00:00 2001
From: Yin Huai <huai@cse.ohio-state.edu>
Date: Thu, 29 May 2014 09:07:39 -0700
Subject: [PATCH] SPARK-1935: Explicitly add commons-codec 1.5 as a dependency.
Author: Yin Huai <huai@cse.ohio-state.edu>
Closes #889 from yhuai/SPARK-1935 and squashes the following commits:
7d50ef1 [Yin Huai] 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 86264d1132..7bf9f135fd 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 b9d92340ff..8ef1e91f60 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),
--
GitLab