Merge pull request #996 from mattrpav/AMQ-9239

[AMQ-9239] Jakarta JMS broker

Jenkinsfile

@@ -30,7 +30,7 @@ pipeline {
     tools {
         // ... tell Jenkins what java version, maven version or other tools are required ...
         maven 'maven_3_latest'
-        jdk 'jdk_11_latest'
+        jdk 'jdk_17_latest'
     }
 
     options {
@@ -92,18 +92,6 @@ pipeline {
             }
         }
 
-        stage('Build JDK 11') {
-            tools {
-                jdk "jdk_11_latest"
-            }  
-            steps {
-                echo 'Building JDK 11'
-                sh 'java -version'
-                sh 'mvn -version'
-                sh 'mvn -U -B -e clean install -DskipTests'
-            }
-        }
-
         stage('Verify') {
             steps {
                 echo 'Running apache-rat:check'

activemq-all/pom.xml

@@ -56,8 +56,8 @@
       <artifactId>activemq-jdbc-store</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
+      <groupId>jakarta.annotation</groupId>
-      <artifactId>geronimo-annotation_1.3_spec</artifactId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

activemq-amqp/pom.xml

@@ -97,6 +97,11 @@
       <artifactId>activemq-spring</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-stomp</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-http</artifactId>
@@ -109,7 +114,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 jakarta.jms.JMSException;
-import javax.jms.MessageFormatException;
+import jakarta.jms.MessageFormatException;
 
 import org.apache.activemq.command.ActiveMQBytesMessage;
 import org.apache.activemq.command.ActiveMQMessage;

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;

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;

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;

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 jakarta.jms.JMSException;
-import javax.jms.Message;
+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);
             }
         }

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 jakarta.jms.JMSException;
-import javax.jms.MessageNotWriteableException;
+import jakarta.jms.MessageNotWriteableException;
 
 import org.apache.activemq.command.ActiveMQBytesMessage;
 import org.apache.activemq.command.ActiveMQMapMessage;

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 jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageEOFException;
+import jakarta.jms.MessageEOFException;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQBytesMessage;
 import org.apache.activemq.command.ActiveMQDestination;

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;

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 jakarta.jms.Destination;
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.ResourceAllocationException;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;

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;

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 jakarta.jms.Connection;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.jmx.QueueViewMBean;

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 jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;

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 jakarta.jms.Connection;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+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;
     }
+
 }

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 jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+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);

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;

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;

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 jakarta.jms.Connection;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.QueueConnection;
+import jakarta.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnectionFactory;
-import javax.jms.TopicConnection;
+import jakarta.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
+import jakarta.jms.TopicConnectionFactory;
 
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.slf4j.Logger;

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 jakarta.jms.Connection;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.policy.PolicyEntry;

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 jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
-import javax.jms.Topic;
+import jakarta.jms.Topic;
 
 import org.junit.After;
 import org.junit.Test;

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 jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.JMSSecurityException;
+import jakarta.jms.JMSSecurityException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;

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 jakarta.jms.Connection;
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.MapMessage;
+import jakarta.jms.MapMessage;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.QueueBrowser;
+import jakarta.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TemporaryQueue;
+import jakarta.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
+import jakarta.jms.TemporaryTopic;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
-import javax.jms.Topic;
+import jakarta.jms.Topic;
-import javax.jms.TopicConnection;
+import jakarta.jms.TopicConnection;
-import javax.jms.TopicSession;
+import jakarta.jms.TopicSession;
-import javax.jms.TopicSubscriber;
+import jakarta.jms.TopicSubscriber;
 
 import org.apache.activemq.broker.jmx.BrokerView;
 import org.apache.activemq.broker.jmx.BrokerViewMBean;

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 jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.junit.After;
 

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 jakarta.jms.Connection;
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+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();

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 jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.junit.Before;
 import org.junit.Test;

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 jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Topic;
-import javax.jms.TopicConnection;
+import jakarta.jms.TopicConnection;
-import javax.jms.TopicPublisher;
+import jakarta.jms.TopicPublisher;
-import javax.jms.TopicSession;
+import jakarta.jms.TopicSession;
-import javax.jms.TopicSubscriber;
+import jakarta.jms.TopicSubscriber;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.util.Wait;

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.MapMessage;
+import jakarta.jms.MapMessage;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.ObjectMessage;
+import jakarta.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.qpid.proton.amqp.Binary;

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.transport.amqp.client.AmqpClientTestSupport;
 import org.junit.Rule;

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;

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 jakarta.jms.BytesMessage;
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.junit.Test;
 import org.slf4j.Logger;

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 jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.junit.Test;
 

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 jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.QueueBrowser;
+import jakarta.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.junit.ActiveMQTestRunner;

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 jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.policy.PolicyEntry;

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;

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;

activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java

@@ -618,7 +618,7 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
      */
     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<Session> {
      */
     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<Session> {
      */
     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");
         }
 

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 jakarta.jms.InvalidClientIDException;
-import javax.jms.InvalidDestinationException;
+import jakarta.jms.InvalidDestinationException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.JMSSecurityException;
+import jakarta.jms.JMSSecurityException;
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.ResourceAllocationException;
-import javax.jms.TransactionRolledBackException;
+import jakarta.jms.TransactionRolledBackException;
 
 import org.apache.qpid.proton.amqp.Symbol;
 import org.apache.qpid.proton.amqp.messaging.Modified;

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 jakarta.jms.IllegalStateException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.TransactionRolledBackException;
+import jakarta.jms.TransactionRolledBackException;
 
 import org.apache.activemq.transport.amqp.client.util.AsyncResult;
 import org.apache.activemq.transport.amqp.client.util.IOExceptionSupport;

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;

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.jmx.QueueViewMBean;

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 jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.jmx.JobSchedulerViewMBean;

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 jakarta.jms.DeliveryMode;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Topic;
+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<javax.jms.Message> messages = (List<javax.jms.Message>) queueView.browseMessages();
+        List<jakarta.jms.Message> messages = (List<jakarta.jms.Message>) 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);

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 jakarta.jms.BytesMessage;
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Random;

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 jakarta.jms.Destination;
-import javax.jms.MapMessage;
+import jakarta.jms.MapMessage;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.TemporaryQueue;
+import jakarta.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
+import jakarta.jms.TemporaryTopic;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
-import javax.jms.Topic;
+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);
     }
 

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;

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 jakarta.jms.BytesMessage;
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.broker.BrokerService;

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 jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.QueueBrowser;
+import jakarta.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.apache.activemq.transport.amqp.JMSClientTestSupport;
 import org.junit.Ignore;

activemq-broker/pom.xml

@@ -47,8 +47,8 @@
       <artifactId>activemq-openwire-legacy</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
+      <groupId>jakarta.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
     
     <!-- =============================== -->

activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java

@@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import javax.management.InstanceNotFoundException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.transaction.xa.XAException;
 
 import org.apache.activemq.broker.jmx.ManagedRegionBroker;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java

@@ -26,10 +26,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java

@@ -24,8 +24,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import javax.jms.IllegalStateException;
+import jakarta.jms.IllegalStateException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java

@@ -27,8 +27,8 @@ import org.apache.activemq.command.ActiveMQStreamMessage;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.fusesource.hawtbuf.UTF8Buffer;
 
-import javax.jms.DeliveryMode;
+import jakarta.jms.DeliveryMode;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.openmbean.ArrayType;
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.OpenDataException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.Queue;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java

