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 /pom.xml | |
| 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.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 54 |
1 files changed, 15 insertions, 39 deletions
@@ -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> |