This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7883a07 CAMEL-13609: Aligned spark and jackson versions
7883a07 is described below
commit 7883a074c401fd7737ab7a21da26cb2c2b5acfb3
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Tue Jun 4 09:24:27 2019 +0200
CAMEL-13609: Aligned spark and jackson versions
---
components/camel-spark/pom.xml | 4 ++--
parent/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 6308aea..0717043 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -97,12 +97,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-spark-version}</version>
+ <version>${jackson-spark-version}.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.11</artifactId>
- <version>${jackson-spark-version}</version>
+ <version>${jackson-spark-version}.1</version>
</dependency>
<!-- hadoop -->
diff --git a/parent/pom.xml b/parent/pom.xml
index f982f41..714cf77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -314,7 +314,7 @@
<isorelax-jaxp-bridge-version>1.1</isorelax-jaxp-bridge-version>
<ivy-version>2.4.0</ivy-version>
<jackson-version>1.9.12</jackson-version>
- <jackson-spark-version>2.4.5</jackson-spark-version>
+ <jackson-spark-version>2.6.7</jackson-spark-version>
<jackson2-scala-version>2.6.1</jackson2-scala-version>
<jackson2-version>2.9.9</jackson2-version>
<jackrabbit-version>2.19.3</jackrabbit-version>
@@ -621,7 +621,7 @@
<!-- solr version aligned with lucene -->
<solr-version>7.6.0</solr-version>
<solr-version-range>[7,8)</solr-version-range>
- <spark-version>2.3.2</spark-version>
+ <spark-version>2.4.3</spark-version>
<spark-rest-version>2.9.0</spark-rest-version>
<spark-rest-bundle-version>2.9.0_1</spark-rest-bundle-version>
<splunk-version>1.6.5.0_1</splunk-version>
