From 0eefe4d46c0a42859b8c9c0bc0ff98a0beeb440a Mon Sep 17 00:00:00 2001
From: Calvin Jia <jia.calvin@gmail.com>
Date: Thu, 23 Apr 2015 21:37:04 -0700
Subject: [PATCH] Handle httpclient version in maven dependency management.
 Remove httpclient version setting from profiles.

---
 assembly/pom.xml | 10 ----------
 examples/pom.xml |  5 -----
 pom.xml          | 10 ++++++++++
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index f1f8b0d3682e2..20593e710dedb 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -213,16 +213,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>kinesis-asl</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-          <version>${commons.httpclient.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
 
     <!-- Profiles that disable inclusion of certain dependencies. -->
     <profile>
diff --git a/examples/pom.xml b/examples/pom.xml
index afd7c6d52f0dd..df1717403b673 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -390,11 +390,6 @@
           <artifactId>spark-streaming-kinesis-asl_${scala.binary.version}</artifactId>
           <version>${project.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-          <version>${commons.httpclient.version}</version>
-        </dependency>
       </dependencies>
     </profile>
     <profile>
diff --git a/pom.xml b/pom.xml
index 05a7400e45572..4b0b0c85eff21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,16 @@
         <artifactId>jsr305</artifactId>
         <version>1.3.9</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${commons.httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${commons.httpclient.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-java</artifactId>