Repository: spark Updated Branches: refs/heads/branch-0.9 a92900c5a -> 563bfe1dd
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 #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. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/563bfe1d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/563bfe1d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/563bfe1d Branch: refs/heads/branch-0.9 Commit: 563bfe1dd8f504cd65f9ad1fb64563511b568ce2 Parents: a92900c Author: Yin Huai <[email protected]> Authored: Fri May 30 22:12:17 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Fri May 30 22:12:17 2014 -0700 ---------------------------------------------------------------------- pom.xml | 5 +++++ project/SparkBuild.scala | 1 + 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/563bfe1d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e82d9e8..45e7e3b 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,11 @@ <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> <version>1.3.9</version> http://git-wip-us.apache.org/repos/asf/spark/blob/563bfe1d/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ecdf386..6ce564e 100644 --- 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",
