Author: hadrian
Date: Thu Apr 7 16:09:00 2011
New Revision: 1089930
URL: http://svn.apache.org/viewvc?rev=1089930&view=rev
Log:
CAMEL-3836. Upgrade to jackson-1.7.5. Backport to camel-2.7.x
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/parent/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 16:09:00 2011
@@ -1 +1 @@
-/camel/trunk:1087856,1088583,1089275
+/camel/trunk:1087856,1088583,1088916,1089275
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 16:09:00 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1087856,1088583,1089275
+/camel/trunk/components/camel-http:917526,1087856,1088583,1088916,1089275
Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1089930&r1=1089929&r2=1089930&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Thu Apr 7 16:09:00 2011
@@ -86,7 +86,7 @@
<httpclient4-version>4.1</httpclient4-version>
<httpclient-version>3.1</httpclient-version>
<icu4j-version>4.0.1</icu4j-version>
- <jackson-version>1.7.1</jackson-version>
+ <jackson-version>1.7.5</jackson-version>
<jain-sip-ri-bundle-version>1.2.154_1</jain-sip-ri-bundle-version>
<jasypt-version>1.7</jasypt-version>
<javassist-bundle-version>3.9.0.GA_1</javassist-bundle-version>
