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:31 -0700 |
| commit | c52c231c792ce4621ca9c9290595874e6390f9bc (patch) | |
| tree | 71600c99fe6b9110b1661b71bf927954ea41b162 /assembly/pom.xml | |
| parent | 24ee61625904c7ec0f717fa665feb0e5266e915e (diff) | |
| download | spark-c52c231c792ce4621ca9c9290595874e6390f9bc.tar.gz spark-c52c231c792ce4621ca9c9290595874e6390f9bc.tar.bz2 spark-c52c231c792ce4621ca9c9290595874e6390f9bc.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
(cherry picked from commit 93861a5e876fa57f509cce82768656ddf8d4ef00)
Signed-off-by: Josh Rosen <joshrosen@apache.org>
Diffstat (limited to 'assembly/pom.xml')
| -rw-r--r-- | assembly/pom.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 4709b7dbdd..0531fb7b37 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -315,5 +315,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> |