From 82b3d02fc2dd323299c53098c594fb4be5fbf1ea Mon Sep 17 00:00:00 2001
From: Jonathan Gallimore <jon@jrg.me.uk>
Date: Fri, 22 Feb 2019 16:23:58 +0000
Subject: [PATCH] Remove dependency activemq-http and activemq-stomp

---
 activemq-client/pom.xml                                     | 6 ++++++
 .../main/java/org/apache/activemq/util}/XStreamSupport.java | 2 +-
 activemq-http/pom.xml                                       | 1 +
 .../activemq/transport/xstream/XStreamWireFormat.java       | 3 +--
 .../apache/activemq/transport/stomp/JmsFrameTranslator.java | 1 +
 .../activemq/transport/stomp/util/XStreamBrokerContext.java | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)
 rename {activemq-stomp/src/main/java/org/apache/activemq/transport/stomp => activemq-client/src/main/java/org/apache/activemq/util}/XStreamSupport.java (97%)

diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 0a6f8e1949..9989cbb16e 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -71,6 +71,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- =============================== -->
     <!-- Testing Dependencies -->
     <!-- =============================== -->
diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
similarity index 97%
rename from activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java
rename to activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
index abcca72a75..0fe4cfe90f 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.transport.stomp;
+package org.apache.activemq.util;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.security.AnyTypePermission;
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 345df41dd1..81eafdfe0c 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -46,6 +46,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-stomp</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
index 8ddac9dbb2..a7325bcf70 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
@@ -25,13 +25,12 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
-import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.MarshallAware;
 import org.apache.activemq.command.MessageDispatch;
 import org.apache.activemq.command.TransientInitializer;
-import org.apache.activemq.transport.stomp.XStreamSupport;
 import org.apache.activemq.transport.util.TextWireFormat;
 import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.XStreamSupport;
 import org.apache.activemq.wireformat.WireFormat;
 
 import com.thoughtworks.xstream.XStream;
diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
index 35041822f2..8dce3bfa39 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
@@ -39,6 +39,7 @@ import org.apache.activemq.command.DataStructure;
 import org.apache.activemq.transport.stomp.Stomp.Headers;
 import org.apache.activemq.transport.stomp.Stomp.Responses;
 import org.apache.activemq.transport.stomp.Stomp.Transformations;
+import org.apache.activemq.util.XStreamSupport;
 import org.codehaus.jettison.mapped.Configuration;
 import org.fusesource.hawtbuf.UTF8Buffer;
 
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java
index 56482253ed..8b82305fe3 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java
@@ -23,7 +23,7 @@ import org.apache.activemq.broker.BrokerContext;
 import org.apache.activemq.transport.stomp.SamplePojo;
 
 import com.thoughtworks.xstream.XStream;
-import org.apache.activemq.transport.stomp.XStreamSupport;
+import org.apache.activemq.util.XStreamSupport;
 
 public class XStreamBrokerContext implements BrokerContext {