Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #365 from jgallimore/master-AMQ-7149 

AMQ-7149 Remove dependency activemq-http and activemq-stomp
This commit is contained in:
Jean-Baptiste Onofré 2021-03-24 11:36:04 +01:00 committed by GitHub
parent 8d6fa70288 82b3d02fc2
commit db6098c53a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-client/pom.xml
View File

@ -80,6 +80,12 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<scope>provided</scope>
</dependency>
<!-- =============================== --> <!-- =============================== -->
<!-- Testing Dependencies --> <!-- Testing Dependencies -->
<!-- =============================== --> <!-- =============================== -->

2
activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/XStreamSupport.java → activemq-client/src/main/java/org/apache/activemq/util/XStreamSupport.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.transport.stomp; package org.apache.activemq.util;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.security.AnyTypePermission; import com.thoughtworks.xstream.security.AnyTypePermission;

1
activemq-http/pom.xml
View File

@ -46,6 +46,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-stomp</artifactId> <artifactId>activemq-stomp</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>

3
activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
View File

@ -25,13 +25,12 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.MarshallAware; import org.apache.activemq.command.MarshallAware;
import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.apache.activemq.command.TransientInitializer; import org.apache.activemq.command.TransientInitializer;
import org.apache.activemq.transport.stomp.XStreamSupport;
import org.apache.activemq.transport.util.TextWireFormat; import org.apache.activemq.transport.util.TextWireFormat;
import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.util.XStreamSupport;
import org.apache.activemq.wireformat.WireFormat; import org.apache.activemq.wireformat.WireFormat;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;

1
activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
View File

@ -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.Headers;
import org.apache.activemq.transport.stomp.Stomp.Responses; import org.apache.activemq.transport.stomp.Stomp.Responses;
import org.apache.activemq.transport.stomp.Stomp.Transformations; import org.apache.activemq.transport.stomp.Stomp.Transformations;
import org.apache.activemq.util.XStreamSupport;
import org.codehaus.jettison.mapped.Configuration; import org.codehaus.jettison.mapped.Configuration;
import org.fusesource.hawtbuf.UTF8Buffer; import org.fusesource.hawtbuf.UTF8Buffer;

2
activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/util/XStreamBrokerContext.java
View File

@ -23,7 +23,7 @@ import org.apache.activemq.broker.BrokerContext;
import org.apache.activemq.transport.stomp.SamplePojo; import org.apache.activemq.transport.stomp.SamplePojo;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import org.apache.activemq.transport.stomp.XStreamSupport; import org.apache.activemq.util.XStreamSupport;
public class XStreamBrokerContext implements BrokerContext { public class XStreamBrokerContext implements BrokerContext {