Author: dkulp Date: Wed Aug 15 16:26:28 2012 New Revision: 1373514 URL: http://svn.apache.org/viewvc?rev=1373514&view=rev Log: Merged revisions 1373498 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1373498 | dkulp | 2012-08-15 12:09:02 -0400 (Wed, 15 Aug 2012) | 10 lines Merged revisions 1372320 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1372320 | davsclaus | 2012-08-13 04:48:48 -0400 (Mon, 13 Aug 2012) | 2 lines Upgraded to Jettison 1.3.2 ........ ........ Modified: camel/branches/camel-2.9.x/parent/pom.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1373514&r1=1373513&r2=1373514&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Wed Aug 15 16:26:28 2012 @@ -105,7 +105,7 @@ <jclouds-feature-version>1.3.2_3</jclouds-feature-version> <jdom-version>1.1</jdom-version> <jetty-version>7.5.4.v20111024</jetty-version> - <jettison-version>1.3</jettison-version> + <jettison-version>1.3.2</jettison-version> <jexcelapi-version>2.4.2</jexcelapi-version> <jibx-version>1.2.4.5</jibx-version> <jruby-version>1.6.7</jruby-version>
