Skip to content

Commit c69207f

Browse files
yhuaimarkhamstra
authored andcommitted
SPARK-1935: Explicitly add commons-codec 1.5 as a dependency (for branch-0.9).
This is for branch 0.9. Author: Yin Huai <[email protected]> Closes apache#912 from yhuai/SPARK-1935-branch-0.9 and squashes the following commits: d7f0f7c [Yin Huai] Explicitly add commons-codec 1.5 as a dependency.
1 parent 1a40a2a commit c69207f

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
@@ -184,6 +184,11 @@
184184
<artifactId>guava</artifactId>
185185
<version>14.0.1</version>
186186
</dependency>
187+
<dependency>
188+
<groupId>commons-codec</groupId>
189+
<artifactId>commons-codec</artifactId>
190+
<version>1.5</version>
191+
</dependency>
187192
<dependency>
188193
<groupId>com.google.code.findbugs</groupId>
189194
<artifactId>jsr305</artifactId>

project/SparkBuild.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ object SparkBuild extends Build {
279279
"colt" % "colt" % "1.2.0",
280280
"org.apache.mesos" % "mesos" % "0.13.0",
281281
"net.java.dev.jets3t" % "jets3t" % "0.7.1",
282+
"commons-codec" % "commons-codec" % "1.5", // Prevent jets3t from including the older version of commons-codec
282283
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
283284
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
284285
"org.apache.avro" % "avro" % "1.7.4",

0 commit comments

Comments
 (0)