@@ -19,7 +19,7 @@ package org.apache.activemq.broker.jmx;
 import java.io.IOException;
 import java.util.Set;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.BrokerService;

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
 import javax.management.ObjectName;
 
 /**

activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java

@@ -25,8 +25,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.jms.IllegalStateException;
+import jakarta.jms.IllegalStateException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.DestinationDoesNotExistException;
 import org.apache.activemq.advisory.AdvisorySupport;

activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java

@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.Broker;

activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.ResourceAllocationException;
 
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.Broker;

activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java

@@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.region;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 

activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java

@@ -46,9 +46,9 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.ResourceAllocationException;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerStoppedException;

activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java

@@ -19,7 +19,7 @@ package org.apache.activemq.broker.region;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.policy.PolicyEntry;

activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java

@@ -18,7 +18,7 @@ package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java

@@ -31,8 +31,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.jms.InvalidClientIDException;
+import jakarta.jms.InvalidClientIDException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerService;

activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java

@@ -19,7 +19,7 @@ package org.apache.activemq.broker.region;
 import java.io.IOException;
 import java.util.List;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.region;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;

activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.region;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.policy.PolicyEntry;

activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java

@@ -63,7 +63,7 @@ import org.apache.activemq.util.SubscriptionKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import static org.apache.activemq.transaction.Transaction.IN_USE_STATE;
 
@@ -398,7 +398,7 @@ public class Topic extends BaseDestination implements Task {
                 }
 
                 if (!context.isNetworkConnection() && systemUsage.isSendFailIfNoSpace()) {
-                    throw new javax.jms.ResourceAllocationException("Usage Manager memory limit ("
+                    throw new jakarta.jms.ResourceAllocationException("Usage Manager memory limit ("
                             + memoryUsage.getLimit() + ") reached. Rejecting send for producer (" + message.getProducerId()
                             + ") to prevent flooding " + getActiveMQDestination().getQualifiedName() + "."
                             + " See http://activemq.apache.org/producer-flow-control.html for more info");
@@ -528,7 +528,7 @@ public class Topic extends BaseDestination implements Task {
                         + ") to prevent flooding " + getActiveMQDestination().getQualifiedName() + "."
                         + " See http://activemq.apache.org/producer-flow-control.html for more info";
                 if (!context.isNetworkConnection() && systemUsage.isSendFailIfNoSpace()) {
-                    throw new javax.jms.ResourceAllocationException(logMessage);
+                    throw new jakarta.jms.ResourceAllocationException(logMessage);
                 }
 
                 waitForSpace(context,producerExchange, systemUsage.getStoreUsage(), getStoreUsageHighWaterMark(), logMessage);

activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java

@@ -28,8 +28,8 @@ import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import javax.jms.InvalidDestinationException;
+import jakarta.jms.InvalidDestinationException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java

@@ -32,7 +32,7 @@ import org.apache.activemq.usage.SystemUsage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedList;

activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java

@@ -109,7 +109,7 @@ public class PrioritizedPendingList implements PendingList {
     }
 
     protected int getPriority(MessageReference message) {
-        int priority = javax.jms.Message.DEFAULT_PRIORITY;
+        int priority = jakarta.jms.Message.DEFAULT_PRIORITY;
         if (message.getMessageId() != null) {
             priority = Math.max(message.getMessage().getPriority(), 0);
             priority = Math.min(priority, 9);

activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java

@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.region.policy;
 
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;

activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java

@@ -17,9 +17,9 @@
 package org.apache.activemq.broker.region.policy;
 
 import java.util.concurrent.atomic.AtomicLong;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
 import org.apache.activemq.ActiveMQMessageTransformation;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;

activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java

@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.broker.region.virtual;
 
-import javax.jms.InvalidSelectorException;
+import jakarta.jms.InvalidSelectorException;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.filter.BooleanExpression;

activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java

@@ -34,7 +34,7 @@ import org.apache.activemq.command.LocalTransactionId;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.util.LRUCache;
 
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.ResourceAllocationException;
 
 /**
  * A Destination which implements <a href="https://activemq.apache.org/virtual-destinations">Virtual Topic</a>

activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java

@@ -19,7 +19,7 @@ package org.apache.activemq.broker.scheduler;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.jms.MessageFormatException;
+import jakarta.jms.MessageFormatException;
 
 import org.apache.activemq.ScheduledMessage;
 import org.apache.activemq.advisory.AdvisorySupport;

activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobScheduler.java

@@ -31,7 +31,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.jms.MessageFormatException;
+import jakarta.jms.MessageFormatException;
 
 import org.apache.activemq.broker.scheduler.CronParser;
 import org.apache.activemq.broker.scheduler.Job;

activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java

@@ -18,7 +18,7 @@ package org.apache.activemq.broker.util;
 
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.broker.Connection;

activemq-broker/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java

@@ -21,9 +21,9 @@ import org.apache.activemq.util.ByteArrayInputStream;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
-import javax.jms.BytesMessage;
+import jakarta.jms.BytesMessage;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;

activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java

@@ -18,13 +18,13 @@ package org.apache.activemq.network.jms;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
 
 import org.apache.activemq.Service;
 import org.slf4j.Logger;

activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java

@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;

activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java

@@ -16,10 +16,10 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 /**
  * Converts Message from one JMS to another

activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java

@@ -16,16 +16,16 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.QueueConnection;
+import jakarta.jms.QueueConnection;
-import javax.jms.QueueSender;
+import jakarta.jms.QueueSender;
-import javax.jms.QueueSession;
+import jakarta.jms.QueueSession;
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 /**
  * A Destination bridge is used to bridge Queues between to different JMS systems

activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java

@@ -16,10 +16,10 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 /**
  * Converts Message from one JMS to another

activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java

@@ -16,15 +16,15 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Queue;
+import jakarta.jms.Queue;
-import javax.jms.QueueConnection;
+import jakarta.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
+import jakarta.jms.QueueSession;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import javax.naming.NamingException;
 
 import org.slf4j.Logger;

activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java

@@ -16,15 +16,15 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
-import javax.jms.ExceptionListener;
+import jakarta.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Topic;
-import javax.jms.TopicConnection;
+import jakarta.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
+import jakarta.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
+import jakarta.jms.TopicSession;
 import javax.naming.NamingException;
 
 import org.slf4j.Logger;

activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java

@@ -16,16 +16,16 @@
  */
 package org.apache.activemq.network.jms;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Message;
