aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pom.xml5
-rw-r--r--project/SparkBuild.scala1
2 files changed, 6 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 86264d1132..7bf9f135fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,11 @@
<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>
<version>1.3.9</version>
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),