[cxf] branch master updated: Update to activemq 5.16.0 (#685)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Update to activemq 5.16.0 (#685)

buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new c2452b2  Update to activemq 5.16.0 (#685)
c2452b2 is described below

commit c2452b233339a6c3e35644de7e3765350bacdab1
Author: Alexey Markevich <[hidden email]>
AuthorDate: Fri Jul 24 15:20:17 2020 +0300

    Update to activemq 5.16.0 (#685)
   
    * Update to activemq 5.16.0
   
    * add TODO comment for spring-legacy
---
 osgi/itests/pom.xml                                        | 14 ++++++++------
 .../org/apache/cxf/osgi/itests/soap/JmsServiceTest.java    |  5 ++++-
 parent/pom.xml                                             |  2 +-
 .../org/apache/cxf/systest/jms/tx/JMSTransactionTest.java  |  3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index e82dd82..bd57b61 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -102,17 +102,19 @@
                </exclusion>
             </exclusions>
         </dependency>
+        <!-- TODO: remove it when 5.16.1 is released, https://issues.apache.org/jira/browse/AMQ-8009 -->
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>spring-legacy</artifactId>
+            <version>${cxf.karaf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
             <version>${cxf.karaf.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index e32eedd..a1d38f4 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -78,8 +78,11 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
         return OptionUtils.combine(
             cxfBaseConfig(),
             features(cxfUrl, "cxf-jaxws", "cxf-transports-jms"),
+            // TODO: remove it when 5.16.1 is released, https://issues.apache.org/jira/browse/AMQ-8009
+            features(maven().groupId("org.apache.karaf.features").artifactId("spring-legacy").versionAsInProject()
+                .type("xml").classifier("features")),
             features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
-                    .type("xml").classifier("features-core"),
+                .type("xml").classifier("features-core"),
                 "cxf-jackson", "activemq-client"),
             provision(serviceBundle())
         );
diff --git a/parent/pom.xml b/parent/pom.xml
index 242fb69..13d2e73 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -77,7 +77,7 @@
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
         <cxf.abdera.version>1.1.3</cxf.abdera.version>
-        <cxf.activemq.version>5.15.13</cxf.activemq.version>
+        <cxf.activemq.version>5.16.0</cxf.activemq.version>
         <cxf.ahc.version>2.12.1</cxf.ahc.version>
         <cxf.apacheds.version>2.0.0.AM26</cxf.apacheds.version>
         <cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionTest.java
index d27a56d..1d9c6bd 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionTest.java
@@ -54,7 +54,8 @@ public class JMSTransactionTest extends AbstractVmJMSTest {
     private static TransactionManager transactionManager;
 
     public static void startBusAndJMS(Class<?> testClass) {
-        String brokerURI = "vm://" + testClass.getName() + "?broker.persistent=false&broker.useJmx=false";
+        final String brokerURI =
+            "vm://" + testClass.getName() + "?broker.persistent=false&broker.useJmx=false&jms.xaAckMode=1";
         startBusAndJMS(brokerURI);
         startBroker(brokerURI);
     }