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

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1458717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-03-20 10:13:45 +00:00
parent 6cdf756e91
commit e80dc81741
2 changed files with 6 additions and 6 deletions

View File

@ -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>

View File

@ -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,
*