Repository: spark Updated Branches: refs/heads/branch-2.0 0d5e29655 -> 6d10b2826
[SPARK-12972][CORE][TEST-MAVEN][TEST-HADOOP2.2] Update org.apache.httpcomponents.httpclient, commons-io ## What changes were proposed in this pull request? This is sort of a hot-fix for https://github.com/apache/spark/pull/13117, but, the problem is limited to Hadoop 2.2. The change is to manage `commons-io` to 2.4 for all Hadoop builds, which is only a net change for Hadoop 2.2, which was using 2.1. ## How was this patch tested? Jenkins tests -- normal PR builder, then the `[test-hadoop2.2] [test-maven]` if successful. Author: Sean Owen <so...@cloudera.com> Closes #13132 from srowen/SPARK-12972.3. (cherry picked from commit fabc8e5b128849a08d820d8c0b3425e39258e02e) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6d10b282 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6d10b282 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6d10b282 Branch: refs/heads/branch-2.0 Commit: 6d10b28261e8f1c989d4cab9f59f5f082fd267de Parents: 0d5e296 Author: Sean Owen <so...@cloudera.com> Authored: Mon May 16 16:27:04 2016 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Tue May 17 09:53:38 2016 +0100 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-2.2 | 2 +- pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6d10b282/dev/deps/spark-deps-hadoop-2.2 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index c3be6b2..91b333f 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -30,7 +30,7 @@ commons-configuration-1.6.jar commons-dbcp-1.4.jar commons-digester-1.8.jar commons-httpclient-3.1.jar -commons-io-2.1.jar +commons-io-2.4.jar commons-lang-2.6.jar commons-lang3-3.3.2.jar commons-logging-1.1.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/6d10b282/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 40d9bf5..864824d 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,7 @@ <netlib.java.version>1.1.2</netlib.java.version> <calcite.version>1.2.0-incubating</calcite.version> <commons-codec.version>1.10</commons-codec.version> + <commons-io.version>2.4</commons-io.version> <!-- org.apache.commons/commons-lang/--> <commons-lang2.version>2.6</commons-lang2.version> <!-- org.apache.commons/commons-lang3/--> @@ -377,6 +378,11 @@ <version>${commons-lang2.version}</version> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${commons-codec.version}</version> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
