Repository: spark Updated Branches: refs/heads/branch-1.1 24ee61625 -> c52c231c7
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 <[email protected]> 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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c52c231c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c52c231c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c52c231c Branch: refs/heads/branch-1.1 Commit: c52c231c792ce4621ca9c9290595874e6390f9bc Parents: 24ee616 Author: aniketbhatnagar <[email protected]> Authored: Wed Oct 1 18:31:18 2014 -0700 Committer: Josh Rosen <[email protected]> Committed: Wed Oct 1 18:31:31 2014 -0700 ---------------------------------------------------------------------- assembly/pom.xml | 10 ++++++++++ examples/pom.xml | 5 +++++ pom.xml | 1 + 3 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c52c231c/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 4709b7d..0531fb7 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> http://git-wip-us.apache.org/repos/asf/spark/blob/c52c231c/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index f35d3d6..6124cf8 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> http://git-wip-us.apache.org/repos/asf/spark/blob/c52c231c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4a911a4..e7ed883 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
