Repository: camel Updated Branches: refs/heads/master ee880e496 -> 93f8f6d6e
Upgrade Jackson to version 2.7.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93f8f6d6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93f8f6d6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93f8f6d6 Branch: refs/heads/master Commit: 93f8f6d6e930f09e8a3c6294f1fb027398962687 Parents: ee880e4 Author: Andrea Cosentino <[email protected]> Authored: Mon Jan 11 11:34:56 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Mon Jan 11 11:34:56 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/jacksonxml/JacksonMarshalTest.java | 2 +- .../component/jacksonxml/SpringJacksonJsonDataFormatTest.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/93f8f6d6/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java index 5de0001..6666b3a 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java @@ -57,7 +57,7 @@ public class JacksonMarshalTest extends CamelTestSupport { Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - String expected = "<HashMap>\n <name>Camel</name>\n</HashMap>"; + String expected = "<HashMap>\n <name>Camel</name>\n</HashMap>\n"; assertEquals(expected, marshalledAsString); template.sendBody("direct:backPretty", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/93f8f6d6/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java index f11c5ea..af07d18 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java @@ -61,7 +61,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - String expected = "<HashMap>\n <name>Camel</name>\n</HashMap>"; + String expected = "<HashMap>\n <name>Camel</name>\n</HashMap>\n"; assertEquals(expected, marshalledAsString); template.sendBody("direct:back", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/93f8f6d6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 939fe39..24a97b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -249,7 +249,7 @@ <jini-version>2.1</jini-version> <jackson-version>1.9.12</jackson-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> - <jackson2-version>2.6.4</jackson2-version> + <jackson2-version>2.7.0</jackson2-version> <jackrabbit-version>2.11.3</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
