This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 9c422ab34 AMQ-9369: Fix OSGi headers and Karaf features
new 5e9689242 Merge pull request #1104 from jbonofre/AMQ-9369
9c422ab34 is described below
commit 9c422ab34d188698d9f532080e162e4b17d60da0
Author: JB Onofré <[email protected]>
AuthorDate: Tue Oct 31 16:20:49 2023 +0100
AMQ-9369: Fix OSGi headers and Karaf features
---
activemq-karaf/src/main/resources/features-core.xml | 16 +++++++++++++---
activemq-osgi/pom.xml | 5 ++++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/activemq-karaf/src/main/resources/features-core.xml
b/activemq-karaf/src/main/resources/features-core.xml
index f685fca91..3f6bf85c8 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -22,13 +22,23 @@
<!-- Bundles needed if only client will be deployed in the container -->
<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>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-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>
<!-- uber osgi bundle means client is not that lean, todo: introduce
client osgi bundle -->
<bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 14f8ceb66..79ddc4b45 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -169,6 +169,7 @@
javax.jmdns*;resolution:=optional,
javax.resource*;resolution:=optional,
javax.servlet*;resolution:=optional,
+ jakarta.servlet*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional,
org.apache.camel*;version="${camel-version-range}";resolution:=optional,
org.apache.camel.spring.handler;version="${camel-version-range}";resolution:=optional,
@@ -200,7 +201,9 @@
org.apache.commons.pool*;resolution:=optional,
org.apache.commons.net*;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,
groovy.*;resolution:=optional,
org.codehaus.groovy*;resolution:=optional,
