Updated Branches: refs/heads/master 2d885a578 -> d2d305eea
Upgrade to jackson 2.3.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d2d305ee Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2d305ee Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2d305ee Branch: refs/heads/master Commit: d2d305eea678165fa660b994a5a46a3c1cadfda7 Parents: 2d885a5 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Nov 28 22:17:39 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Nov 28 22:17:39 2013 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/jackson/JacksonMarshalViewTest.java | 2 +- .../camel/component/jackson/SpringJacksonJsonDataFormatTest.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d2d305ee/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java index 25a82b7..b4c8893 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java @@ -36,7 +36,7 @@ public class JacksonMarshalViewTest extends CamelTestSupport { Object marshalled = template.requestBody("direct:inPojoAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - assertEquals("{\"age\":30,\"height\":190}", marshalledAsString); + assertEquals("{\"height\":190,\"age\":30}", marshalledAsString); template.sendBody("direct:backPojoAgeView", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/d2d305ee/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java index ab2ac06..487caa2 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java @@ -79,7 +79,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { Object marshalled = template.requestBody("direct:inAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - assertEquals("{\"age\":30,\"height\":190}", marshalledAsString); + assertEquals("{\"height\":190,\"age\":30}", marshalledAsString); template.sendBody("direct:backAgeView", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/d2d305ee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a98630f..6388e74 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -193,7 +193,7 @@ <isorelax-bundle-version>20050913_4</isorelax-bundle-version> <jini-version>2.1</jini-version> <jackson-version>1.9.12</jackson-version> - <jackson2-version>2.2.2</jackson2-version> + <jackson2-version>2.3.0</jackson2-version> <jackrabbit-version>2.2.12</jackrabbit-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> <jasper-bundle-version>6.0.36_1</jasper-bundle-version>
