You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2014/10/02 03:31:25 UTC
git commit: SPARK-3638 | Forced a compatible version of http client
in kinesis-asl profile
Repository: spark
Updated Branches:
refs/heads/master 1b9f0d67f -> 93861a5e8
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 <an...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/93861a5e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/93861a5e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/93861a5e
Branch: refs/heads/master
Commit: 93861a5e876fa57f509cce82768656ddf8d4ef00
Parents: 1b9f0d6
Author: aniketbhatnagar <an...@gmail.com>
Authored: Wed Oct 1 18:31:18 2014 -0700
Committer: Josh Rosen <jo...@apache.org>
Committed: Wed Oct 1 18:31:18 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/93861a5e/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5ec9da2..31a01e4 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/93861a5e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2b56185..eb49a0e 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/93861a5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 70cb972..7756c89 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.6</commons.httpclient.version>
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org