Author: davsclaus
Date: Tue Jan 19 10:47:17 2010
New Revision: 900722
URL: http://svn.apache.org/viewvc?rev=900722&view=rev
Log:
CAMEL-2380: Upgraded to Jettison 1.2
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=900722&r1=900721&r2=900722&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jan 19 10:47:17 2010
@@ -82,6 +82,7 @@
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<httpunit-version>1.6.2</httpunit-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
+ <jettison-version>1.2</jettison-version>
<groovy-version>1.7.0</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<!-- spring 2.5.x is only compatible with junit 4.4 or lower - see
SPR-5145 -->
@@ -1047,7 +1048,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.1</version>
+ <version>${jettison-version}</version>
</dependency>
<dependency>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=900722&r1=900721&r2=900722&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Jan 19 10:47:17 2010
@@ -72,7 +72,7 @@
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_2</jdom-bundle-version>
- <jettison-bundle-version>1.1</jettison-bundle-version>
+ <jettison-bundle-version>1.2</jettison-bundle-version>
<jetty-bundle-version>6.1.19_2</jetty-bundle-version>
<jetty-cometd-bundle-version>6.1.11_3</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
