Repository: spark Updated Branches: refs/heads/master c74a6c3f2 -> 10a838967
Revert "[SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient" This reverts commit c74a6c3f2363f065a4915fdadec5eff665fa02e7. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/10a83896 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/10a83896 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/10a83896 Branch: refs/heads/master Commit: 10a838967455db80d750ef84a1c6b3088b19fd9f Parents: c74a6c3 Author: Sean Owen <[email protected]> Authored: Fri May 13 13:50:26 2016 +0100 Committer: Sean Owen <[email protected]> Committed: Fri May 13 13:50:26 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, 50 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/10a83896/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..2477312 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.5.2.jar -httpcore-4.4.4.jar +httpclient-4.3.2.jar +httpcore-4.3.2.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/10a83896/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 61ed4c0..0181a47 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.5.2.jar -httpcore-4.4.4.jar +httpclient-4.3.2.jar +httpcore-4.3.2.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/10a83896/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 fb01492..f7ff234 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.5.2.jar -httpcore-4.4.4.jar +httpclient-4.3.2.jar +httpcore-4.3.2.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/10a83896/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 0baf4e8..92db55d 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.5.2.jar -httpcore-4.4.4.jar +httpclient-4.3.2.jar +httpcore-4.3.2.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/10a83896/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 8be218c..44b9b04 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.5.2.jar -httpcore-4.4.4.jar +httpclient-4.3.2.jar +httpcore-4.3.2.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/10a83896/external/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 3169a0e..53a24f3 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -85,11 +85,13 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>4.5</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>4.4.1</version> <scope>test</scope> </dependency> <!-- Necessary in order to avoid errors in log messages: --> http://git-wip-us.apache.org/repos/asf/spark/blob/10a83896/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 21b1bec..9e9aad2 100644 --- a/pom.xml +++ b/pom.xml @@ -149,8 +149,8 @@ <!-- the producer is used in tests --> <aws.kinesis.producer.version>0.10.2</aws.kinesis.producer.version> <!-- org.apache.httpcomponents/httpclient--> - <commons.httpclient.version>4.5.2</commons.httpclient.version> - <commons.httpcore.version>4.4.4</commons.httpcore.version> + <commons.httpclient.version>4.3.2</commons.httpclient.version> + <commons.httpcore.version>4.3.2</commons.httpcore.version> <!-- commons-httpclient/commons-httpclient--> <httpclient.classic.version>3.1</httpclient.classic.version> <commons.math3.version>3.4.1</commons.math3.version> @@ -412,11 +412,6 @@ </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${commons.httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>${commons.httpcore.version}</version> </dependency> @@ -737,6 +732,18 @@ <groupId>com.google.guava</groupId> </exclusion> <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> @@ -1442,6 +1449,14 @@ <artifactId>hive-shims</artifactId> </exclusion> <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> </exclusion> @@ -1793,6 +1808,14 @@ <version>${libthrift.version}</version> <exclusions> <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -1804,6 +1827,14 @@ <version>${libthrift.version}</version> <exclusions> <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
