svn commit: r962544 - in /camel/trunk: components/camel-mvel/pom.xml parent/pom.xml

[da...@apache.org]

Author: davsclaus
Date: Fri Jul  9 14:28:12 2010
New Revision: 962544

URL: http://svn.apache.org/viewvc?rev=962544&view=rev
Log:
CAMEL-2929: Upgraded to Jackson 1.5.4. Also upgraded mvel.

Modified:
    camel/trunk/components/camel-mvel/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-mvel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=962544&r1=962543&r2=962544&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/pom.xml (original)
+++ camel/trunk/components/camel-mvel/pom.xml Fri Jul  9 14:28:12 2010
@@ -44,7 +44,7 @@
     <dependency>
 	<groupId>org.mvel</groupId>
 	<artifactId>mvel2</artifactId>
-	<version>2.0.9</version>
+	<version>${mvel-version}</version>
     </dependency>
 
     <!-- testing -->

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=962544&r1=962543&r2=962544&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jul  9 14:28:12 2010
@@ -77,7 +77,7 @@
     <httpcore4-version>4.0.1</httpcore4-version>
     <httpclient4-version>4.0.1</httpclient4-version>
     <httpclient-version>3.1</httpclient-version>
-    <jackson-version>1.5.2</jackson-version>
+    <jackson-version>1.5.4</jackson-version>
     <javassist-version>3.9.0.GA</javassist-version>
     <javax-mail-version>1.4.3</javax-mail-version>
     <jaxb-version>2.1.12</jaxb-version>
@@ -92,6 +92,7 @@
     <lucene-version>3.0.1</lucene-version>
     <mina-version>1.1.7</mina-version>
     <mockito-version>1.8.2</mockito-version>
+    <mvel-version>2.0.17</mvel-version>
     <netty-version>3.2.1.Final</netty-version>
     <ode-version>1.3.3</ode-version>
     <ognl-version>2.7.3_3</ognl-version>