From 66aef47794c692014f91aeb744d3ea6dc833c26e Mon Sep 17 00:00:00 2001
From: aniketbhatnagar <aniket.bhatnagar@gmail.com>
Date: Mon, 22 Sep 2014 16:41:41 +0530
Subject: [PATCH] SPARK-3638 | Forced a compatible version of http client in
 kinesis-asl profile

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

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 604b1ab3de6a..76ff9a4a2ad3 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -347,5 +347,15 @@
         </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>
 </project>
diff --git a/examples/pom.xml b/examples/pom.xml
index 2b561857f9f3..9dee46edf1fd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -43,6 +43,11 @@
           <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>
   </profiles>
diff --git a/pom.xml b/pom.xml
index 520aed380693..77b676331027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
     <jets3t.version>0.7.1</jets3t.version>
     <aws.java.sdk.version>1.8.3</aws.java.sdk.version>
     <aws.kinesis.client.version>1.1.0</aws.kinesis.client.version>
+    <commons.httpclient.version>4.2</commons.httpclient.version>
 
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>