Repository: spark Updated Branches: refs/heads/master 8077bb04f -> 649ed9c57
[SPARK-23509][BUILD] Upgrade commons-net from 2.2 to 3.1 ## What changes were proposed in this pull request? This PR avoids version conflicts of `commons-net` by upgrading commons-net from 2.2 to 3.1. We are seeing the following message during the build using sbt. ``` [warn] Found version conflict(s) in library dependencies; some are suspected to be binary incompatible: ... [warn] * commons-net:commons-net:3.1 is selected over 2.2 [warn] +- org.apache.hadoop:hadoop-common:2.6.5 (depends on 3.1) [warn] +- org.apache.spark:spark-core_2.11:2.4.0-SNAPSHOT (depends on 2.2) [warn] ``` [Here](https://commons.apache.org/proper/commons-net/changes-report.html) is a release history. [Here](https://commons.apache.org/proper/commons-net/migration.html) is a migration guide from 2.x to 3.0. ## How was this patch tested? Existing tests Author: Kazuaki Ishizaki <ishiz...@jp.ibm.com> Closes #20672 from kiszk/SPARK-23509. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/649ed9c5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/649ed9c5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/649ed9c5 Branch: refs/heads/master Commit: 649ed9c5732f85ef1306576fdd3a9278a2a6410c Parents: 8077bb0 Author: Kazuaki Ishizaki <ishiz...@jp.ibm.com> Authored: Tue Feb 27 08:18:41 2018 -0600 Committer: Sean Owen <so...@cloudera.com> Committed: Tue Feb 27 08:18:41 2018 -0600 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-2.6 | 2 +- dev/deps/spark-deps-hadoop-2.7 | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/649ed9c5/dev/deps/spark-deps-hadoop-2.6 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index ed31050..c3d1dd4 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -48,7 +48,7 @@ commons-lang-2.6.jar commons-lang3-3.5.jar commons-logging-1.1.3.jar commons-math3-3.4.1.jar -commons-net-2.2.jar +commons-net-3.1.jar commons-pool-1.5.4.jar compress-lzf-1.0.3.jar core-1.1.2.jar http://git-wip-us.apache.org/repos/asf/spark/blob/649ed9c5/dev/deps/spark-deps-hadoop-2.7 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 04dec04..2908670 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -48,7 +48,7 @@ commons-lang-2.6.jar commons-lang3-3.5.jar commons-logging-1.1.3.jar commons-math3-3.4.1.jar -commons-net-2.2.jar +commons-net-3.1.jar commons-pool-1.5.4.jar compress-lzf-1.0.3.jar core-1.1.2.jar http://git-wip-us.apache.org/repos/asf/spark/blob/649ed9c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ac30107..b839616 100644 --- a/pom.xml +++ b/pom.xml @@ -579,7 +579,7 @@ <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> - <version>2.2</version> + <version>3.1</version> </dependency> <dependency> <groupId>io.netty</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org