From febcd0b485a4a5ad550c0d22e81a2e4a6e4a6b2b Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Thu, 30 Mar 2023 11:38:13 -0500 Subject: [PATCH] [AMQ-9239] jakarta.jms - activemq-tooling chnages --- .../junit/AbstractActiveMQClientResource.java | 18 ++++++++--------- .../AbstractActiveMQConsumerResource.java | 14 ++++++------- .../AbstractActiveMQProducerResource.java | 14 ++++++------- .../ActiveMQDynamicQueueSenderResource.java | 14 ++++++------- ...ActiveMQDynamicTopicPublisherResource.java | 14 ++++++------- .../junit/ActiveMQQueueSenderResource.java | 2 +- ...ctiveMQTopicDurableSubscriberResource.java | 4 ++-- .../junit/ActiveMQTopicPublisherResource.java | 2 +- .../junit/EmbeddedActiveMQBroker.java | 20 +++++++++---------- .../org/apache/activemq/tool/JMSMemtest.java | 16 +++++++-------- .../org/apache/activemq/tool/MemConsumer.java | 18 ++++++++--------- .../activemq/tool/MemMessageIdList.java | 6 +++--- .../org/apache/activemq/tool/MemProducer.java | 16 +++++++-------- .../activemq/tool/AbstractJmsClient.java | 2 +- .../tool/AbstractJmsClientSystem.java | 6 +++--- .../tool/AbstractJmsMeasurableClient.java | 2 +- .../activemq/tool/JmsConsumerClient.java | 14 ++++++------- .../activemq/tool/JmsConsumerSystem.java | 2 +- .../activemq/tool/JmsProducerClient.java | 12 +++++------ .../activemq/tool/JmsProducerSystem.java | 2 +- .../activemq/tool/spi/ActiveMQPojoSPI.java | 2 +- .../spi/ClassLoaderSPIConnectionFactory.java | 2 +- .../spi/ReflectionSPIConnectionFactory.java | 2 +- .../tool/spi/SPIConnectionFactory.java | 2 +- .../activemq/tool/AbstractJmsClientTest.java | 6 +++--- .../activemq/tool/JmsProducerClientTest.java | 4 ++-- 26 files changed, 108 insertions(+), 108 deletions(-) diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQClientResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQClientResource.java index fd7d5f8f4f..dcd296df90 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQClientResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQClientResource.java @@ -19,15 +19,15 @@ package org.apache.activemq.junit; import java.io.Serializable; import java.net.URI; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.StreamMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQConsumerResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQConsumerResource.java index 5b04171138..28d6678f0c 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQConsumerResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQConsumerResource.java @@ -17,13 +17,13 @@ package org.apache.activemq.junit; import java.net.URI; -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQProducerResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQProducerResource.java index 69e89af8bc..f6e00319f5 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQProducerResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/AbstractActiveMQProducerResource.java @@ -19,13 +19,13 @@ package org.apache.activemq.junit; import java.io.Serializable; import java.net.URI; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicQueueSenderResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicQueueSenderResource.java index 1e355aed04..76c41e24cd 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicQueueSenderResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicQueueSenderResource.java @@ -19,13 +19,13 @@ package org.apache.activemq.junit; import java.io.Serializable; import java.net.URI; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.IllegalStateException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicTopicPublisherResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicTopicPublisherResource.java index 8181946923..f44a67e575 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicTopicPublisherResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQDynamicTopicPublisherResource.java @@ -19,13 +19,13 @@ package org.apache.activemq.junit; import java.io.Serializable; import java.net.URI; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.IllegalStateException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQQueueSenderResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQQueueSenderResource.java index fa3cdcaf1c..5deae01e34 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQQueueSenderResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQQueueSenderResource.java @@ -17,7 +17,7 @@ package org.apache.activemq.junit; import java.net.URI; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicDurableSubscriberResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicDurableSubscriberResource.java index 58bb6a52f6..8be08c2692 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicDurableSubscriberResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicDurableSubscriberResource.java @@ -17,8 +17,8 @@ package org.apache.activemq.junit; import java.net.URI; -import javax.jms.JMSException; -import javax.jms.Topic; +import jakarta.jms.JMSException; +import jakarta.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicPublisherResource.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicPublisherResource.java index 0def0e9d0b..5aee4efbb2 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicPublisherResource.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/ActiveMQTopicPublisherResource.java @@ -17,7 +17,7 @@ package org.apache.activemq.junit; import java.net.URI; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java index c90b8c3682..afdf5b96c2 100644 --- a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java +++ b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java @@ -23,16 +23,16 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Map; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.StreamMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerFactory; diff --git a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java index 1cf2ef1938..193a2f50a6 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java +++ b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java @@ -19,14 +19,14 @@ package org.apache.activemq.tool; import java.util.Properties; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.BytesMessage; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java index 79181a739a..09793673bc 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java +++ b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java @@ -16,15 +16,15 @@ */ package org.apache.activemq.tool; -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.Session; -import javax.jms.Topic; +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.Session; +import jakarta.jms.Topic; /** * diff --git a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java index c014d4d4f7..f02a36a6cc 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java +++ b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java @@ -19,9 +19,9 @@ package org.apache.activemq.tool; import java.util.ArrayList; import java.util.List; -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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java index 05f486bfdf..8edb08ec94 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java +++ b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.tool; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; /** * diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java index 9eb8e8babe..0fbaaa7ba3 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java @@ -19,7 +19,7 @@ package org.apache.activemq.tool; import java.util.ArrayList; import java.util.List; -import javax.jms.*; +import jakarta.jms.*; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.tool.properties.JmsClientProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java index c9f9058bb0..c043f3bf6c 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java @@ -26,9 +26,9 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.CountDownLatch; -import javax.jms.ConnectionFactory; -import javax.jms.ConnectionMetaData; -import javax.jms.JMSException; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.ConnectionMetaData; +import jakarta.jms.JMSException; import org.apache.activemq.tool.properties.AbstractObjectProperties; import org.apache.activemq.tool.properties.JmsClientProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java index 194b76de61..ec1ff5dba1 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java @@ -18,7 +18,7 @@ package org.apache.activemq.tool; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.apache.activemq.tool.sampler.MeasurableClient; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java index 2ee01ab11b..9a14d152ba 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java @@ -18,13 +18,13 @@ package org.apache.activemq.tool; import java.util.concurrent.atomic.AtomicInteger; -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.Topic; +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.Topic; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.tool.properties.JmsClientProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java index 34feeaabec..0e5eb07c00 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.tool; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.tool.properties.JmsClientProperties; import org.apache.activemq.tool.properties.JmsClientSystemProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java index eb6cd38e06..4f6a89bd5f 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java @@ -24,12 +24,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.Set; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.TextMessage; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.MessageProducer; +import jakarta.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.tool.properties.JmsClientProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java index dc6e0240ab..84d4257962 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.tool; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.tool.properties.JmsClientProperties; import org.apache.activemq.tool.properties.JmsClientSystemProperties; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java index 90ff7e3f1f..198fc135d4 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java @@ -18,7 +18,7 @@ package org.apache.activemq.tool.spi; import java.util.Properties; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java index 17ce87f42d..879b6b253a 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Properties; import java.util.StringTokenizer; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java index 6d86a20829..754f32da0a 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java @@ -18,7 +18,7 @@ package org.apache.activemq.tool.spi; import java.util.Properties; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import org.apache.activemq.tool.properties.ReflectionUtil; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java index 8824391a10..92c0f18515 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java @@ -18,7 +18,7 @@ package org.apache.activemq.tool.spi; import java.util.Properties; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; public interface SPIConnectionFactory { diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/AbstractJmsClientTest.java b/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/AbstractJmsClientTest.java index 8625dbce28..ac92a96886 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/AbstractJmsClientTest.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/AbstractJmsClientTest.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals; import java.net.URI; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerFactory; diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/JmsProducerClientTest.java b/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/JmsProducerClientTest.java index 97573f32dd..d7d29a67fe 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/JmsProducerClientTest.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/test/java/org/apache/activemq/tool/JmsProducerClientTest.java @@ -29,8 +29,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import javax.jms.Destination; -import javax.jms.JMSException; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; import java.net.URI; public class JmsProducerClientTest {