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:37:36 UTC
[activemq] branch activemq-5.15.x updated: 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 0a06588 Remove dependency activemq-http and activemq-stomp
0a06588 is described below
commit 0a06588e014206b9a347812bee94003dd0ec4495
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Feb 22 16:23:58 2019 +0000
Remove dependency activemq-http and activemq-stomp
(cherry picked from commit 82b3d02fc2dd323299c53098c594fb4be5fbf1ea)
---
activemq-client/pom.xml | 6 ++++++
.../src/main/java/org/apache/activemq/util}/XStreamSupport.java | 2 +-
activemq-http/pom.xml | 1 +
.../org/apache/activemq/transport/xstream/XStreamWireFormat.java | 3 +--
.../org/apache/activemq/transport/stomp/JmsFrameTranslator.java | 1 +
.../apache/activemq/transport/stomp/util/XStreamBrokerContext.java | 2 +-
6 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index daeaab9..895c894 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -80,6 +80,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 abcca72..0fe4cfe 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 e3851ae..9f838cb 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 8ddac9d..a7325bc 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 105ba3e..495d9e6 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 5648225..8b82305 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 {