[activemq-artemis] branch main updated: ARTEMIS-3814: update activemq deps to 5.17.1

[robbie]

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

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 8786bc9e5e ARTEMIS-3814: update activemq deps to 5.17.1
8786bc9e5e is described below

commit 8786bc9e5eb023167990020b8378dcabcf8fc49c
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Wed May 4 13:25:17 2022 +0100

    ARTEMIS-3814: update activemq deps to 5.17.1
---
 artemis-protocols/artemis-openwire-protocol/pom.xml            |  1 +
 pom.xml                                                        |  2 +-
 .../apache/activemq/broker/region/policy/DestinationProxy.java | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml 
b/artemis-protocols/artemis-openwire-protocol/pom.xml
index 5ae62d8d8a..3f254a98bf 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -127,6 +127,7 @@
                      !org.apache.commons.net.ftp,
                      !javax.jmdns,
                      javax.jms;version="[2,3)",
+                     com.thoughtworks.xstream.*;resolution:="optional",
                      *
                   </Import-Package>
                </instructions>
diff --git a/pom.xml b/pom.xml
index 3111857aac..3093d7b536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
       <pax.exam.version>4.13.4</pax.exam.version>
       <commons.config.version>2.7</commons.config.version>
       <commons.lang.version>3.12.0</commons.lang.version>
-      <activemq5-version>5.16.0</activemq5-version>
+      <activemq5-version>5.17.1</activemq5-version>
       <apache.derby.version>10.11.1.1</apache.derby.version>
       <commons.beanutils.version>1.9.4</commons.beanutils.version>
       <commons.dbcp2.version>2.7.0</commons.dbcp2.version>
diff --git 
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java
 
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java
index ea1b0509b3..e0c50a54d3 100644
--- 
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java
+++ 
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java
@@ -657,6 +657,16 @@ public class DestinationProxy implements Destination {
 
    }
 
+   @Override
+   public boolean isSendDuplicateFromStoreToDLQ() {
+      return false;
+   }
+
+   @Override
+   public void setSendDuplicateFromStoreToDLQ(boolean arg) {
+      throw new UnsupportedOperationException("Not implemented yet");
+   }
+
    @Override
    public void start() throws Exception {
       throw new UnsupportedOperationException("Not implemented yet");