diff options
| author | aniketbhatnagar <aniket.bhatnagar@gmail.com> | 2014-10-01 18:31:18 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@apache.org> | 2014-10-01 18:31:18 -0700 |
| commit | 93861a5e876fa57f509cce82768656ddf8d4ef00 (patch) | |
| tree | ae31fbe954c2e36b7aceecabec454f2317309ada | |
| parent | 1b9f0d67f28011cdff316042b344c9891f986aaa (diff) | |
| download | spark-93861a5e876fa57f509cce82768656ddf8d4ef00.tar.gz spark-93861a5e876fa57f509cce82768656ddf8d4ef00.tar.bz2 spark-93861a5e876fa57f509cce82768656ddf8d4ef00.zip | |
SPARK-3638 | Forced a compatible version of http client in kinesis-asl profile
This patch forces use of commons http client 4.2 in Kinesis-asl profile so that the AWS SDK does not run into dependency conflicts
Author: aniketbhatnagar <aniket.bhatnagar@gmail.com>
Closes #2535 from aniketbhatnagar/Kinesis-HttpClient-Dep-Fix and squashes the following commits:
aa2079f [aniketbhatnagar] Merge branch 'Kinesis-HttpClient-Dep-Fix' of https://github.com/aniketbhatnagar/spark into Kinesis-HttpClient-Dep-Fix
73f55f6 [aniketbhatnagar] SPARK-3638 | Forced a compatible version of http client in kinesis-asl profile
70cc75b [aniketbhatnagar] deleted merge files
725dbc9 [aniketbhatnagar] Merge remote-tracking branch 'origin/Kinesis-HttpClient-Dep-Fix' into Kinesis-HttpClient-Dep-Fix
4ed61d8 [aniketbhatnagar] SPARK-3638 | Forced a compatible version of http client in kinesis-asl profile
9cd6103 [aniketbhatnagar] SPARK-3638 | Forced a compatible version of http client in kinesis-asl profile
| -rw-r--r-- | assembly/pom.xml | 10 | ||||
| -rw-r--r-- | examples/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 5ec9da22ae..31a01e4d8e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -349,5 +349,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 2b561857f9..eb49a0e5af 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> @@ -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.6</commons.httpclient.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> |