You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/17 07:47:14 UTC
camel git commit: Fixed camel-spark
Repository: camel
Updated Branches:
refs/heads/master b83df498e -> 356c30782
Fixed camel-spark
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/356c3078
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/356c3078
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/356c3078
Branch: refs/heads/master
Commit: 356c30782e1e2cc495c249af03530058887b0790
Parents: b83df49
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 17 07:47:07 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 17 07:47:07 2016 +0100
----------------------------------------------------------------------
components/camel-spark/pom.xml | 41 ++++++++++++++++++++++++++-----------
parent/pom.xml | 3 +++
2 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/356c3078/components/camel-spark/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 7efbd32..4089cf3 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -34,13 +34,6 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spark.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spark</camel.osgi.export.service>
-
- <!-- Spark 1.5.1 requires Jackson 2.4.4 -->
- <jackson-version>2.4.4</jackson-version>
-
- <hadoop.version>2.2.0</hadoop.version>
- <mongo-hadoop-core.version>1.4.2</mongo-hadoop-core.version>
- <spark-version>1.5.1</spark-version>
</properties>
<dependencies>
@@ -50,6 +43,7 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- spark -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.11</artifactId>
@@ -61,32 +55,55 @@
<version>${spark-version}</version>
</dependency>
+ <!-- jackson -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson-spark-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson-spark-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-spark-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_2.11</artifactId>
+ <version>${jackson-spark-version}</version>
+ </dependency>
+
+ <!-- haddoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop2-version}</version>
</dependency>
<!-- Optional -->
<dependency>
<groupId>org.mongodb.mongo-hadoop</groupId>
<artifactId>mongo-hadoop-core</artifactId>
- <version>${mongo-hadoop-core.version}</version>
+ <version>${mongo-hadoop-version}</version>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/356c3078/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fcee4f6..73f37e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -256,6 +256,7 @@
<ivy-version>2.4.0</ivy-version>
<jini-version>2.1</jini-version>
<jackson-version>1.9.12</jackson-version>
+ <jackson-spark-version>2.4.5</jackson-spark-version>
<jackson2-scala-version>2.6.1</jackson2-scala-version>
<jackson2-version>2.7.2</jackson2-version>
<jackrabbit-version>2.12.1</jackrabbit-version>
@@ -403,6 +404,7 @@
<mock-javamail-version>1.9</mock-javamail-version>
<mockito-version>1.9.5</mockito-version>
<mongo-java-driver-version>3.2.2</mongo-java-driver-version>
+ <mongo-hadoop-version>1.5.0</mongo-hadoop-version>
<mqtt-client-version>1.12</mqtt-client-version>
<msv-version>2013.6.1</msv-version>
<mustache-java-version>0.9.1</mustache-java-version>
@@ -490,6 +492,7 @@
<solr-bundle-version>5.3.1_1</solr-bundle-version>
<solr-version>5.3.1</solr-version>
<solr-version-range>[5,6)</solr-version-range>
+ <spark-version>1.6.1</spark-version>
<spark-rest-version>2.3</spark-rest-version>
<spark-rest-bundle-version>2.3_1</spark-rest-bundle-version>
<splunk-version>1.5.0.0_1</splunk-version>