From 7579f48e8a6f26f56b5027fa1813957e7ad67ac8 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <matt@hyte.io>
Date: Mon, 23 Aug 2021 09:27:57 -0500
Subject: [PATCH] [AMQ-8358] Update xstream to 1.4.18  - stomp tests pass now 
 - xstream added allowed classes / packages feature

---
 .../java/org/apache/activemq/transport/stomp/StompTest.java     | 1 +
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index 5e96385eec..0404762a7c 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -138,6 +138,7 @@ public class StompTest extends StompTestSupport {
         connection.start();
         xstream = new XStream();
         xstream.processAnnotations(SamplePojo.class);
+        xstream.allowTypes(new Class[] { SamplePojo.class });
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 61027a4ff6..6abcb95480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
     <velocity-version>2.3</velocity-version>
     <xalan-version>2.7.2</xalan-version>
     <xpp3-version>1.1.4c</xpp3-version>
-    <xstream-version>1.4.17</xstream-version>
+    <xstream-version>1.4.18</xstream-version>
     <xbean-version>4.20</xbean-version>
     <xerces-version>2.12.0</xerces-version>
     <jaxb-basics-version>0.6.4</jaxb-basics-version>