aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-05-13 13:50:26 +0100
committerSean Owen <sowen@cloudera.com>2016-05-13 13:50:26 +0100
commit10a838967455db80d750ef84a1c6b3088b19fd9f (patch)
treeb1edb541df37dd19f61d9f4c12361ba9baec4d66 /pom.xml
parentc74a6c3f2363f065a4915fdadec5eff665fa02e7 (diff)
downloadspark-10a838967455db80d750ef84a1c6b3088b19fd9f.tar.gz
spark-10a838967455db80d750ef84a1c6b3088b19fd9f.tar.bz2
spark-10a838967455db80d750ef84a1c6b3088b19fd9f.zip
Revert "[SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient"
This reverts commit c74a6c3f2363f065a4915fdadec5eff665fa02e7.
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml45
1 files changed, 38 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index 21b1becd08..9e9aad223a 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>