You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/09/16 17:49:13 UTC

svn commit: r997802 [1/3] - in /servicemix/smx4/features/trunk: assembly/ assembly/src/main/distribution/text/etc/ assembly/src/main/filtered-resources/ assembly/src/main/filtered-resources/etc/ branding/ camel/ camel/servicemix-camel/ cxf/ cxf/cxf-bin...

Author: jbonofre
Date: Thu Sep 16 15:49:11 2010
New Revision: 997802

URL: http://svn.apache.org/viewvc?rev=997802&view=rev
Log:
[SMX4-584] Cleanup the features build including latest bundles version.

Added:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties   (with props)
Removed:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
    servicemix/smx4/features/trunk/branding/pom.xml
    servicemix/smx4/features/trunk/camel/pom.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
    servicemix/smx4/features/trunk/cxf/pom.xml
    servicemix/smx4/features/trunk/deps/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/bridge-http-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/bridge-jms-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/client/pom.xml
    servicemix/smx4/features/trunk/examples/bridge-camel/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/bridge-eip-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/bridge-http-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/bridge-jms-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/bridge-sa/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/bridge-xslt-su/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/client/pom.xml
    servicemix/smx4/features/trunk/examples/bridge/pom.xml
    servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml
    servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml
    servicemix/smx4/features/trunk/examples/camel/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first/client/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/client/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-bean-su/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-jms-su/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-ode-su/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-sa/pom.xml
    servicemix/smx4/features/trunk/examples/loan-broker-bpel/pom.xml
    servicemix/smx4/features/trunk/examples/pom.xml
    servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml
    servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml
    servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml
    servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>apache-servicemix</artifactId>
     <packaging>pom</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix :: Assembly</name>
+    <name>Apache ServiceMix :: Features :: Assembly</name>
 
     <dependencies>
         <!-- making sure all karaf dependencies are in our local Maven repo -->
@@ -67,7 +67,7 @@
             <version>${servicemix.nmr.version}</version>
             <type>zip</type>
         </dependency>
