Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1104 from jbonofre/AMQ-9369 

AMQ-9369: Fix OSGi headers and Karaf features
This commit is contained in:
JB Onofré 2023-11-01 14:39:45 +01:00 committed by GitHub
parent 7eeaba4608 9c422ab34d
commit 5e96892424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-karaf/src/main/resources/features-core.xml
View File

@ -22,13 +22,23 @@
<!-- Bundles needed if only client will be deployed in the container --> <!-- Bundles needed if only client will be deployed in the container -->
<feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}"> <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
<feature version="[5,6)">spring</feature> <feature version="[5,7)">spring</feature>
<feature>aries-blueprint</feature> <feature>aries-blueprint</feature>
<feature>activemq-combined-jms-spec</feature> <feature>activemq-combined-jms-spec</feature>
<bundle>mvn:jakarta.activation/jakarta.activation-api/2.1.2</bundle>
<bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0</bundle>
<bundle>mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
<bundle>mvn:jakarta.activation/jakarta.activation-api/2.1.2</bundle>
<bundle>mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
<bundle>mvn:jakarta.enterprise/jakarta.enterprise.lang-model/4.0.1</bundle>
<bundle>mvn:jakarta.el/jakarta.el-api/5.0.1</bundle>
<bundle>mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
<bundle>mvn:jakarta.interceptor/jakarta.interceptor-api/2.1.0</bundle>
<bundle>mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/4.0.1</bundle>
<bundle>mvn:jakarta.transaction/jakarta.transaction-api/2.0.1</bundle>
<bundle>mvn:jakarta.resource/jakarta.resource-api/2.1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.0</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.0</bundle>
<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-jta_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${jaxb-bundle-version}</bundle>
<bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle> <bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
<!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle --> <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
<bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle> <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>

5
activemq-osgi/pom.xml
View File

@ -164,6 +164,7 @@
javax.jmdns*;resolution:=optional, javax.jmdns*;resolution:=optional,
javax.resource*;resolution:=optional, javax.resource*;resolution:=optional,
javax.servlet*;resolution:=optional, javax.servlet*;resolution:=optional,
jakarta.servlet*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional, com.thoughtworks.xstream*;resolution:=optional,
org.apache.camel*;version="${camel-version-range}";resolution:=optional, org.apache.camel*;version="${camel-version-range}";resolution:=optional,
org.apache.camel.spring.handler;version="${camel-version-range}";resolution:=optional, org.apache.camel.spring.handler;version="${camel-version-range}";resolution:=optional,
@ -195,7 +196,9 @@
org.apache.commons.pool*;resolution:=optional, org.apache.commons.pool*;resolution:=optional,
org.apache.commons.net*;resolution:=optional, org.apache.commons.net*;resolution:=optional,
com.sun*;resolution:=optional, com.sun*;resolution:=optional,
org.jvnet.jaxb2_commons*;resolution:=optional, org.jvnet.jaxb.lang;resolution:=optional,
org.jvnet.jaxb.locator;resolution:=optional,
org.jvnet.jaxb.locator.util;resolution:=optional,
org.xerial.snappy*;resolution:=optional, org.xerial.snappy*;resolution:=optional,
groovy.*;resolution:=optional, groovy.*;resolution:=optional,
org.codehaus.groovy*;resolution:=optional, org.codehaus.groovy*;resolution:=optional,