activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1458717 - in /activemq/trunk: activemq-karaf/src/main/resources/features.xml activemq-osgi/pom.xml
Date Wed, 20 Mar 2013 10:13:45 GMT
Author: dejanb
Date: Wed Mar 20 10:13:45 2013
New Revision: 1458717

URL: http://svn.apache.org/r1458717
Log:
https://issues.apache.org/jira/browse/AMQ-4341 - fix activemq-osgi headers and dependencies;
make javax.* non-optional

Modified:
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/activemq-osgi/pom.xml

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1458717&r1=1458716&r2=1458717&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Wed Mar 20 10:13:45 2013
@@ -26,8 +26,8 @@
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
-        <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-        <bundle dependency="true">mvn:commons-net/commons-net/${commons-net-version}</bundle>
+        <bundle dependency="false">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+        <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
         <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi
bundle -->
         <feature version="[3,4)">spring</feature>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1458717&r1=1458716&r2=1458717&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Wed Mar 20 10:13:45 2013
@@ -59,10 +59,10 @@
   	  scala*;resolution:=optional,
       org.springframework*;version="[3,4]";resolution:=optional,
       org.apache.xbean.spring*;resolution:=optional,
-      javax.annotation*;resolution:=optional,
-      javax.jms*;resolution:=optional,
-      javax.management*;resolution:=optional,
-      javax.transaction*;resolution:=optional,
+      javax.annotation*,
+      javax.jms*,
+      javax.management*,
+      javax.transaction*,
       org.apache.commons.pool*;resolution:=optional,
       org.apache.commons.net*;resolution:=optional,
 	  *



Mime
View raw message