cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1182544 - in /cxf/trunk/osgi/karaf: commands/pom.xml features/src/main/resources/features.xml
Date Wed, 12 Oct 2011 19:28:30 GMT
Author: dkulp
Date: Wed Oct 12 19:28:30 2011
New Revision: 1182544

URL: http://svn.apache.org/viewvc?rev=1182544&view=rev
Log:
Updates to work with Karaf 2.2.3

Modified:
    cxf/trunk/osgi/karaf/commands/pom.xml
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml

Modified: cxf/trunk/osgi/karaf/commands/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/commands/pom.xml?rev=1182544&r1=1182543&r2=1182544&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/commands/pom.xml (original)
+++ cxf/trunk/osgi/karaf/commands/pom.xml Wed Oct 12 19:28:30 2011
@@ -69,8 +69,10 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-              org.apache.felix.service.command,
-              org.apache.felix.gogo.commands,
+              !org.apache.cxf.karaf.commands,
+              org.apache.felix.service.command;version="[0.6,1)",
+              org.apache.felix.gogo.commands;version="[0.6,1)",
+              org.apache.cxf*;version="[2.5,3)",
               org.apache.karaf.shell.console,
               *
                         </Import-Package>

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1182544&r1=1182543&r2=1182544&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Wed Oct 12 19:28:30 2011
@@ -27,11 +27,11 @@
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>

         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>

         <bundle>mvn:commons-pool/commons-pool/1.5.4</bundle>
-        <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_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:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+        <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
+        <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
+        <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/5.4.2</bundle> 
         <bundle>mvn:org.apache.activemq/kahadb/5.4.2</bundle> 



Mime
View raw message