diff options
author | Sean Owen <sowen@cloudera.com> | 2016-05-15 15:56:46 +0100 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2016-05-15 15:56:46 +0100 |
commit | f5576a052da0bb59343bc2a6b6ce06c6abaac75b (patch) | |
tree | a84680ad72490a346ce68f5a75ccab1380b994a1 | |
parent | 354f8f11bd4b20fa99bd67a98da3525fd3d75c81 (diff) | |
download | spark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.tar.gz spark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.tar.bz2 spark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.zip |
[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 Owen <sowen@cloudera.com>
Closes #13117 from srowen/SPARK-12972.2.
-rw-r--r-- | core/pom.xml | 11 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.2 | 4 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.3 | 4 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.4 | 4 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.6 | 4 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.7 | 4 | ||||
-rw-r--r-- | external/docker-integration-tests/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 54 | ||||
-rw-r--r-- | sql/hive-thriftserver/pom.xml | 11 | ||||
-rw-r--r-- | streaming/pom.xml | 5 |
10 files changed, 40 insertions, 63 deletions
diff --git a/core/pom.xml b/core/pom.xml index c9853528b4..4b8fb4e5fb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -275,12 +275,11 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> <scope>test</scope> </dependency> <!-- Added for selenium: --> diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 2477312d74..c3be6b2fee 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 diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 0181a47a79..61ed4c0889 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 diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f7ff23472b..fb01492176 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 diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 92db55d674..0baf4e84ff 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 diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 44b9b04934..8be218cd68 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 diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 53a24f3e06..3169a0ebae 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -85,13 +85,11 @@ <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: --> @@ -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.3.2</commons.httpclient.version> - <commons.httpcore.version>4.3.2</commons.httpcore.version> + <commons.httpclient.version>4.5.2</commons.httpclient.version> + <commons.httpcore.version>4.4.4</commons.httpcore.version> <!-- commons-httpclient/commons-httpclient--> <httpclient.classic.version>3.1</httpclient.classic.version> <commons.math3.version>3.4.1</commons.math3.version> @@ -179,6 +179,7 @@ <libthrift.version>0.9.2</libthrift.version> <antlr4.version>4.5.2-1</antlr4.version> <jpam.version>1.1</jpam.version> + <selenium.version>2.52.0</selenium.version> <test.java.home>${java.home}</test.java.home> <test.exclude.tags></test.exclude.tags> @@ -412,13 +413,18 @@ </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> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.45.0</version> <!-- 2.46.0+ requires Jetty 9 --> + <version>${selenium.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -431,6 +437,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + <version>${selenium.version}</version> + <scope>test</scope> + </dependency> <!-- Added for selenium only, and should match its dependent version: --> <dependency> <groupId>xml-apis</groupId> @@ -732,18 +744,6 @@ <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> @@ -1449,14 +1449,6 @@ <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> @@ -1808,14 +1800,6 @@ <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> @@ -1827,14 +1811,6 @@ <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> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index a8b7aaff62..5cf16e42b9 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -71,6 +71,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-sql_${scala.binary.version}</artifactId> <type>test-jar</type> @@ -106,12 +111,6 @@ </sources> </configuration> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> <execution> <id>add-source</id> <phase>generate-sources</phase> diff --git a/streaming/pom.xml b/streaming/pom.xml index e7415863e3..2055cffe75 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -98,6 +98,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> |