-import javax.jms.MessageConsumer;
+import jakarta.jms.MessageConsumer;
-import javax.jms.MessageProducer;
+import jakarta.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Topic;
-import javax.jms.TopicConnection;
+import jakarta.jms.TopicConnection;
-import javax.jms.TopicPublisher;
+import jakarta.jms.TopicPublisher;
-import javax.jms.TopicSession;
+import jakarta.jms.TopicSession;
 
 /**
  * A Destination bridge is used to bridge between to different JMS systems

activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.advisory.AdvisorySupport;
@@ -285,7 +285,7 @@ public class StatisticsBroker extends BrokerFilter {
             throws Exception {
         msg.setPersistent(false);
         msg.setTimestamp(System.currentTimeMillis());
-        msg.setPriority((byte) javax.jms.Message.DEFAULT_PRIORITY);
+        msg.setPriority((byte) jakarta.jms.Message.DEFAULT_PRIORITY);
         msg.setType(AdvisorySupport.ADIVSORY_MESSAGE_TYPE);
         msg.setMessageId(new MessageId(this.advisoryProducerId, this.messageIdGenerator.getNextSequenceId()));
         msg.setDestination(replyTo);

activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java

@@ -249,10 +249,10 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
         removeDestinationRole(new ActiveMQTopic(topic), operation, role);
     }
 
-    public void addDestinationRole(javax.jms.Destination destination, String operation, String role) {
+    public void addDestinationRole(jakarta.jms.Destination destination, String operation, String role) {
     }
 
-    public void removeDestinationRole(javax.jms.Destination destination, String operation, String role) {
+    public void removeDestinationRole(jakarta.jms.Destination destination, String operation, String role) {
     }
 
     @Override