servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1090187 - /servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Date Fri, 08 Apr 2011 10:30:12 GMT
Author: ffang
Date: Fri Apr  8 10:30:11 2011
New Revision: 1090187

URL: http://svn.apache.org/viewvc?rev=1090187&view=rev
Log:
[SMX4-804]ensure some bundle could be installed with OBR resolver

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=1090187&r1=1090186&r2=1090187&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 Apr
 8 10:30:11 2011
@@ -185,13 +185,12 @@
     <feature name="servicemix-shared" version="${servicemix.components.version}" resolver="(obr)">
         <feature version="${servicemix.nmr.version}">jbi</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-cxf-bc" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <feature version="${cxf.version}">cxf</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
@@ -213,12 +212,10 @@
         <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-file" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-ftp" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
         <bundle dependency="true">mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
@@ -226,7 +223,6 @@
         <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-http" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
         <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
@@ -240,7 +236,6 @@
         <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-jms" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
@@ -254,14 +249,12 @@
         <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-mail" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
         <bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-bean" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix.components.version}</bundle>
@@ -272,17 +265,15 @@
         <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-drools" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-cxf-se" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <feature version="${cxf.version}">cxf</feature>
         <bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
@@ -290,12 +281,10 @@
         <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-eip" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-osworkflow" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
@@ -306,7 +295,6 @@
         <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-quartz" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
@@ -314,32 +302,28 @@
         <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-scripting" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.bundle.version}</bundle>
-        <bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
-        <bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
-        <bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.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.components.version}</bundle>
     </feature>
     <feature name="servicemix-validation" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-saxon" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-wsn2005" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <feature version="${activemq.version}">activemq</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
@@ -350,25 +334,21 @@
         <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-snmp" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-vfs" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-smpp" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-exec" version="${servicemix.components.version}" resolver="(obr)">
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix.components.version}</bundle>
     </feature>



Mime
View raw message