Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AMQ-7149 Remove dependency activemq-http and activemq-stomp #365

Merged
merged 1 commit into from Mar 24, 2021
Merged

AMQ-7149 Remove dependency activemq-http and activemq-stomp #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions activemq-client/pom.xml
View file
Open in desktop
Expand Up @@ -71,6 +71,12 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<scope>provided</scope>
</dependency>

<!-- =============================== -->
<!-- Testing Dependencies -->
<!-- =============================== -->
Expand Down
2 changes: 1 addition & 1 deletion ...ivemq/transport/stomp/XStreamSupport.java → .../apache/activemq/util/XStreamSupport.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions activemq-http/pom.xml
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-stomp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
3 changes: 1 addition & 2 deletions activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
View file
Open in desktop
Expand Up @@ -25,13 +25,12 @@
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;
Expand Down
1 change: 1 addition & 0 deletions activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion ...mq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
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 {

Expand Down