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 16569a5 CAMEL-13495 - Camel-Yammer: Move to Jackson 2.x
16569a5 is described below
commit 16569a53c76fdf83a45b318de863bcc78e1cf093
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu May 9 12:25:58 2019 +0200
CAMEL-13495 - Camel-Yammer: Move to Jackson 2.x
---
components/camel-yammer/pom.xml | 17 ++++++++++++++---
.../component/yammer/YammerMessagePollingConsumer.java | 3 ++-
.../camel/component/yammer/YammerMessageProducer.java | 3 ++-
.../component/yammer/YammerUserPollingConsumer.java | 3 ++-
.../apache/camel/component/yammer/model/Attachment.java | 4 ++--
.../org/apache/camel/component/yammer/model/Body.java | 2 +-
.../apache/camel/component/yammer/model/Contact.java | 4 ++--
.../camel/component/yammer/model/EmailAddress.java | 2 +-
.../camel/component/yammer/model/FollowedReference.java | 2 +-
.../org/apache/camel/component/yammer/model/Im.java | 2 +-
.../org/apache/camel/component/yammer/model/Image.java | 4 ++--
.../apache/camel/component/yammer/model/LikedBy.java | 2 +-
.../apache/camel/component/yammer/model/Message.java | 4 ++--
.../apache/camel/component/yammer/model/Messages.java | 4 ++--
.../org/apache/camel/component/yammer/model/Meta.java | 4 ++--
.../org/apache/camel/component/yammer/model/Name.java | 4 ++--
.../apache/camel/component/yammer/model/Realtime.java | 4 ++--
.../apache/camel/component/yammer/model/Reference.java | 4 ++--
.../camel/component/yammer/model/Relationships.java | 2 +-
.../apache/camel/component/yammer/model/Settings.java | 4 ++--
.../org/apache/camel/component/yammer/model/Stats.java | 2 +-
.../camel/component/yammer/model/ThreadedExtended.java | 2 +-
.../org/apache/camel/component/yammer/model/User.java | 4 ++--
.../karaf/features/src/main/resources/features.xml | 5 +++--
24 files changed, 53 insertions(+), 38 deletions(-)
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index af8d554..76bbbcd 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -41,10 +41,21 @@
<artifactId>camel-support</artifactId>
</dependency>
+ <!-- Jackson -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+ <dependency>
+ <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>
<dependency>
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessagePollingConsumer.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessagePollingConsumer.java
index d29f2b0..2636186 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessagePollingConsumer.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessagePollingConsumer.java
@@ -18,12 +18,13 @@ package org.apache.camel.component.yammer;
import java.util.concurrent.TimeUnit;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.yammer.model.Messages;
import org.apache.camel.support.ScheduledPollConsumer;
import org.apache.camel.util.ObjectHelper;
-import org.codehaus.jackson.map.ObjectMapper;
/**
* A Yammer consumer that periodically polls messages from Yammer's message
API.
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessageProducer.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessageProducer.java
index 6042997..bb21b28 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessageProducer.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerMessageProducer.java
@@ -18,10 +18,11 @@ package org.apache.camel.component.yammer;
import java.net.URLEncoder;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.camel.Exchange;
import org.apache.camel.component.yammer.model.Messages;
import org.apache.camel.support.DefaultProducer;
-import org.codehaus.jackson.map.ObjectMapper;
public class YammerMessageProducer extends DefaultProducer {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
index 605ca0c..8791ebc 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
@@ -19,11 +19,12 @@ package org.apache.camel.component.yammer;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.yammer.model.User;
import org.apache.camel.support.ScheduledPollConsumer;
-import org.codehaus.jackson.map.ObjectMapper;
/**
* A Yammer consumer that periodically polls messages from Yammer's user API.
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Attachment.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Attachment.java
index 5e55a6f..39f20af 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Attachment.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Attachment.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Attachment {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Body.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Body.java
index 4368fd9..57fb224 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Body.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Body.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Body {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Contact.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Contact.java
index 1e1529c..8182466 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Contact.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Contact.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Contact {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/EmailAddress.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/EmailAddress.java
index d3b799f..cd77fbe 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/EmailAddress.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/EmailAddress.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class EmailAddress {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/FollowedReference.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/FollowedReference.java
index 35ae576..b736343 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/FollowedReference.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/FollowedReference.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class FollowedReference {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Im.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Im.java
index b042c85..8b87183 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Im.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Im.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Im {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Image.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Image.java
index 5602d88..68af64d 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Image.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Image.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Image {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/LikedBy.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/LikedBy.java
index 10571c1..edfe76b 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/LikedBy.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/LikedBy.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class LikedBy {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Message.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Message.java
index caf961a..2c4824d 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Message.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Message.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Message {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Messages.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Messages.java
index 8878c8a..dc80614 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Messages.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Messages.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Messages {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Meta.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Meta.java
index 60a8a7f..f7c2c32 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Meta.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Meta.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Meta {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Name.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Name.java
index 4e9e6fe..63cd6f0 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Name.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Name.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Name {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Realtime.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Realtime.java
index f58092e..b1706f6 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Realtime.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Realtime.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Realtime {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Reference.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Reference.java
index f5e3f9d..cc75181 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Reference.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Reference.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Reference {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Relationships.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Relationships.java
index 1526bb1..4aaab3d 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Relationships.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Relationships.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Relationships {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Settings.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Settings.java
index 8d7923c..ab06e3b 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Settings.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Settings.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Settings {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Stats.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Stats.java
index 2c747fd..41a7daf 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Stats.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/Stats.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Stats {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/ThreadedExtended.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/ThreadedExtended.java
index 0c4408b..7bd78f7 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/ThreadedExtended.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/ThreadedExtended.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.yammer.model;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class ThreadedExtended {
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/User.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/User.java
index a068b38..8e6327f 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/User.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/model/User.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.yammer.model;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class User {
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 444e1d1..4ead1b4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2658,8 +2658,9 @@
</feature>
<feature name='camel-yammer' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle
dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-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.scribe/${scribe-bundle-version}</bundle>
<bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
