aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-05-13 09:00:50 +0100
committerSean Owen <sowen@cloudera.com>2016-05-13 09:00:50 +0100
commitc74a6c3f2363f065a4915fdadec5eff665fa02e7 (patch)
treebfb248da2d1612e593ebabd296058da85022849a /pom.xml
parent382dbc12bb4b06871850a94f88018e76058a9b52 (diff)
downloadspark-c74a6c3f2363f065a4915fdadec5eff665fa02e7.tar.gz
spark-c74a6c3f2363f065a4915fdadec5eff665fa02e7.tar.bz2
spark-c74a6c3f2363f065a4915fdadec5eff665fa02e7.zip
[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 Owen <sowen@cloudera.com> Closes #13049 from srowen/SPARK-12972.
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml45
1 files changed, 7 insertions, 38 deletions
diff --git a/pom.xml b/pom.xml
index 9e9aad223a..21b1becd08 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.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>
@@ -412,6 +412,11 @@
</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>
@@ -732,18 +737,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 +1442,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 +1793,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 +1804,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>