Skip to content

Commit 60b89fe

Browse files
yhuaipwendell
authored andcommitted
SPARK-1935: Explicitly add commons-codec 1.5 as a dependency.
Author: Yin Huai <[email protected]> Closes #889 from yhuai/SPARK-1935 and squashes the following commits: 7d50ef1 [Yin Huai] Explicitly add commons-codec 1.5 as a dependency.
1 parent 9cff1dd commit 60b89fe

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@
240240
<artifactId>commons-lang3</artifactId>
241241
<version>3.3.2</version>
242242
</dependency>
243+
<dependency>
244+
<groupId>commons-codec</groupId>
245+
<artifactId>commons-codec</artifactId>
246+
<version>1.5</version>
247+
</dependency>
243248
<dependency>
244249
<groupId>com.google.code.findbugs</groupId>
245250
<artifactId>jsr305</artifactId>

project/SparkBuild.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ object SparkBuild extends Build {
348348
"org.apache.mesos" % "mesos" % "0.18.1" classifier("shaded-protobuf") exclude("com.google.protobuf", "protobuf-java"),
349349
"commons-net" % "commons-net" % "2.2",
350350
"net.java.dev.jets3t" % "jets3t" % jets3tVersion excludeAll(excludeCommonsLogging),
351+
"commons-codec" % "commons-codec" % "1.5", // Prevent jets3t from including the older version of commons-codec
351352
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
352353
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm),
353354
"org.apache.curator" % "curator-recipes" % "2.4.0" excludeAll(excludeJBossNetty),

0 commit comments

Comments
 (0)