SPARK-1935: Explicitly add commons-codec 1.5 as a dependency (for bra…

…nch-0.9). This is for branch 0.9. Author: Yin Huai <huai@cse.ohio-state.edu> 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.
markhamstra · Jun 6, 2014 · c69207f · c69207f
1 parent 1a40a2a
commit c69207f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -184,6 +184,11 @@
         <artifactId>guava</artifactId>
         <version>14.0.1</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
@@ -279,6 +279,7 @@ object SparkBuild extends Build {
         "colt"                     % "colt"             % "1.2.0",
         "org.apache.mesos"         % "mesos"            % "0.13.0",
         "net.java.dev.jets3t"      % "jets3t"           % "0.7.1",
+        "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(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
         "org.apache.avro"          % "avro"             % "1.7.4",