svn commit: r1418067 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/bundles.properties platforms/karaf/features/src/main/resources/features.xml

[ja...@apache.org]

Author: janstey
Date: Thu Dec  6 20:40:34 2012
New Revision: 1418067

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

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1418067&r1=1418066&r2=1418067&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Dec  6 20:40:34 2012
@@ -242,8 +242,7 @@
     <mockito-version>1.9.5</mockito-version>
     <mongo-java-driver-version>2.9.1</mongo-java-driver-version>
     <mqtt-client-version>1.4</mqtt-client-version>
-    <mvel-bundle-version>2.0.18_3</mvel-bundle-version>
-    <mvel-version>2.0.18</mvel-version>
+    <mvel-version>2.1.3.Final</mvel-version>
     <mybatis-version>3.1.1</mybatis-version>
     <neethi-bundle-version>3.0.1</neethi-bundle-version>
     <netty-version>3.5.11.Final</netty-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=1418067&r1=1418066&r2=1418067&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties Thu Dec  6 20:40:34 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/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1418067&r1=1418066&r2=1418067&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Dec  6 20:40:34 2012
@@ -292,7 +292,7 @@
     <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle>
     <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp-bundle-version}</bundle>
-    <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>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-elasticsearch/${project.version}</bundle>
@@ -592,7 +592,7 @@
     <bundle>mvn:org.apache.camel/camel-msv/${project.version}</bundle>
   </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>