-        <!-- adding other dependencies for the SMX4 assembly -->
+        <!-- adding other dependencies for the SMX4 assembly --> 
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo.connector.version}</version>
+            <version>${geronimo-connector.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -129,11 +129,12 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.mvel</artifactId>
+            <version>${mvel.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.drools</artifactId>
-            <version>${drools.version}</version>
+            <version>${drools.bundle.version}</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -143,37 +144,37 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.groovy</artifactId>
-            <version>${groovy.version}</version>
+            <version>${groovy.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
-            <version>${jdt.core.version}</version>
+            <version>${jdt-core.bundle.version}</version>
         </dependency>       
          <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
+            <version>${commons-codec.bundle.version}</version>
         </dependency> 
          <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-net</artifactId>
-            <version>${commons-net.version}</version>
+            <version>${commons-net.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
-            <version>${commons-lang-version}</version>
+            <version>${commons-lang.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
-            <version>${velocity.version}</version>
+            <version>${velocity.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
-            <version>${jdom.version}</version>
+            <version>${jdom.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
@@ -188,17 +189,17 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
-            <version>${saaj.impl.version}</version>
+            <version>${saaj-impl.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-            <version>${wsdl4j.version}</version>
+            <version>${wsdl4j.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
-            <version>${opensaml.version}</version>
+            <version>${opensaml.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.security</groupId>
@@ -208,37 +209,37 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
-            <version>${xmlsec.version}</version>
+            <version>${xmlsec.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-            <version>${bcel.version}</version>
+            <version>${bcel.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-            <version>${commons-httpclient.version}</version>
+            <version>${commons-httpclient.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
-            <version>${commons-collections.version}</version>
+            <version>${commons-collections.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.oro</artifactId>
-            <version>${oro.version}</version>
+            <version>${oro.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-            <version>${rhino.version}</version>
+            <version>${rhino.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jruby</artifactId>
-            <version>${jruby.version}</version>
+            <version>${jruby.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -292,22 +293,22 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.howl</artifactId>
-            <version>${howl.version}</version>
+            <version>${howl.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
-            <version>${saxon.version}</version>
+            <version>${saxon.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-            <version>${asm.version}</version>
+            <version>${asm.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.fastinfoset</artifactId>
-            <version>${fastinfoset.version}</version>
+            <version>${fastinfoset.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jencks</groupId>
@@ -327,42 +328,42 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
-            <version>${quartz.version}</version>
+            <version>${quartz.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.oscore</artifactId>
-            <version>${oscore.version}</version>
+            <version>${oscore.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.osworkflow</artifactId>
-            <version>${osworkflow.version}</version>
+            <version>${osworkflow.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
-            <version>${antlr.version}</version>
+            <version>${antlr.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.antlr-runtime</artifactId>
-            <version>${antlr-runtime.version}</version>
+            <version>${antlr-runtime.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.propertyset</artifactId>
-            <version>${propertyset.version}</version>
+            <version>${propertyset.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-            <version>${snmp4j.version}</version>
+            <version>${snmp4j.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
-            <version>${jsmpp.version}</version>
+            <version>${jsmpp.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -382,7 +383,7 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>${neethi.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
@@ -392,36 +393,36 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-            <version>${xmlresolver.version}</version>
+            <version>${xmlresolver.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
-            <version>${xerces.version}</version>
+            <version>${xerces.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-            <version>${xalan.version}</version>
+            <version>${xalan.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-            <version>${jaxb.impl.version}</version>
+            <version>${jaxb-impl.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb-api.version}</artifactId>
             <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}</artifactId>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
             <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-${jaxrs.api.version}</artifactId>
+            <artifactId>org.apache.servicemix.specs.jsr311-api-${jaxrs-api.version}</artifactId>
             <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
@@ -452,22 +453,22 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>${geronimo.jms.version}</version>
+            <version>${geronimo-jms.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-            <version>${geronimo.j2ee.management.version}</version>
+            <version>${geronimo-j2ee-management.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <version>${geronimo.annotation.version}</version>
+            <version>${geronimo-annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -484,7 +485,7 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo.transaction.version}</version>
+            <version>${geronimo-transaction.version}</version>
         </dependency>
         <dependency>
            <groupId>javax.mail</groupId>
@@ -506,58 +507,6 @@
             <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-cxf</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-ejbd</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-http</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-javaagent</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-jee</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-loader</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-server</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-webservices</artifactId>
-            <version>${openejb.version}</version>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-            <version>${commons-pool.activemq.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
@@ -621,42 +570,42 @@
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-api</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-spi</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-runtime</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-jetty</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-jsp</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-extender-war</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-extender-whiteboard</artifactId>
-            <version>${pax.web.version}</version>
+            <version>${pax-web.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-war</artifactId>
-            <version>${pax.url.version}</version>
+            <version>${pax-url.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
@@ -715,142 +664,142 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-http</artifactId>
-            <version>${servicemix-http-version}</version>
+            <version>${servicemix-http.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jms</artifactId>
-            <version>${servicemix-jms-version}</version>
+            <version>${servicemix-jms.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-drools</artifactId>
-            <version>${servicemix-drools-version}</version>
+            <version>${servicemix-drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-eip</artifactId>
-            <version>${servicemix-eip-version}</version>
+            <version>${servicemix-eip.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-script</artifactId>
-            <version>${servicemix-script-version}</version>
+            <version>${servicemix-script.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-scripting</artifactId>
-            <version>${servicemix-scripting-version}</version>
+            <version>${servicemix-scripting.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-validation</artifactId>
-            <version>${servicemix-validation-version}</version>
+            <version>${servicemix-validation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-wsn2005</artifactId>
-            <version>${servicemix-wsn2005-version}</version>
+            <version>${servicemix-wsn2005.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-file</artifactId>
-            <version>${servicemix-file-version}</version>
+            <version>${servicemix-file.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-ftp</artifactId>
-            <version>${servicemix-ftp-version}</version>
+            <version>${servicemix-ftp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-xmpp</artifactId>
-            <version>${servicemix-xmpp-version}</version>
+            <version>${servicemix-xmpp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-saxon</artifactId>
-            <version>${servicemix-saxon-version}</version>
+            <version>${servicemix-saxon.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-quartz</artifactId>
-            <version>${servicemix-quartz-version}</version>
+            <version>${servicemix-quartz.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jsr181</artifactId>
-            <version>${servicemix-jsr181-version}</version>
+            <version>${servicemix-jsr181.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-mail</artifactId>
-            <version>${servicemix-mail-version}</version>
+            <version>${servicemix-mail.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-osworkflow</artifactId>
-            <version>${servicemix-osworkflow-version}</version>
+            <version>${servicemix-osworkflow.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-bean</artifactId>
-            <version>${servicemix-bean-version}</version>
+            <version>${servicemix-bean.version}</version>
         </dependency>                
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-truezip</artifactId>
-            <version>${servicemix-truezip-version}</version>
+            <version>${servicemix-truezip.version}</version>
         </dependency>                
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-cxf-se</artifactId>
-            <version>${servicemix-cxf-se-version}</version>
+            <version>${servicemix-cxf-se.version}</version>
         </dependency>                
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-cxf-bc</artifactId>
-            <version>${servicemix-cxf-bc-version}</version>
+            <version>${servicemix-cxf-bc.version}</version>
         </dependency>                
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-camel</artifactId>
-            <version>${servicemix-camel-version}</version>
+            <version>${servicemix-camel.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-snmp</artifactId>
-            <version>${servicemix-snmp-version}</version>
+            <version>${servicemix-snmp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-vfs</artifactId>
-            <version>${servicemix-vfs-version}</version>
+            <version>${servicemix-vfs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-exec</artifactId>
-            <version>${servicemix-exec-version}</version>
+            <version>${servicemix-exec.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
-            <version>${commons-vfs.version}</version>
+            <version>${commons-vfs.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-smpp</artifactId>
-            <version>${servicemix-smpp-version}</version>
+            <version>${servicemix-smpp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-shared</artifactId>
-            <version>${servicemix-shared-version}</version>
+            <version>${servicemix-shared.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
-            <version>${servicemix-shared-version}</version>
+            <version>${servicemix-shared.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
@@ -900,7 +849,7 @@
           <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
-                <version>${commons-jexl.version}</version>
+                <version>${commons-jexl.bundle.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>junit</groupId>
@@ -911,7 +860,7 @@
            <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
-                <version>${jaxp.ri.version}</version>
+                <version>${jaxp-ri.bundle.version}</version>
             </dependency>
   
 			<dependency>
@@ -931,19 +880,7 @@
 				</exclusions>
 			</dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>scriptengines</id>
-            <name>ScriptEngines Repository</name>
-            <url>http://scriptengines.googlecode.com/svn/m2-repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>     
-                <enabled>false</enabled>
-            </snapshots>     
-        </repository>
-    </repositories>
+    
     <build>
         <resources>
             <resource>
@@ -1159,7 +1096,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven.assembly.version}</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>unix-bin</id>

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties?rev=997802&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties Thu Sep 16 15:49:11 2010
@@ -0,0 +1,21 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#
+smx=smx,admin

Propchange: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Thu Sep 16 15:49:11 2010
@@ -23,12 +23,12 @@
      <feature version='${camel.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-core' version='${camel.version}'>
-    <feature version="3.0.3.RELEASE">spring</feature>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/1.4.0</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/1.4.0</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.4.0</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.12_1</bundle>
-    <bundle>mvn:org.fusesource.commonman/commons-management/1.0</bundle>
+    <feature version="${spring.version}">spring</feature>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb-api.version}/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
+    <bundle>mvn:org.fusesource.commonman/commons-management/${commons-management.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
   </feature>
   <feature name='camel-blueprint' version='${camel.version}'>
@@ -36,56 +36,56 @@
       <bundle>mvn:org.apache.camel/camel-blueprint/${camel.version}</bundle>
   </feature>
   <feature name='camel-spring' version='${camel.version}'>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <feature version='3.0.3.RELEASE'>spring</feature>
-    <feature version='1.2.0'>spring-dm</feature>
-    <bundle>mvn:org.springframework/spring-tx/3.0.3.RELEASE</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <feature version='${spring.version}'>spring</feature>
+    <feature version='${spring.osgi.version}'>spring-dm</feature>
+    <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
   </feature>
    <feature name='camel-test' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/4.7_1</bundle>    
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit.bundle.version}</bundle>    
     <bundle>mvn:org.apache.camel/camel-test/${camel.version}</bundle>
   </feature> 
   <feature name='camel-cxf' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.springframework/spring-jms/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/2.2.3_3</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
-    <bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/1.4.3_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
-    <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/4.0.7</bundle>
-    <bundle>mvn:org.codehaus.woodstox/stax2-api/3.0.1</bundle>
-    <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/1.4.5</bundle>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
-    <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/1.2.8</bundle>
-    <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/1.2.8</bundle>
-    <bundle>mvn:javax.mail/mail/1.4.3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/2.0.4_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_3</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/1.4.0</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.4.0</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/1.4.0</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+    <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.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:org.codehaus.jettison/jettison/${jettison.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>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
+    <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
+    <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2api.version}</bundle>
+    <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
+    <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
+    <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
+    <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
     <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.3.2_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-spring</feature>
     <feature version='${karaf.version}'>http</feature>
     <bundle>mvn:org.apache.camel/camel-cxf/${camel.version}</bundle>
@@ -93,7 +93,7 @@
   <feature name='camel-cache' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle> 
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle> 
     <bundle>mvn:org.apache.camel/camel-cache/${camel.version}</bundle> 
   </feature>
   <feature name='camel-castor' version='${camel.version}'>
@@ -103,26 +103,26 @@
   </feature>
   <feature name='camel-dozer' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/5.2.0_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/${dozer.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-dozer/${camel.version}</bundle>
   </feature>
   <feature name='camel-http' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.0.1</bundle>
-    <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.0.1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents.version}</bundle>
+    <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpcomponents.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-http/${camel.version}</bundle>
   </feature>
   <feature name='camel-mina' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
   </feature>
   <feature name='camel-jetty' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-http</feature>
     <bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>
   </feature>
@@ -131,46 +131,46 @@
     <bundle>mvn:org.apache.camel/camel-servlet/${camel.version}</bundle>
   </feature>
   <feature name='camel-jms' version='${camel.version}'>
-    <bundle>mvn:org.springframework/spring-core/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.springframework/spring-beans/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.springframework/spring-context/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.springframework/spring-tx/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.springframework/spring-jms/3.0.3.RELEASE</bundle>
+    <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
+    <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
+    <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
+    <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+    <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jms/${camel.version}</bundle>
   </feature>
   <feature name='camel-amqp' version='${camel.version}'>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/0.5.0_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-jms</feature>
     <bundle>mvn:org.apache.camel/camel-amqp/${camel.version}</bundle>
   </feature>
   <feature name='camel-atom' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_3</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.abdera/${abdera.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-atom/${camel.version}</bundle>
   </feature>
   <feature name='camel-bam' version='${camel.version}'>
     <feature>http</feature>
-    <bundle>mvn:org.springframework/spring-tx/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.springframework/spring-web/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.springframework/spring-jdbc/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
-    <bundle>mvn:org.springframework/spring-orm/3.0.3.RELEASE</bundle>        
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
+    <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>        
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-sqlmap.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-bam/${camel.version}</bundle>
   </feature>
@@ -179,75 +179,75 @@
     <bundle>mvn:org.apache.camel/camel-bindy/${camel.version}</bundle>
   </feature>
   <feature name='camel-cometd' version='${camel.version}'>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/6.1.11_3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/${jetty-cometd.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-cometd/${camel.version}</bundle>
   </feature>
   <feature name='camel-csv' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/1.0-r706899_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-csv/${camel.version}</bundle>
   </feature>
   <feature name='camel-flatpack' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/2.4.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/3.1.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-flatpack/${camel.version}</bundle>
   </feature>
   <feature name='camel-freemarker' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/2.3.15_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-freemarker/${camel.version}</bundle>
   </feature>
   <feature name='camel-ftp' version='${camel.version}'>
-    <bundle>mvn:commons-net/commons-net/2.0</bundle>
+    <bundle>mvn:commons-net/commons-net/${commons-net.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.31_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ftp/${camel.version}</bundle>
   </feature>
   <feature name='camel-guice' version='${camel.version}'>
     <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/2.0</bundle>
     <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/2.0</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>
   </feature>
   <feature name='camel-groovy' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.4.0</bundle>
-    <bundle>mvn:org.codehaus.groovy/groovy-all/1.7.0</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${groovy.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-groovy/${camel.version}</bundle>
   </feature>
   <feature name='camel-hl7' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/0.5.1_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-hl7/${camel.version}</bundle>
   </feature>
   <feature name='camel-ibatis' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
-    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>    
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>    
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-sqlmap.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ibatis/${camel.version}</bundle>
   </feature>
   <feature name='camel-irc' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/1.10_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-irc/${camel.version}</bundle>
   </feature>
@@ -256,16 +256,16 @@
     <bundle>mvn:org.apache.camel/camel-jaxb/${camel.version}</bundle>
   </feature>
   <feature name='camel-jcr' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/1.0_2</bundle>
-    <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/1.5.3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-api.bundle.version}</bundle>
+    <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jcr/${camel.version}</bundle>
   </feature>
   <feature name='camel-jing' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/20050913_1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/20030619_1</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.isorelax/${isorelax.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-jing/${camel.version}</bundle>
   </feature>
   <feature name='camel-jdbc' version='${camel.version}'>
@@ -273,43 +273,43 @@
     <bundle>mvn:org.apache.camel/camel-jdbc/${camel.version}</bundle>
   </feature>
   <feature name='camel-josql' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/1.5_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-josql/${camel.version}</bundle>
   </feature>
   <feature name='camel-jpa' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
-    <bundle>mvn:org.springframework/spring-tx/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.springframework/spring-jdbc/3.0.3.RELEASE</bundle>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/1.2.1_2</bundle>
-    <bundle>mvn:org.springframework/spring-orm/3.0.3.RELEASE</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
+    <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.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.serp/${serp.bundle.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa.bundle.version}</bundle>
+    <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jpa/${camel.version}</bundle>
   </feature>
   <feature name='camel-jxpath' version='${camel.version}'>
     <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/1.0.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
-    <bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
+    <bundle>mvn:commons-jxpath/commons-jxpath/${commons-jxpath.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jxpath/${camel.version}</bundle>
   </feature>
   <feature name='camel-juel' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/2.1.2_1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-juel/${camel.version}</bundle>
   </feature>
   <feature name='camel-ldap' version='${camel.version}'>
@@ -317,49 +317,49 @@
     <bundle>mvn:org.apache.camel/camel-ldap/${camel.version}</bundle>
   </feature>
   <feature name='camel-mail' version='${camel.version}'>
-    <bundle>mvn:org.springframework/spring-context/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.springframework/spring-context-support/3.0.3.RELEASE</bundle>
-    <bundle>mvn:javax.mail/mail/1.4.3</bundle>
+    <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
+    <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+    <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-mail/${camel.version}</bundle>
   </feature>
   <feature name='camel-msv' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/20050913_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.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.isorelax/${isorelax.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-msv/${camel.version}</bundle>
     <feature version='${camel.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-mvel' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/2.0.8_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-mvel/${camel.version}</bundle>
   </feature>
   <feature name='camel-ognl' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/2.7.3_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl.bundle.version}</bundle>
     <bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/3.9.0.GA</bundle>
     <bundle>mvn:org.apache.camel/camel-ognl/${camel.version}</bundle>
   </feature>
   <feature name='camel-printer' version='${camel.version}'>
-    <bundle>mvn:commons-net/commons-net/2.0</bundle>
+    <bundle>mvn:commons-net/commons-net/${commons-net.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.31_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-printer/${camel.version}</bundle>
   </feature>
   <feature name='camel-protobuf' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${camel.version}_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-protobuf/${camel.version}</bundle>
   </feature>
   <feature name='camel-quartz' version='${camel.version}'>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.6.6_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-quartz/${camel.version}</bundle>
   </feature>
@@ -375,13 +375,13 @@
   </feature>
   <feature name='camel-rss' version='${camel.version}'>
     <feature version='${camel.version}'>camel-atom</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
     <bundle>mvn:http://download.java.net/maven/2!rome/rome/1.0</bundle>
     <bundle>mvn:org.apache.camel/camel-rss/${camel.version}</bundle>
   </feature>
   <feature name='camel-saxon' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-saxon/${camel.version}</bundle>
   </feature>
   <feature name='camel-scala' version='${camel.version}'>
@@ -391,17 +391,17 @@
   </feature>
   <feature name='camel-script' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.4.0</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-script/${camel.version}</bundle>
   </feature>
   <feature name='camel-smpp' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/2.0_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-smpp/${camel.version}</bundle>
   </feature>
   <feature name='camel-snmp' version='${camel.version}'>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/1.8.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-snmp/${camel.version}</bundle>
   </feature>
   <feature name='camel-spring-integration' version='${camel.version}'>
@@ -419,9 +419,9 @@
     <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${camel.version}</bundle>
   </feature-->
   <feature name='camel-sql' version='${camel.version}'>
-    <bundle>mvn:org.springframework/spring-tx/3.0.3.RELEASE</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-    <bundle>mvn:org.springframework/spring-jdbc/3.0.3.RELEASE</bundle>
+    <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-sql/${camel.version}</bundle>
   </feature>
@@ -431,57 +431,57 @@
   </feature>
   <feature name='camel-string-template' version='${camel.version}'>
     <feature version='${camel.version}'>camel-spring</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/3.2_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-stringtemplate/${camel.version}</bundle>
   </feature>
   <feature name='camel-tagsoup' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/1.2_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-tagsoup/${camel.version}</bundle>
   </feature>
   <feature name='camel-velocity' version='${camel.version}'>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
-    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
-    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/0.9.4_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.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.antlr/${antlr2.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-velocity/${camel.version}</bundle>
   </feature>
   <feature name='camel-xmlbeans' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</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.xmlbeans/${xmlbeans.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-xmlbeans/${camel.version}</bundle>
   </feature>
   <feature name='camel-xmlsecurity' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/1.4.3_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-xmlsecurity/${camel.version}</bundle>
   </feature>
   <feature name='camel-xmpp' version='${camel.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/3.0.4_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack.bundle.version}</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-xmpp/${camel.version}</bundle>
   </feature>
   <feature name='camel-xstream' version='${camel.version}'>
     <bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
     <feature version='${camel.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/1.5.2_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-xstream/${camel.version}</bundle>
   </feature>
 </features>