diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml index c4173037d3..c6caa03e68 100644 --- a/activemq-amqp/pom.xml +++ b/activemq-amqp/pom.xml @@ -97,6 +97,11 @@ activemq-spring test + + org.apache.activemq + activemq-stomp + test + org.apache.activemq activemq-http @@ -109,7 +114,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server test diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeOutboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeOutboundTransformer.java index 37053a8e63..6158654b0a 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeOutboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeOutboundTransformer.java @@ -19,8 +19,8 @@ package org.apache.activemq.transport.amqp.message; import static org.apache.activemq.transport.amqp.message.AmqpMessageSupport.JMS_AMQP_MESSAGE_FORMAT; import static org.apache.activemq.transport.amqp.message.AmqpMessageSupport.getBinaryFromMessageBody; -import javax.jms.JMSException; -import javax.jms.MessageFormatException; +import jakarta.jms.JMSException; +import jakarta.jms.MessageFormatException; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java index b4d3ad66e8..5526554897 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java @@ -19,7 +19,7 @@ package org.apache.activemq.transport.amqp.message; import static org.apache.activemq.transport.amqp.message.AmqpMessageSupport.JMS_AMQP_MESSAGE_FORMAT; import static org.apache.activemq.transport.amqp.message.AmqpMessageSupport.JMS_AMQP_NATIVE; -import javax.jms.Message; +import jakarta.jms.Message; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpMessageSupport.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpMessageSupport.java index 86151a1aa8..eedb464f72 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpMessageSupport.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpMessageSupport.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.zip.InflaterInputStream; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMapMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AutoOutboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AutoOutboundTransformer.java index edfdecfc1f..8089bf944e 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AutoOutboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AutoOutboundTransformer.java @@ -18,7 +18,7 @@ package org.apache.activemq.transport.amqp.message; import static org.apache.activemq.transport.amqp.message.AmqpMessageSupport.JMS_AMQP_NATIVE; -import javax.jms.BytesMessage; +import jakarta.jms.BytesMessage; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java index 9b74da1c00..708c1c5b4e 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java @@ -29,8 +29,8 @@ import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Set; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import org.apache.activemq.ScheduledMessage; import org.apache.activemq.command.ActiveMQDestination; @@ -209,7 +209,7 @@ public abstract class InboundTransformer { ttl = header.getTtl().longValue(); } - if (ttl != javax.jms.Message.DEFAULT_TIME_TO_LIVE) { + if (ttl != jakarta.jms.Message.DEFAULT_TIME_TO_LIVE) { jms.setExpiration(System.currentTimeMillis() + ttl); } } diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformer.java index e121cecc28..216b60662a 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformer.java @@ -41,8 +41,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.jms.JMSException; -import javax.jms.MessageNotWriteableException; +import jakarta.jms.JMSException; +import jakarta.jms.MessageNotWriteableException; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMapMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java index dbae00f992..8c1fa8c0a7 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java @@ -55,10 +55,10 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageEOFException; -import javax.jms.TextMessage; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageEOFException; +import jakarta.jms.TextMessage; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java index 2dadb30c84..4e5a298a9a 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java @@ -42,7 +42,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.InvalidClientIDException; +import jakarta.jms.InvalidClientIDException; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.AbstractRegion; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpReceiver.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpReceiver.java index a7ea354d56..937c3a19cd 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpReceiver.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpReceiver.java @@ -20,8 +20,8 @@ import static org.apache.activemq.transport.amqp.AmqpSupport.toLong; import java.io.IOException; -import javax.jms.Destination; -import javax.jms.ResourceAllocationException; +import jakarta.jms.Destination; +import jakarta.jms.ResourceAllocationException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpSession.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpSession.java index 2da243ab01..d0498bcdc9 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpSession.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpSession.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.jms.InvalidSelectorException; +import jakarta.jms.InvalidSelectorException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQTempDestination; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4563Test.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4563Test.java index 6520caa3c7..8fc3a810da 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4563Test.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4563Test.java @@ -20,17 +20,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.jmx.QueueViewMBean; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAdvisoryTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAdvisoryTest.java index 5b32c54d99..6e6623a601 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAdvisoryTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAdvisoryTest.java @@ -20,13 +20,13 @@ package org.apache.activemq.transport.amqp; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.Test; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Queue; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Queue; +import jakarta.jms.Session; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndMqttTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndMqttTest.java index ac7a199922..6695982c64 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndMqttTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndMqttTest.java @@ -22,13 +22,13 @@ import static org.junit.Assert.assertTrue; import java.io.UnsupportedEncodingException; import java.util.Arrays; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndStompInteropTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndStompInteropTest.java index ce98db361c..34a1070825 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndStompInteropTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpAndStompInteropTest.java @@ -19,20 +19,22 @@ package org.apache.activemq.transport.amqp; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.apache.qpid.jms.JmsConnectionFactory; import org.fusesource.stomp.jms.StompJmsConnectionFactory; + + import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -42,7 +44,6 @@ import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Ignore public class AmqpAndStompInteropTest { private static final Logger LOG = LoggerFactory.getLogger(AmqpAndStompInteropTest.class); @@ -73,7 +74,7 @@ public class AmqpAndStompInteropTest { protected BrokerService createBroker() throws Exception { BrokerService broker = new BrokerService(); broker.setPersistent(false); - broker.setUseJmx(false); + broker.setUseJmx(true); broker.setAdvisorySupport(false); broker.setSchedulerSupport(false); @@ -83,12 +84,14 @@ public class AmqpAndStompInteropTest { return broker; } + @Ignore @Test(timeout = 30000) public void testSendFromAMQPToSTOMP() throws Exception { sendMessageToQueueUsingAmqp(); readMessageFromQueueUsingStomp(); } + @Ignore @Test(timeout = 30000) public void testSendFromSTOMPToAMQP() throws Exception { sendMessageToQueueUsingStomp(); @@ -135,6 +138,7 @@ public class AmqpAndStompInteropTest { try { TextMessage message = session.createTextMessage("test-message-stomp-source"); + message.setIntProperty("content-length", message.getText().length()); producer.send(message); LOG.info("Send STOMP message with Message ID -> {}", message.getJMSMessageID()); @@ -223,4 +227,5 @@ public class AmqpAndStompInteropTest { connection.start(); return connection; } + } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java index b25e802fce..7aab533383 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java @@ -26,12 +26,12 @@ import java.util.List; import java.util.Set; import java.util.Vector; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.net.ServerSocketFactory; @@ -98,6 +98,11 @@ public class AmqpTestSupport { protected URI openwireURI; protected int openwirePort; + static { + System.setProperty("jetty.ssl.sniRequired", "false"); + System.setProperty("jetty.ssl.sniHostCheck", "false"); + } + @Before public void setUp() throws Exception { LOG.info("========== start " + getTestName() + " =========="); @@ -352,7 +357,7 @@ public class AmqpTestSupport { public Connection createJMSConnection() throws JMSException { if (!isUseOpenWireConnector()) { - throw new javax.jms.IllegalStateException("OpenWire TransportConnector was not configured."); + throw new jakarta.jms.IllegalStateException("OpenWire TransportConnector was not configured."); } ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(openwireURI); diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java index deb0c0dd22..929e4bac53 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java @@ -25,15 +25,15 @@ import java.net.URI; import java.util.LinkedHashMap; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java index 0ef8b7716d..975ab011bc 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java @@ -18,7 +18,7 @@ package org.apache.activemq.transport.amqp; import java.io.File; -import javax.jms.Connection; +import jakarta.jms.Connection; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientContext.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientContext.java index 1789792cb4..df6a9ce232 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientContext.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientContext.java @@ -18,14 +18,14 @@ package org.apache.activemq.transport.amqp; import java.net.URI; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.QueueConnection; +import jakarta.jms.QueueConnectionFactory; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory; import org.slf4j.Logger; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientProducerFlowSendFailIfNoSpace.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientProducerFlowSendFailIfNoSpace.java index 72ea82a74b..e8ff12e13c 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientProducerFlowSendFailIfNoSpace.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientProducerFlowSendFailIfNoSpace.java @@ -21,14 +21,14 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientRequestResponseTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientRequestResponseTest.java index c99c74bee2..358744e551 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientRequestResponseTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientRequestResponseTest.java @@ -23,17 +23,17 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.Vector; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; import org.junit.After; import org.junit.Test; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientSimpleAuthTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientSimpleAuthTest.java index 6b0534c5c4..6ea4b5ea66 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientSimpleAuthTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientSimpleAuthTest.java @@ -23,15 +23,15 @@ import static org.junit.Assert.fail; import java.net.URI; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.JMSSecurityException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.JMSSecurityException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java index c240398bc4..7371944130 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java @@ -31,26 +31,26 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; +import jakarta.jms.Connection; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; import org.apache.activemq.broker.jmx.BrokerView; import org.apache.activemq.broker.jmx.BrokerViewMBean; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTestSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTestSupport.java index a5c1ae592f..53b24c1a74 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTestSupport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTestSupport.java @@ -19,8 +19,8 @@ package org.apache.activemq.transport.amqp; import java.net.URI; import java.net.URISyntaxException; -import javax.jms.Connection; -import javax.jms.JMSException; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; import org.junit.After; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTransactionTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTransactionTest.java index f481ba94be..96d865cc6c 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTransactionTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTransactionTest.java @@ -22,17 +22,17 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.broker.jmx.SubscriptionViewMBean; @@ -93,7 +93,7 @@ public class JMSClientTransactionTest extends JMSClientTestSupport { for (int i = 0; i < MSG_COUNT; i++) { TextMessage message = session.createTextMessage(); message.setText("test" + i); - messageProducer.send(message, DeliveryMode.PERSISTENT, javax.jms.Message.DEFAULT_PRIORITY, javax.jms.Message.DEFAULT_TIME_TO_LIVE); + messageProducer.send(message, DeliveryMode.PERSISTENT, jakarta.jms.Message.DEFAULT_PRIORITY, jakarta.jms.Message.DEFAULT_TIME_TO_LIVE); } session.close(); @@ -130,7 +130,7 @@ public class JMSClientTransactionTest extends JMSClientTestSupport { for (int i = 0; i < MSG_COUNT; i++) { TextMessage message = session.createTextMessage(); message.setText("test" + i); - messageProducer.send(message, DeliveryMode.PERSISTENT, javax.jms.Message.DEFAULT_PRIORITY, javax.jms.Message.DEFAULT_TIME_TO_LIVE); + messageProducer.send(message, DeliveryMode.PERSISTENT, jakarta.jms.Message.DEFAULT_PRIORITY, jakarta.jms.Message.DEFAULT_TIME_TO_LIVE); } session.close(); diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSConcurrentConsumersTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSConcurrentConsumersTest.java index 62c70cd711..963577b59a 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSConcurrentConsumersTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSConcurrentConsumersTest.java @@ -25,14 +25,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.junit.Before; import org.junit.Test; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSDurableSubNoLocalChangedTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSDurableSubNoLocalChangedTest.java index a3989341de..31aef80cfe 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSDurableSubNoLocalChangedTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSDurableSubNoLocalChangedTest.java @@ -23,14 +23,14 @@ import static org.junit.Assert.assertTrue; import java.net.URI; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Session; +import jakarta.jms.Topic; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicPublisher; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.util.Wait; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java index a91b685c63..dd10937d0c 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java @@ -31,16 +31,16 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.qpid.proton.amqp.Binary; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java index 7f96afcc23..f514ee2a66 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java @@ -24,15 +24,15 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.transport.amqp.client.AmqpClientTestSupport; import org.junit.Rule; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMaxConnectionsSSLHandshakeFailsTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMaxConnectionsSSLHandshakeFailsTest.java index 55bf26566b..db5c80184e 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMaxConnectionsSSLHandshakeFailsTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMaxConnectionsSSLHandshakeFailsTest.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Arrays; import java.util.Collection; -import javax.jms.Connection; +import jakarta.jms.Connection; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.Test; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMessageGroupsTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMessageGroupsTest.java index 8b1e786016..43fa6c4dc8 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMessageGroupsTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSMessageGroupsTest.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertNotNull; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.BytesMessage; -import javax.jms.DeliveryMode; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; import org.junit.Test; import org.slf4j.Logger; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSParallelConnectTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSParallelConnectTest.java index f02d3a921e..c824818f8e 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSParallelConnectTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSParallelConnectTest.java @@ -22,8 +22,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.jms.Connection; -import javax.jms.JMSException; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; import org.junit.Test; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSQueueBrowserTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSQueueBrowserTest.java index 070bb20529..219d969212 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSQueueBrowserTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSQueueBrowserTest.java @@ -24,13 +24,13 @@ import static org.junit.Assert.assertTrue; import java.util.Enumeration; import java.util.concurrent.TimeUnit; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.junit.ActiveMQTestRunner; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsTransactedMessageOrderTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsTransactedMessageOrderTest.java index 2134759625..9639e691ea 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsTransactedMessageOrderTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsTransactedMessageOrderTest.java @@ -25,14 +25,14 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java index a3efa12825..7ed12eec4f 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java @@ -30,7 +30,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jms.InvalidDestinationException; +import jakarta.jms.InvalidDestinationException; import org.apache.activemq.transport.amqp.client.util.AsyncResult; import org.apache.activemq.transport.amqp.client.util.ClientFuture; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java index 589a328a5d..98fae5e487 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jms.InvalidDestinationException; +import jakarta.jms.InvalidDestinationException; import org.apache.activemq.transport.amqp.client.util.AsyncResult; import org.apache.activemq.transport.amqp.client.util.ClientFuture; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java index ebbe2b0169..ef302e8e5a 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java @@ -618,7 +618,7 @@ public class AmqpSession extends AmqpAbstractResource { */ public void begin() throws Exception { if (txContext.isInTransaction()) { - throw new javax.jms.IllegalStateException("Session already has an active transaction"); + throw new jakarta.jms.IllegalStateException("Session already has an active transaction"); } txContext.begin(); @@ -631,7 +631,7 @@ public class AmqpSession extends AmqpAbstractResource { */ public void commit() throws Exception { if (!txContext.isInTransaction()) { - throw new javax.jms.IllegalStateException( + throw new jakarta.jms.IllegalStateException( "Commit called on Session that does not have an active transaction"); } @@ -645,7 +645,7 @@ public class AmqpSession extends AmqpAbstractResource { */ public void rollback() throws Exception { if (!txContext.isInTransaction()) { - throw new javax.jms.IllegalStateException( + throw new jakarta.jms.IllegalStateException( "Rollback called on Session that does not have an active transaction"); } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSupport.java index 8ffcfbd11f..383d6a95b5 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSupport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSupport.java @@ -19,12 +19,12 @@ package org.apache.activemq.transport.amqp.client; import java.io.IOException; import java.util.Map; -import javax.jms.InvalidClientIDException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.JMSSecurityException; -import javax.jms.ResourceAllocationException; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.InvalidClientIDException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.JMSSecurityException; +import jakarta.jms.ResourceAllocationException; +import jakarta.jms.TransactionRolledBackException; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.messaging.Modified; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java index 73822a8e27..f43113fbb4 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java @@ -24,9 +24,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.IllegalStateException; +import jakarta.jms.JMSException; +import jakarta.jms.TransactionRolledBackException; import org.apache.activemq.transport.amqp.client.util.AsyncResult; import org.apache.activemq.transport.amqp.client.util.IOExceptionSupport; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/sasl/SaslAuthenticator.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/sasl/SaslAuthenticator.java index d225943eab..4d1d46f6f1 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/sasl/SaslAuthenticator.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/sasl/SaslAuthenticator.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.jms.JMSSecurityException; +import jakarta.jms.JMSSecurityException; import javax.security.sasl.SaslException; import org.apache.qpid.proton.engine.Sasl; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpDescribedTypePayloadTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpDescribedTypePayloadTest.java index cede53a763..9632008bba 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpDescribedTypePayloadTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpDescribedTypePayloadTest.java @@ -24,13 +24,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.concurrent.TimeUnit; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.jmx.QueueViewMBean; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpScheduledMessageTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpScheduledMessageTest.java index 14dcf8c6bd..21c0d43c7a 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpScheduledMessageTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpScheduledMessageTest.java @@ -25,11 +25,11 @@ import static org.junit.Assert.fail; import java.util.Date; import java.util.concurrent.TimeUnit; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; import javax.management.ObjectName; import org.apache.activemq.broker.jmx.JobSchedulerViewMBean; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpSendReceiveTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpSendReceiveTest.java index 67e0dc9a4b..9b0a985abc 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpSendReceiveTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpSendReceiveTest.java @@ -33,9 +33,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jms.DeliveryMode; -import javax.jms.Queue; -import javax.jms.Topic; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Queue; +import jakarta.jms.Topic; import org.apache.activemq.broker.jmx.DestinationViewMBean; import org.apache.activemq.broker.jmx.QueueViewMBean; @@ -553,9 +553,9 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { assertEquals(1, queueView.getQueueSize()); - List messages = (List) queueView.browseMessages(); + List messages = (List) queueView.browseMessages(); assertEquals(1, messages.size()); - javax.jms.Message queueMessage = messages.get(0); + jakarta.jms.Message queueMessage = messages.get(0); assertEquals("Queued message should not be persistent", DeliveryMode.NON_PERSISTENT, queueMessage.getJMSDeliveryMode()); receiver1.flow(1); diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/OpenWireToAmqpConcurrentStoreAndDispatchTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/OpenWireToAmqpConcurrentStoreAndDispatchTest.java index f8bf560921..09727c902a 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/OpenWireToAmqpConcurrentStoreAndDispatchTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/OpenWireToAmqpConcurrentStoreAndDispatchTest.java @@ -32,11 +32,11 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; import java.util.Arrays; import java.util.Collection; import java.util.Random; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformerTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformerTest.java index 6ac080a899..b868fef265 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformerTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingInboundTransformerTest.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.jms.Destination; -import javax.jms.MapMessage; -import javax.jms.Queue; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; +import jakarta.jms.Destination; +import jakarta.jms.MapMessage; +import jakarta.jms.Queue; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQMapMessage; @@ -72,7 +72,7 @@ public class JMSMappingInboundTransformerTest { message.setContentType(AmqpMessageSupport.OCTET_STREAM_CONTENT_TYPE); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -91,7 +91,7 @@ public class JMSMappingInboundTransformerTest { Message message = Message.Factory.create(); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -112,7 +112,7 @@ public class JMSMappingInboundTransformerTest { message.setContentType(AmqpMessageSupport.SERIALIZED_JAVA_OBJECT_CONTENT_TYPE); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQObjectMessage.class, jmsMessage.getClass()); @@ -126,7 +126,7 @@ public class JMSMappingInboundTransformerTest { message.setContentType("text/plain"); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQTextMessage.class, jmsMessage.getClass()); @@ -146,7 +146,7 @@ public class JMSMappingInboundTransformerTest { message.setContentType("unknown-content-type"); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQMessage.class, jmsMessage.getClass()); @@ -171,7 +171,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -193,7 +193,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -217,7 +217,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -240,7 +240,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQObjectMessage.class, jmsMessage.getClass()); @@ -343,7 +343,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); if (StandardCharsets.UTF_8.equals(expectedCharset)) { @@ -369,7 +369,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQTextMessage.class, jmsMessage.getClass()); @@ -389,7 +389,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQTextMessage.class, jmsMessage.getClass()); @@ -411,7 +411,7 @@ public class JMSMappingInboundTransformerTest { message.setContentType(AmqpMessageSupport.SERIALIZED_JAVA_OBJECT_CONTENT_TYPE); EncodedMessage em = encodeMessage(message); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQObjectMessage.class, jmsMessage.getClass()); @@ -432,7 +432,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQMapMessage.class, jmsMessage.getClass()); @@ -460,7 +460,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQMapMessage.class, jmsMessage.getClass()); @@ -486,7 +486,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQStreamMessage.class, jmsMessage.getClass()); @@ -507,7 +507,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQStreamMessage.class, jmsMessage.getClass()); @@ -528,7 +528,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -550,7 +550,7 @@ public class JMSMappingInboundTransformerTest { JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertNotNull("Message should not be null", jmsMessage); assertEquals("Unexpected message class type", ActiveMQBytesMessage.class, jmsMessage.getClass()); @@ -565,7 +565,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(message); JMSMappingInboundTransformer transformer = new JMSMappingInboundTransformer(); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertTrue("Expected TextMessage", jmsMessage instanceof TextMessage); assertEquals("Unexpected message class type", ActiveMQTextMessage.class, jmsMessage.getClass()); @@ -619,7 +619,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(amqp); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertTrue("Expected TextMessage", jmsMessage instanceof TextMessage); } @@ -666,7 +666,7 @@ public class JMSMappingInboundTransformerTest { EncodedMessage em = encodeMessage(amqp); - javax.jms.Message jmsMessage = transformer.transform(em); + jakarta.jms.Message jmsMessage = transformer.transform(em); assertTrue("Expected TextMessage", jmsMessage instanceof TextMessage); } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java index 1d3adea1bf..ea43554482 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQBytesMessage; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/JmsSendReceiveStressTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/JmsSendReceiveStressTest.java index 69536ec000..60a0cf24dd 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/JmsSendReceiveStressTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/JmsSendReceiveStressTest.java @@ -25,12 +25,12 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.BytesMessage; -import javax.jms.DeliveryMode; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.DeliveryMode; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Queue; +import jakarta.jms.Session; import org.apache.activemq.ActiveMQSession; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/QueueBrowserStressTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/QueueBrowserStressTest.java index f2968ec6fb..ed44001677 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/QueueBrowserStressTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/profile/QueueBrowserStressTest.java @@ -19,11 +19,11 @@ package org.apache.activemq.transport.amqp.profile; import java.util.Enumeration; import java.util.concurrent.TimeUnit; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; import org.apache.activemq.transport.amqp.JMSClientTestSupport; import org.junit.Ignore;