This is an automated email from the ASF dual-hosted git repository. mattrpav pushed a commit to branch activemq-5.19.x in repository https://gitbox.apache.org/repos/asf/activemq.git
commit cf4ec649f39b4611ef7d119c25e2fe2d67fa0c56 Author: Matt Pavlovich <[email protected]> AuthorDate: Tue Jun 23 14:01:22 2026 -0500 [#2020] Backport fixes --- .../region/TopicSubscriptionEnableExpiryTest.java | 17 +++++++---------- .../TopicSubscriptionEnableExpiryThroughputTest.java | 13 +++++-------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java index 4dcc34e574..aa4051ed13 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java @@ -19,11 +19,11 @@ package org.apache.activemq.broker.region; import java.util.ArrayList; import java.util.List; -import jakarta.jms.Connection; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.ConstantPendingMessageLimitStrategy; @@ -33,8 +33,6 @@ import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQTopic; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.apache.activemq.test.annotations.ParallelTest; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; @@ -52,7 +50,6 @@ import static org.junit.Assert.assertEquals; * on the {@link org.apache.activemq.broker.region.policy.MessageEvictionStrategy} skips that * scan entirely via a single boolean check guarding the call site. */ -@Category(ParallelTest.class) public class TopicSubscriptionEnableExpiryTest { // ------------------------------------------------------------------------- @@ -275,7 +272,7 @@ public class TopicSubscriptionEnableExpiryTest { // Send messages with short TTL for (int i = 0; i < SEND_COUNT; i++) { TextMessage msg = session.createTextMessage("msg-" + i); - producer.send(msg, jakarta.jms.DeliveryMode.NON_PERSISTENT, 4, SHORT_TTL_MS); + producer.send(msg, javax.jms.DeliveryMode.NON_PERSISTENT, 4, SHORT_TTL_MS); } // Wait for all TTLs to expire @@ -326,7 +323,7 @@ public class TopicSubscriptionEnableExpiryTest { MessageProducer producer = session.createProducer(new ActiveMQTopic("TEST.EXPIRY.ENABLED")); for (int i = 0; i < SEND_COUNT; i++) { TextMessage msg = session.createTextMessage("msg-" + i); - producer.send(msg, jakarta.jms.DeliveryMode.NON_PERSISTENT, 4, SHORT_TTL_MS); + producer.send(msg, javax.jms.DeliveryMode.NON_PERSISTENT, 4, SHORT_TTL_MS); } // Wait for all TTLs to expire diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryThroughputTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryThroughputTest.java index 2299f255d8..54c84c69e1 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryThroughputTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryThroughputTest.java @@ -19,11 +19,11 @@ package org.apache.activemq.broker.region; import java.util.ArrayList; import java.util.List; -import jakarta.jms.Connection; -import jakarta.jms.DeliveryMode; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; +import javax.jms.Connection; +import javax.jms.DeliveryMode; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; @@ -34,8 +34,6 @@ import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQTopic; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.apache.activemq.test.annotations.ParallelTest; import static org.junit.Assert.assertTrue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +65,6 @@ import org.slf4j.LoggerFactory; * in the normal CI suite, but uses a modest message count to keep wall-clock * time acceptable on slow machines. */ -@Category(ParallelTest.class) public class TopicSubscriptionEnableExpiryThroughputTest { private static final Logger LOG = LoggerFactory.getLogger(TopicSubscriptionEnableExpiryThroughputTest.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
