You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/03/24 10:38:38 UTC
[activemq] branch activemq-5.15.x updated: Revert "Remove
dependency activemq-http and activemq-stomp"
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new ef5334f Revert "Remove dependency activemq-http and activemq-stomp"
ef5334f is described below
commit ef5334f01ff27a243263f8c864543d0f3b54189a
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Mar 24 11:38:31 2021 +0100
Revert "Remove dependency activemq-http and activemq-stomp"
This reverts commit 0a06588e014206b9a347812bee94003dd0ec4495.
---
activemq-client/pom.xml | 6 ------
activemq-http/pom.xml | 1 -
.../org/apache/activemq/transport/xstream/XStreamWireFormat.java | 3 ++-
.../org/apache/activemq/transport/stomp/JmsFrameTranslator.java | 1 -
.../java/org/apache/activemq/transport/stomp}/XStreamSupport.java | 2 +-
.../apache/activemq/transport/stomp/util/XStreamBrokerContext.java | 2 +-
6 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 895c894..daeaab9 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -80,12 +80,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- =============================== -->
<!-- Testing Dependencies -->
<!-- =============================== -->
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 9f838cb..e3851ae 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -46,7 +46,6 @@
<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 a7325bc..8ddac9d 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,12 +25,13 @@ 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 495d9e6..105ba3e 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,7 +39,6 @@ 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-client/src/main/java/org/apache/activemq/util/XStreamSupport.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java
similarity index 97%
rename from activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
rename to activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java
index 0fe4cfe..abcca72 100644
--- a/activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.util;
+package org.apache.activemq.transport.stomp;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.security.AnyTypePermission;
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 8b82305..5648225 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.util.XStreamSupport;
+import org.apache.activemq.transport.stomp.XStreamSupport;
public class XStreamBrokerContext implements BrokerContext {