You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/03/21 00:40:28 UTC

svn commit: r756804 - /servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml

Author: gnodet
Date: Fri Mar 20 23:40:27 2009
New Revision: 756804

URL: http://svn.apache.org/viewvc?rev=756804&view=rev
Log:
Fix features to use version of the stuff installed

Modified:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=756804&r1=756803&r2=756804&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Mar 20 23:40:27 2009
@@ -37,7 +37,7 @@
         <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
         <bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
     </feature>
-    <feature name="activemq" version="${version}">
+    <feature name="activemq" version="${activemq.version}">
         <feature version="${version}">connector</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
         <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
@@ -48,7 +48,7 @@
         <bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
     </feature>
-    <feature name="cxf" version="${version}">
+    <feature name="cxf" version="${cxf.version}">
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix.specs.version}</bundle>
@@ -68,18 +68,18 @@
         <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
     </feature>
     <feature name="cxf-osgi" version="${version}">
-        <feature version="${version}">cxf</feature>
+        <feature version="${cxf.version}">cxf</feature>
         <feature version="${version}">web-core</feature>
         <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
         <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.osgi/${version}</bundle>
     </feature>
     <feature name="cxf-nmr" version="${version}">
-        <feature version="${version}">cxf</feature>
+        <feature version="${cxf.version}">cxf</feature>
         <feature version="${servicemix.nmr.version}">nmr</feature>
         <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
         <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
     </feature>
-    <feature name="camel" version="${version}">
+    <feature name="camel" version="${camel.version}">
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
         <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.stax-api-1.0/${servicemix.specs.version}</bundle>
@@ -96,7 +96,7 @@
 	  -
       -->
     <feature name="camel-nmr" version="${version}">
-        <feature version="${version}">camel</feature>
+        <feature version="${camel.version}">camel</feature>
         <feature version="${servicemix.nmr.version}">nmr</feature>
         <bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
     </feature>
@@ -109,7 +109,7 @@
         <bundle>mvn:org.apache.servicemix.examples/cxf-nmr/${version}</bundle>
     </feature>
     <feature name="examples-camel-osgi" version="${version}">
-        <feature version="${version}">camel</feature>
+        <feature version="${camel.version}">camel</feature>
         <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
     </feature>
     <feature name="examples-camel-nmr" version="${version}">
@@ -126,16 +126,16 @@
       -  JBI Components
       -
       -->
-    <feature name="servicemix-shared" version="${version}">
+    <feature name="servicemix-shared" version="${servicemix-shared-version}">
         <feature version="${servicemix.nmr.version}">jbi</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
         <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared-version}</bundle>
     </feature>
-    <feature name="servicemix-cxf-bc" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
-        <feature version="${version}">cxf</feature>
+    <feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+        <feature version="${cxf.version}">cxf</feature>
         <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.xmlsec/${xmlsec.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
@@ -144,19 +144,19 @@
         <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc-version}</bundle>
     </feature>
-    <feature name="servicemix-file" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-file" version="${servicemix-file-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file-version}</bundle>
     </feature>
-    <feature name="servicemix-ftp" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-ftp" version="${servicemix-ftp-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons.net.version}</bundle>
         <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp-version}</bundle>
     </feature>
-    <feature name="servicemix-http" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-http" version="${servicemix-http-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
@@ -167,8 +167,8 @@
         <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
     </feature>
-    <feature name="servicemix-jms" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-jms" version="${servicemix-jms-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
@@ -180,43 +180,43 @@
         <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms-version}</bundle>
     </feature>
-    <feature name="servicemix-mail" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-mail" version="${servicemix-mail-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</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.javamail-api-1.4/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.geronimo-javamail_1.4_provider/${geronimo.javamail.provider.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail-version}</bundle>
     </feature>
-    <feature name="servicemix-bean" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-bean" version="${servicemix-bean-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean-version}</bundle>
     </feature>
-    <feature name="servicemix-camel" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
-        <feature version="${version}">camel</feature>
+    <feature name="servicemix-camel" version="${servicemix-camel-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+        <feature version="${camel.version}">camel</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel-version}</bundle>
     </feature>
-    <feature name="servicemix-drools" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-drools" version="${servicemix-drools-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt.core.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools-version}</bundle>
     </feature>
-    <feature name="servicemix-cxf-se" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
-        <feature version="${version}">cxf</feature>
+    <feature name="servicemix-cxf-se" version="${servicemix-cxf-se-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+        <feature version="${cxf.version}">cxf</feature>
         <bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
         <bundle>mvn:org.apache.cxf/cxf-rt-transports-jbi/${cxf.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se-version}</bundle>
     </feature>
-    <feature name="servicemix-eip" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-eip" version="${servicemix-eip-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip-version}</bundle>
     </feature>
-    <feature name="servicemix-osworkflow" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-osworkflow" version="${servicemix-osworkflow-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.version}</bundle>
         <bundle>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.version}</bundle>
@@ -225,36 +225,36 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix-osworkflow-version}</bundle>
     </feature>
-    <feature name="servicemix-quartz" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-quartz" version="${servicemix-quartz-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.version}</bundle>
         <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix-quartz-version}</bundle>
     </feature>
-    <feature name="servicemix-scripting" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-scripting" version="${servicemix-scripting-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting-version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting-version}</bundle>
     </feature>
-    <feature name="servicemix-validation" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-validation" version="${servicemix-validation-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix-validation-version}</bundle>
     </feature>
-    <feature name="servicemix-saxon" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-saxon" version="${servicemix-saxon-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon-version}</bundle>
     </feature>
-    <feature name="servicemix-wsn2005" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
-        <feature version="${version}">activemq</feature>
+    <feature name="servicemix-wsn2005" version="${servicemix-wsn2005-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+        <feature version="${activemq.version}">activemq</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.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.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
@@ -262,17 +262,17 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005-version}</bundle>
     </feature>
-    <feature name="servicemix-snmp" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-snmp" version="${servicemix-snmp-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix-snmp-version}</bundle>
     </feature>
-    <feature name="servicemix-vfs" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-vfs" version="${servicemix-vfs-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs-version}</bundle>
     </feature>
-    <feature name="servicemix-smpp" version="${version}">
-        <feature version="${version}">servicemix-shared</feature>
+    <feature name="servicemix-smpp" version="${servicemix-smpp-version}">
+        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix-smpp-version}</bundle>
     </feature>