diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 2c6145210f..fddfc9a260 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -47,10 +47,10 @@
       <artifactId>activemq-openwire-legacy</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
-
+    
     <!-- =============================== -->
     <!-- Optional Dependencies -->
     <!-- =============================== -->
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 8c969571cf..9a395b82bf 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/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 javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.management.InstanceNotFoundException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
index 7a745b5ac3..d0514c8bc1 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
index c695fb4ce4..cf521d584c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
+++ b/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 javax.jms.InvalidSelectorException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.InvalidSelectorException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
index 644595c798..f80147d19b 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
index 7e3bf5551d..77c2c85f31 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
index fa28379560..a927e1d31d 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.IllegalStateException;
+import jakarta.jms.JMSException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
index 6f5f206801..c6956bf46d 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
index ebc8720c75..1fa1418012 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
index 50fb998aa1..b0625315c4 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
index b72bf17ffe..dbba9c1f18 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.JMSException;
 import javax.management.openmbean.ArrayType;
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
index 64a4c2792c..067e685683 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
index 663220e7a3..2a548d595b 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
index 189bebbb3f..7bffd5272e 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
+++ b/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;
 
 /**
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
index 702b22b15b..9b53a59030 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.IllegalStateException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.DestinationDoesNotExistException;
 import org.apache.activemq.advisory.AdvisorySupport;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
index 9f7e8e4908..f33060b464 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.InvalidSelectorException;
+import jakarta.jms.JMSException;
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.Broker;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
index 06088da57e..1426f330ab 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
index e58da626a9..c4d78d7217 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.InvalidSelectorException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java
index e64a503d12..7155e6cd87 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/MessageReferenceFilter.java
+++ b/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;
 
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
index 93b3b2ae57..d59717444c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 66fa2cf397..ffca1e8e85 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/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 javax.jms.JMSException;
-import javax.jms.ResourceAllocationException;
+import jakarta.jms.InvalidSelectorException;
+import jakarta.jms.JMSException;
+import jakarta.jms.ResourceAllocationException;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerStoppedException;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
index 65f2d7b555..fa7c66a1bf 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
index f300a1340f..49dc5beae4 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
index 6e865ec27d..c7517d5c28 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
index 50481a6579..04f1c7761a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.InvalidClientIDException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
index 4a8b3412fa..c20ac6ab7f 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
index 78d695557f..c6bf732041 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
index bc0f8a97d8..b34fdb4b88 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index 2cca4c0bd2..61ecb7ade9 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/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);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
index e145c022fa..68b01f4e07 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.InvalidDestinationException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.ConnectionContext;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
index fc87e1d650..a5b97241b4 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java
index 1f0e59400e..3051887cc7 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingList.java
+++ b/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);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java
index ae462a7ec5..15e1810127 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
index 43c344f1c3..8b301df53f 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
+++ b/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 javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 import org.apache.activemq.ActiveMQMessageTransformation;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java
index 73cb548138..e0b555d9a4 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/FilteredDestination.java
+++ b/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 javax.jms.JMSException;
+import jakarta.jms.InvalidSelectorException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.filter.BooleanExpression;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
index 9e5c251bde..cdf683c56f 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
+++ b/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>
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
index 1355a88230..1ab1113b8a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobScheduler.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobScheduler.java
index 3113a05bae..92a08ff8c9 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobScheduler.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
index 37fdc85621..aca0df9fa7 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
+++ b/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;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java b/activemq-broker/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
index e4581817ed..4cb022ee2e 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
+++ b/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 javax.jms.JMSException;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.TextMessage;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
index 8d9bdbc63a..10cbfe7bb7 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
+++ b/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 javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
+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 org.apache.activemq.Service;
 import org.slf4j.Logger;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
index b09b96a087..4680d7da97 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
+++ b/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 javax.jms.Destination;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
index ca4891de31..0ee6fcd588 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
+++ b/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 javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 /**
  * Converts Message from one JMS to another
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
index 6dc38024fb..70c7572877 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
+++ b/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 javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
+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.QueueConnection;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
 
 /**
  * A Destination bridge is used to bridge Queues between to different JMS systems
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
index 5f15702dbf..fd6c340218 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
+++ b/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 javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 /**
  * Converts Message from one JMS to another
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java
index 34607d2047..112c3935e0 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java
+++ b/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 javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
 import javax.naming.NamingException;
 
 import org.slf4j.Logger;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java
index 420a4afb8e..ae4c804c5b 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java
+++ b/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 javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
+import jakarta.jms.TopicSession;
 import javax.naming.NamingException;
 
 import org.slf4j.Logger;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
index 189e120675..2fbdc53e61 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
+++ b/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 javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicPublisher;
+import jakarta.jms.TopicSession;
 
 /**
  * A Destination bridge is used to bridge between to different JMS systems
diff --git a/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
index 92bb14cbd5..3429da4a7c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
+++ b/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);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
index 06eabd2584..e4f861a597 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
+++ b/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
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
index 95d5b72ed5..395f9f0f22 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
@@ -18,7 +18,7 @@ package org.apache.activemq.store;
 
 import java.io.IOException;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.MessageAck;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
index 9c65cc158d..84bf75c672 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/TopicReferenceStore.java
@@ -18,7 +18,7 @@ package org.apache.activemq.store;
 
 import java.io.IOException;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.MessageId;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java b/activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
index 09334803cd..c1374e52bd 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
-import javax.jms.TransactionRolledBackException;
+import jakarta.jms.TransactionRolledBackException;
 import javax.transaction.xa.XAException;
 
 import org.apache.activemq.TransactionContext;
diff --git a/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java b/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
index 2b0f4f38c3..516d71a9d6 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
@@ -19,14 +19,14 @@ package org.apache.activemq;
 import java.util.ArrayList;
 import java.util.Enumeration;
 
-import javax.jms.Destination;
-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.Destination;
+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.test.JmsResourceProvider;
 import org.slf4j.Logger;
diff --git a/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
index e5bdbdf51c..acf53f3df8 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
@@ -21,17 +21,17 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-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.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+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.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-broker/src/test/java/org/apache/activemq/broker/LinkStealingTest.java b/activemq-broker/src/test/java/org/apache/activemq/broker/LinkStealingTest.java
index df5399e9be..bd66c3e487 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/broker/LinkStealingTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/broker/LinkStealingTest.java
@@ -18,8 +18,8 @@ package org.apache.activemq.broker;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.jms.Connection;
-import javax.jms.InvalidClientIDException;
+import jakarta.jms.Connection;
+import jakarta.jms.InvalidClientIDException;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ConnectionInfo;
diff --git a/activemq-broker/src/test/java/org/apache/activemq/broker/OpenwireConnectionTest.java b/activemq-broker/src/test/java/org/apache/activemq/broker/OpenwireConnectionTest.java
index 130c80a1c2..7cd0733192 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/broker/OpenwireConnectionTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/broker/OpenwireConnectionTest.java
@@ -21,7 +21,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
 import java.net.URI;
 import java.util.concurrent.CopyOnWriteArrayList;
 
diff --git a/activemq-broker/src/test/java/org/apache/activemq/broker/interceptor/MessageInterceptorTest.java b/activemq-broker/src/test/java/org/apache/activemq/broker/interceptor/MessageInterceptorTest.java
index 2e593d85d0..6a7757fc9d 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/broker/interceptor/MessageInterceptorTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/broker/interceptor/MessageInterceptorTest.java
@@ -19,12 +19,12 @@ package org.apache.activemq.broker.interceptor;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.jms.Connection;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerRegistry;
@@ -88,13 +88,13 @@ public class MessageInterceptorTest extends TestCase {
 
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
@@ -122,13 +122,13 @@ public class MessageInterceptorTest extends TestCase {
         final CountDownLatch latch = new CountDownLatch(messageCount);
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
@@ -149,13 +149,13 @@ public class MessageInterceptorTest extends TestCase {
 
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
@@ -184,13 +184,13 @@ public class MessageInterceptorTest extends TestCase {
         consumer = consumerSession.createConsumer(queue);
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
@@ -219,13 +219,13 @@ public class MessageInterceptorTest extends TestCase {
         consumer = consumerSession.createConsumer(queue);
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
@@ -256,7 +256,7 @@ public class MessageInterceptorTest extends TestCase {
 
         consumer.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
@@ -266,13 +266,13 @@ public class MessageInterceptorTest extends TestCase {
 
         consumer1.setMessageListener(new MessageListener() {
             @Override
-            public void onMessage(javax.jms.Message message) {
+            public void onMessage(jakarta.jms.Message message) {
                 latch.countDown();
 
             }
         });
         for (int i  = 0; i < messageCount; i++){
-            javax.jms.Message message = producerSession.createTextMessage("test: " + i);
+            jakarta.jms.Message message = producerSession.createTextMessage("test: " + i);
             producer.send(message);
         }
 
diff --git a/activemq-broker/src/test/java/org/apache/activemq/broker/view/BrokerDestinationViewTest.java b/activemq-broker/src/test/java/org/apache/activemq/broker/view/BrokerDestinationViewTest.java
index 1dc94fb6a7..814a7f013d 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/broker/view/BrokerDestinationViewTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/broker/view/BrokerDestinationViewTest.java
@@ -21,12 +21,12 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
diff --git a/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java b/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
index e818b27b0a..630fb560f5 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
@@ -19,11 +19,11 @@ package org.apache.activemq.bugs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 import javax.management.ObjectName;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java b/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
index a480a7d2a0..8e8705b104 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
@@ -16,17 +16,17 @@
  */
 package org.apache.activemq.test;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionConsumer;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ServerSessionPool;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 
