Repository: camel Updated Branches: refs/heads/master d57c1db10 -> 7c5df4bcf
Upgraded jackson2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c5df4bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c5df4bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c5df4bc Branch: refs/heads/master Commit: 7c5df4bcf5a42d9de674d305870302258955b000 Parents: d57c1db Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 24 11:25:36 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 24 11:25:51 2014 +0200 ---------------------------------------------------------------------- components/camel-jackson/pom.xml | 3 +++ .../apache/camel/component/jackson/JacksonMarshalViewTest.java | 2 +- .../camel/component/jackson/SpringJacksonJsonDataFormatTest.java | 2 +- parent/pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7c5df4bc/components/camel-jackson/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml index 1e596d2..86e9d60 100644 --- a/components/camel-jackson/pom.xml +++ b/components/camel-jackson/pom.xml @@ -30,6 +30,9 @@ <description>Camel Jackson support</description> <properties> + <camel.osgi.import.before.defaults> + com.fasterxml.jackson.*;version="[2.3,3)" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.jackson.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-jackson</camel.osgi.export.service> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/7c5df4bc/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 b4c8893..25a82b7 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("{\"height\":190,\"age\":30}", marshalledAsString); + assertEquals("{\"age\":30,\"height\":190}", marshalledAsString); template.sendBody("direct:backPojoAgeView", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/7c5df4bc/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 487caa2..ab2ac06 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("{\"height\":190,\"age\":30}", marshalledAsString); + assertEquals("{\"age\":30,\"height\":190}", marshalledAsString); template.sendBody("direct:backAgeView", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/7c5df4bc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 094900e..140fe6d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -200,7 +200,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.3.3</jackson2-version> + <jackson2-version>2.4.1</jackson2-version> <jackrabbit-version>2.8.0</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>
