Author: janstey
Date: Thu Dec  6 20:43:50 2012
New Revision: 1418070

URL: http://svn.apache.org/viewvc?rev=1418070&view=rev
Log:
CAMEL-5851 - upgrade to mvel 2.1.3.Final


Conflicts:
        parent/pom.xml
        platforms/karaf/features/src/main/resources/features.xml

Modified:
    camel/branches/camel-2.10.x/parent/pom.xml
    
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/bundles.properties
    
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1418070&r1=1418069&r2=1418070&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Thu Dec  6 20:43:50 2012
@@ -145,7 +145,7 @@
     <mockito-version>1.9.0</mockito-version>
     <mongo-java-driver-version>2.9.1</mongo-java-driver-version>
     <mqtt-client-version>1.4</mqtt-client-version>
-    <mvel-version>2.0.18</mvel-version>
+    <mvel-version>2.1.3.Final</mvel-version>
     <mybatis-version>3.1.1</mybatis-version>
     <!-- transitive dependency from avro, to use older netty bundle -->
     <netty-bundle-version>3.2.7.Final_1</netty-bundle-version>

Modified: 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/bundles.properties
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/bundles.properties?rev=1418070&r1=1418069&r2=1418070&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/bundles.properties
 (original)
+++ 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/bundles.properties
 Thu Dec  6 20:43:50 2012
@@ -58,7 +58,6 @@ org.apache.servicemix.bundles/org.apache
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.httpcore/${httpcore-bundle-version}/jar

Modified: 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml?rev=1418070&r1=1418069&r2=1418070&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
 (original)
+++ 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
 Thu Dec  6 20:43:50 2012
@@ -586,7 +586,7 @@
     <feature version='${project.version}'>camel-core</feature>
   </feature>
   <feature name='camel-mvel' version='${project.version}' resolver='(obr)' 
start-level='50'>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-mvel/${project.version}</bundle>
   </feature>


Reply via email to