Author: ningjiang
Date: Sat Jul 3 08:38:24 2010
New Revision: 960171
URL: http://svn.apache.org/viewvc?rev=960171&view=rev
Log:
CAMEL-2903 updated the Commons Codec version in the camel feature
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=960171&r1=960170&r2=960171&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
Sat Jul 3 08:38:24 2010
@@ -69,8 +69,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
@@ -123,8 +123,8 @@
</feature>
<feature name='camel-http' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle>
</feature>
@@ -184,8 +184,8 @@
</feature>
<feature name='camel-atom' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
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=960171&r1=960170&r2=960171&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Jul 3 08:38:24 2010
@@ -66,8 +66,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
@@ -131,8 +131,8 @@
</feature>
<feature name='camel-http' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle>
</feature>
@@ -192,8 +192,8 @@
</feature>
<feature name='camel-atom' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
