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 /pom.xml | |
| 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
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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> |