Repository: spark Updated Branches: refs/heads/master 9cff1dd25 -> 60b89fe6b
SPARK-1935: Explicitly add commons-codec 1.5 as a dependency. Author: Yin Huai <h...@cse.ohio-state.edu> Closes #889 from yhuai/SPARK-1935 and squashes the following commits: 7d50ef1 [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/60b89fe6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/60b89fe6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/60b89fe6 Branch: refs/heads/master Commit: 60b89fe6b09ff896a30d74204876da883e307de7 Parents: 9cff1dd Author: Yin Huai <h...@cse.ohio-state.edu> Authored: Thu May 29 09:07:39 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu May 29 09:07:39 2014 -0700 ---------------------------------------------------------------------- pom.xml | 5 +++++ project/SparkBuild.scala | 1 + 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/60b89fe6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 86264d1..7bf9f13 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> http://git-wip-us.apache.org/repos/asf/spark/blob/60b89fe6/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b9d9234..8ef1e91 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),
