TPRUN-8496 Add combined JMS 1.1 and 2.0 support.

Talend · Aug 29, 2024 · bcfd2e9 · bcfd2e9
1 parent dde03eb
commit bcfd2e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
@@ -411,9 +411,8 @@
     <feature name="cxf-transports-jms" version="${upstream.version}">
         <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
-        <!-- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> -->
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${cxf.geronimo.jms2.tesb.version}</bundle>
+        <bundle start-level="10" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
+        <bundle start-level="10" dependency="true">wrap:mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2$overwrite=merge&amp;Bundle-Version=${cxf.geronimo.jms2.bundle.override.tesb.version}&amp;Export-Package=javax.jms;version=1.1,javax.jms;version=2.0</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-jms/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-udp" version="${upstream.version}">
@@ -556,9 +555,8 @@
         <feature version="${cxf.tesb.version-range}">cxf-wsn-api</feature>
         <feature version="${cxf.tesb.version-range}">cxf-http-provider</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
-        <!-- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> -->
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${cxf.geronimo.jms2.tesb.version}</bundle>
+        <bundle start-level="10" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
+        <bundle start-level="10" dependency="true">wrap:mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2$overwrite=merge&amp;Bundle-Version=${cxf.geronimo.jms2.bundle.override.tesb.version}&amp;Export-Package=javax.jms;version=1.1,javax.jms;version=2.0</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${cxf.geronimo.j2ee.management.version}</bundle>
         <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/${cxf.activemq-osgi.tesb.version}</bundle>
         <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${cxf-services-wsn-core.tesb.version}</bundle>

diff --git a/pom.xml b/pom.xml
@@ -51,6 +51,7 @@
         <!-- <cxf.jakarta.mail.tesb.version>1.6.7</cxf.jakarta.mail.tesb.version> -->
         <cxf.activemq-osgi.tesb.version>5.17.6.20231031</cxf.activemq-osgi.tesb.version>
         <cxf.geronimo.jms2.tesb.version>1.0-alpha-2</cxf.geronimo.jms2.tesb.version>
+        <cxf.geronimo.jms2.bundle.override.tesb.version>1.0.0.tp20240209</cxf.geronimo.jms2.bundle.override.tesb.version>
         <!-- <cxf.aries.fly.tesb.version>1.2</cxf.aries.fly.tesb.version> -->
         <!-- <cxf.netty.tesb.version>4.1.111.Final</cxf.netty.tesb.version> -->
         <!-- <cxf.commons-io.tesb.version>2.16.1</cxf.commons-io.tesb.version> -->
@@ -495,6 +496,7 @@
                             <!-- <cxf.jakarta.mail.tesb.version>${cxf.jakarta.mail.tesb.version}</cxf.jakarta.mail.tesb.version> -->
                             <cxf.activemq-osgi.tesb.version>${cxf.activemq-osgi.tesb.version}</cxf.activemq-osgi.tesb.version>
                             <cxf.geronimo.jms2.tesb.version>${cxf.geronimo.jms2.tesb.version}</cxf.geronimo.jms2.tesb.version>
+                            <cxf.geronimo.jms2.bundle.override.tesb.version>${cxf.geronimo.jms2.bundle.override.tesb.version}</cxf.geronimo.jms2.bundle.override.tesb.version>
                             <!-- <cxf.aries.fly.tesb.version>${cxf.aries.fly.tesb.version}</cxf.aries.fly.tesb.version> -->
                             <!-- <cxf.netty.tesb.version>${cxf.netty.tesb.version}</cxf.netty.tesb.version> -->
                             <!-- <cxf.commons-io.tesb.version>${cxf.commons-io.tesb.version}</cxf.commons-io.tesb.version> -->