spark git commit: [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient
Repository: spark Updated Branches: refs/heads/branch-2.0 8e3ee683b -> 0d5e29655 [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient ## What changes were proposed in this pull request? (Retry of https://github.com/apache/spark/pull/13049) - update to httpclient 4.5 / httpcore 4.4 - remove some defunct exclusions - manage httpmime version to match - update selenium / httpunit to support 4.5 (possible now that Jetty 9 is used) ## How was this patch tested? Jenkins tests. Also, locally running the same test command of one Jenkins profile that failed: `mvn -Phadoop-2.6 -Pyarn -Phive -Phive-thriftserver -Pkinesis-asl ...` Author: Sean OwenCloses #13117 from srowen/SPARK-12972.2. (cherry picked from commit f5576a052da0bb59343bc2a6b6ce06c6abaac75b) Signed-off-by: Sean Owen Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0d5e2965 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0d5e2965 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0d5e2965 Branch: refs/heads/branch-2.0 Commit: 0d5e29655f9c3758393794367c0b5d3fd395d1f6 Parents: 8e3ee68 Author: Sean Owen Authored: Sun May 15 15:56:46 2016 +0100 Committer: Sean Owen Committed: Tue May 17 09:53:13 2016 +0100 -- core/pom.xml | 11 +++--- dev/deps/spark-deps-hadoop-2.2| 4 +- dev/deps/spark-deps-hadoop-2.3| 4 +- dev/deps/spark-deps-hadoop-2.4| 4 +- dev/deps/spark-deps-hadoop-2.6| 4 +- dev/deps/spark-deps-hadoop-2.7| 4 +- external/docker-integration-tests/pom.xml | 2 - pom.xml | 54 +++--- sql/hive-thriftserver/pom.xml | 11 +++--- streaming/pom.xml | 5 +++ 10 files changed, 40 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/0d5e2965/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index c985352..4b8fb4e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -275,12 +275,11 @@ org.seleniumhq.selenium selenium-java - - - com.google.guava - guava - - + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver test http://git-wip-us.apache.org/repos/asf/spark/blob/0d5e2965/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 2477312..c3be6b2 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -69,8 +69,8 @@ hadoop-yarn-server-web-proxy-2.2.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/0d5e2965/dev/deps/spark-deps-hadoop-2.3 -- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 0181a47..61ed4c0 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.3.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/0d5e2965/dev/deps/spark-deps-hadoop-2.4 -- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f7ff234..fb01492 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.4.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/0d5e2965/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 92db55d..0baf4e8 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.0.4.jar -httpclient-4.3.2.jar
spark git commit: [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient
Repository: spark Updated Branches: refs/heads/master 354f8f11b -> f5576a052 [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient ## What changes were proposed in this pull request? (Retry of https://github.com/apache/spark/pull/13049) - update to httpclient 4.5 / httpcore 4.4 - remove some defunct exclusions - manage httpmime version to match - update selenium / httpunit to support 4.5 (possible now that Jetty 9 is used) ## How was this patch tested? Jenkins tests. Also, locally running the same test command of one Jenkins profile that failed: `mvn -Phadoop-2.6 -Pyarn -Phive -Phive-thriftserver -Pkinesis-asl ...` Author: Sean OwenCloses #13117 from srowen/SPARK-12972.2. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f5576a05 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f5576a05 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f5576a05 Branch: refs/heads/master Commit: f5576a052da0bb59343bc2a6b6ce06c6abaac75b Parents: 354f8f1 Author: Sean Owen Authored: Sun May 15 15:56:46 2016 +0100 Committer: Sean Owen Committed: Sun May 15 15:56:46 2016 +0100 -- core/pom.xml | 11 +++--- dev/deps/spark-deps-hadoop-2.2| 4 +- dev/deps/spark-deps-hadoop-2.3| 4 +- dev/deps/spark-deps-hadoop-2.4| 4 +- dev/deps/spark-deps-hadoop-2.6| 4 +- dev/deps/spark-deps-hadoop-2.7| 4 +- external/docker-integration-tests/pom.xml | 2 - pom.xml | 54 +++--- sql/hive-thriftserver/pom.xml | 11 +++--- streaming/pom.xml | 5 +++ 10 files changed, 40 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/f5576a05/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index c985352..4b8fb4e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -275,12 +275,11 @@ org.seleniumhq.selenium selenium-java - - - com.google.guava - guava - - + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver test http://git-wip-us.apache.org/repos/asf/spark/blob/f5576a05/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 2477312..c3be6b2 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -69,8 +69,8 @@ hadoop-yarn-server-web-proxy-2.2.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/f5576a05/dev/deps/spark-deps-hadoop-2.3 -- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 0181a47..61ed4c0 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.3.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/f5576a05/dev/deps/spark-deps-hadoop-2.4 -- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f7ff234..fb01492 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.4.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/f5576a05/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 92db55d..0baf4e8 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.0.4.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar
spark git commit: [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient
Repository: spark Updated Branches: refs/heads/branch-2.0 beaf703d5 -> 6c5768594 [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient ## What changes were proposed in this pull request? - update httpcore/httpclient to latest - centralize version management - remove excludes that are no longer relevant according to SBT/Maven dep graphs - also manage httpmime to match httpclient ## How was this patch tested? Jenkins tests, plus review of dependency graphs from SBT/Maven, and review of test-dependencies.sh output Author: Sean OwenCloses #13049 from srowen/SPARK-12972. (cherry picked from commit c74a6c3f2363f065a4915fdadec5eff665fa02e7) Signed-off-by: Sean Owen Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6c576859 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6c576859 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6c576859 Branch: refs/heads/branch-2.0 Commit: 6c5768594fe8b910125f06e1308a8154a199447e Parents: beaf703 Author: Sean Owen Authored: Fri May 13 09:00:50 2016 +0100 Committer: Sean Owen Committed: Fri May 13 09:00:59 2016 +0100 -- dev/deps/spark-deps-hadoop-2.2| 4 +-- dev/deps/spark-deps-hadoop-2.3| 4 +-- dev/deps/spark-deps-hadoop-2.4| 4 +-- dev/deps/spark-deps-hadoop-2.6| 4 +-- dev/deps/spark-deps-hadoop-2.7| 4 +-- external/docker-integration-tests/pom.xml | 2 -- pom.xml | 45 -- 7 files changed, 17 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/6c576859/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 2477312..c3be6b2 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -69,8 +69,8 @@ hadoop-yarn-server-web-proxy-2.2.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/6c576859/dev/deps/spark-deps-hadoop-2.3 -- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 0181a47..61ed4c0 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.3.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/6c576859/dev/deps/spark-deps-hadoop-2.4 -- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f7ff234..fb01492 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.4.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/6c576859/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 92db55d..0baf4e8 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.0.4.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/6c576859/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 44b9b04..8be218c 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.1.0-incubating.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar
spark git commit: [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient
Repository: spark Updated Branches: refs/heads/master 382dbc12b -> c74a6c3f2 [SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient ## What changes were proposed in this pull request? - update httpcore/httpclient to latest - centralize version management - remove excludes that are no longer relevant according to SBT/Maven dep graphs - also manage httpmime to match httpclient ## How was this patch tested? Jenkins tests, plus review of dependency graphs from SBT/Maven, and review of test-dependencies.sh output Author: Sean OwenCloses #13049 from srowen/SPARK-12972. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c74a6c3f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c74a6c3f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c74a6c3f Branch: refs/heads/master Commit: c74a6c3f2363f065a4915fdadec5eff665fa02e7 Parents: 382dbc1 Author: Sean Owen Authored: Fri May 13 09:00:50 2016 +0100 Committer: Sean Owen Committed: Fri May 13 09:00:50 2016 +0100 -- dev/deps/spark-deps-hadoop-2.2| 4 +-- dev/deps/spark-deps-hadoop-2.3| 4 +-- dev/deps/spark-deps-hadoop-2.4| 4 +-- dev/deps/spark-deps-hadoop-2.6| 4 +-- dev/deps/spark-deps-hadoop-2.7| 4 +-- external/docker-integration-tests/pom.xml | 2 -- pom.xml | 45 -- 7 files changed, 17 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/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 2477312..c3be6b2 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -69,8 +69,8 @@ hadoop-yarn-server-web-proxy-2.2.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/dev/deps/spark-deps-hadoop-2.3 -- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 0181a47..61ed4c0 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.3.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/dev/deps/spark-deps-hadoop-2.4 -- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f7ff234..fb01492 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.4.0.jar hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/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 92db55d..0baf4e8 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.0.4.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/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 44b9b04..8be218c 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar hk2-locator-2.4.0-b34.jar hk2-utils-2.4.0-b34.jar htrace-core-3.1.0-incubating.jar -httpclient-4.3.2.jar -httpcore-4.3.2.jar +httpclient-4.5.2.jar +httpcore-4.4.4.jar ivy-2.4.0.jar jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c74a6c3f/external/docker-integration-tests/pom.xml