From 2b50b3ff1b4fb145d6dd782def3948c57e6ed4d3 Mon Sep 17 00:00:00 2001
From: artnaseef <artnaseef@apache.org>
Date: Sat, 23 Jul 2022 12:34:15 -0700
Subject: [PATCH] [AMQ-8971] activemq-client karaf feature supporting both JMS
 1.1 and JMS 2.0

---
 activemq-karaf/src/main/resources/features-core.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 108d279d14..ff57b4d738 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -24,9 +24,9 @@
     <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
         <feature version="[5,6)">spring</feature>
         <feature>aries-blueprint</feature>
+        <feature>activemq-combined-jms-spec</feature>
         <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-jms_2.0_spec/1.0-alpha-2</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.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>
@@ -63,4 +63,12 @@
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
     </feature>
+
+    <!-- JMS1.1 and JMS2.0 support via the same Geronimo JMS 2 bundle  -->
+    <!-- Ideal since all JMS code shares the same class definitions    -->
+    <!-- Fortunately, JMS2.0 is fully backward compatible with JMS 1.1 -->
+    <feature name="activemq-combined-jms-spec">
+        <feature prerequisite="true">wrap</feature>
+        <bundle dependency="true">wrap:mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2$overwrite=merge&amp;Export-Package=javax.jms;version=1.1,javax.jms;version=2.0</bundle>
+    </feature>
 </features>