@@ -55,7 +55,7 @@ public class JmsResourceProvider {
     /**
      * Creates a connection.
      * 
-     * @see org.apache.activemq.test.JmsResourceProvider#createConnection(javax.jms.ConnectionFactory)
+     * @see org.apache.activemq.test.JmsResourceProvider#createConnection(jakarta.jms.ConnectionFactory)
      */
     public Connection createConnection(ConnectionFactory cf) throws JMSException {
         Connection connection = cf.createConnection();
@@ -66,15 +66,15 @@ public class JmsResourceProvider {
     }
 
     /**
-     * @see org.apache.activemq.test.JmsResourceProvider#createSession(javax.jms.Connection)
+     * @see org.apache.activemq.test.JmsResourceProvider#createSession(jakarta.jms.Connection)
      */
     public Session createSession(Connection conn) throws JMSException {
         return conn.createSession(transacted, ackMode);
     }
 
     /**
-     * @see org.apache.activemq.test.JmsResourceProvider#createConsumer(javax.jms.Session,
-     *      javax.jms.Destination)
+     * @see org.apache.activemq.test.JmsResourceProvider#createConsumer(jakarta.jms.Session,
+     *      jakarta.jms.Destination)
      */
     public MessageConsumer createConsumer(Session session, Destination destination) throws JMSException {
         if (isDurableSubscriber()) {
@@ -96,8 +96,8 @@ public class JmsResourceProvider {
     /**
      * Creates a producer.
      * 
-     * @see org.apache.activemq.test.JmsResourceProvider#createProducer(javax.jms.Session,
-     *      javax.jms.Destination)
+     * @see org.apache.activemq.test.JmsResourceProvider#createProducer(jakarta.jms.Session,
+     *      jakarta.jms.Destination)
      */
     public MessageProducer createProducer(Session session, Destination destination) throws JMSException {
         MessageProducer producer = session.createProducer(destination);
@@ -108,7 +108,7 @@ public class JmsResourceProvider {
     /**
      * Creates a destination, which can either a topic or a queue.
      * 
-     * @see org.apache.activemq.test.JmsResourceProvider#createDestination(javax.jms.Session,
+     * @see org.apache.activemq.test.JmsResourceProvider#createDestination(jakarta.jms.Session,
      *      java.lang.String)
      */
     public Destination createDestination(Session session, String name) throws JMSException {
diff --git a/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java
index 6acb807b99..94489b94f3 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java
@@ -19,12 +19,12 @@ package org.apache.activemq.test;
 import java.io.File;
 import java.lang.reflect.Array;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
 
 import junit.framework.TestCase;