From a2f83d4dce58d82d4590cf4f6c20b8bf22e265ad Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <matt@hyte.io>
Date: Thu, 30 Mar 2023 11:34:04 -0500
Subject: [PATCH] [AMQ-9239] jakarta.jms - activemq-karaf-itest, activemq-osgi
 changes

---
 .../karaf/itest/ActiveMQAMQPBrokerFeatureTest.java |  2 +-
 .../karaf/itest/ActiveMQClientFactoryTest.java     |  2 +-
 .../org/apache/activemq/karaf/itest/JMSTester.java | 14 +++++++-------
 activemq-osgi/pom.xml                              |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
index 4a085c887b..d18e17ac82 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.karaf.itest;
 
-import javax.jms.Connection;
+import jakarta.jms.Connection;
 
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Test;
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
index 5425a1566f..200762b717 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.util.concurrent.Callable;
 
 import javax.inject.Inject;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/JMSTester.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/JMSTester.java
index dcb5e16d13..88e84686f1 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/JMSTester.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/JMSTester.java
@@ -21,13 +21,13 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.Closeable;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
+import jakarta.jms.TemporaryQueue;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.karaf.shell.api.console.SessionFactory;
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 7b99b34119..ac72352055 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -192,7 +192,7 @@
               javax.annotation*;version="[1,4)",
               !com.thoughtworks.qdox*,
               org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
-              javax.jms*;version="[1.1,3)",
+              jakarta.jms*;version="[3,4)",
               javax.management*;resolution:=optional,
               javax.transaction*;version="[1,3)",
               javax.naming*;resolution:=optional,