This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch activemq-5.17.x in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.17.x by this push: new 713e662db AMQ-9344 - remove jakarta imports and fix compilation on backport 713e662db is described below commit 713e662dbda965a22f54fb6536833e0efa3d9638 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> AuthorDate: Tue Jan 23 10:46:29 2024 -0500 AMQ-9344 - remove jakarta imports and fix compilation on backport --- .../org/apache/activemq/broker/TransportConnection.java | 1 - .../activemq/usecases/MaxUncommittedCountExceededTest.java | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java index 8c6ff28cc..9ac9001e8 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java @@ -106,7 +106,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import jakarta.jms.ResourceAllocationException; public class TransportConnection implements Connection, Task, CommandVisitor { private static final Logger LOG = LoggerFactory.getLogger(TransportConnection.class); diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MaxUncommittedCountExceededTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MaxUncommittedCountExceededTest.java index 320ae4f11..6ebf71599 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MaxUncommittedCountExceededTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MaxUncommittedCountExceededTest.java @@ -42,13 +42,13 @@ import org.junit.rules.TestName; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import jakarta.jms.Connection; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.ResourceAllocationException; -import jakarta.jms.Session; +import javax.jms.Connection; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.ResourceAllocationException; +import javax.jms.Session; @RunWith(value = Parameterized.class) public class MaxUncommittedCountExceededTest {