You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/09 09:15:33 UTC
[camel] branch master updated: CAMEL-13493 - Camel-Apns: Move to
Jackson 2.x
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 e2b9e1f CAMEL-13493 - Camel-Apns: Move to Jackson 2.x
e2b9e1f is described below
commit e2b9e1f8095ceca71cbde625d04f53d53f698d7d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 11:11:47 2019 +0200
CAMEL-13493 - Camel-Apns: Move to Jackson 2.x
---
components/camel-apns/pom.xml | 19 ++++++++++++-------
.../karaf/features/src/main/resources/features.xml | 4 +++-
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index ed82202..bf92382 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -65,16 +65,21 @@
</exclusions>
</dependency>
- <!-- lets use the same version as in camel-jackson -->
+ <!-- Jackson -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${jackson-version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson2-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson2-version}</version>
</dependency>
<!-- Camel for test -->
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1a02beb..fd32b3c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -170,7 +170,9 @@
<feature name='camel-apns' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-apns/${project.version}</bundle>
</feature>