diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java
index d3e4d5814b5..14b57b0d329 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java
@@ -38,6 +38,7 @@
import org.apache.activemq.transport.TransportFilter;
import org.apache.activemq.transport.tcp.SslTransport;
import org.apache.activemq.transport.tcp.TcpTransport;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +46,9 @@
import java.util.List;
import static org.junit.Assert.assertArrayEquals;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ActiveMQSslConnectionFactoryTest extends CombinationTestSupport {
private static final Log LOG = LogFactory.getLog(ActiveMQSslConnectionFactoryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java
index d697840e03d..b16d7b0cba6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java
@@ -28,10 +28,13 @@
import org.apache.activemq.test.JmsTopicSendReceiveTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableTopicSendReceiveTest extends JmsTopicSendReceiveTest {
private static final Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java
index 73e3e2474fc..25c52e0da8a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueSendReceiveTest extends JmsTopicSendReceiveTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
index 28c3af358d6..0315005c85b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
@@ -42,10 +42,13 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsSendReceiveWithMessageExpirationTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveWithMessageExpirationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
index b0ea3603c36..b14a2940dcd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
@@ -32,6 +32,7 @@
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.vm.VMTransport;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,10 +45,12 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.experimental.categories.Category;
/**
* @version
*/
+@Category(ParallelTest.class)
public class JmsTempDestinationTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(JmsTempDestinationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java
index ef500fa1999..22f1f0e66ac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java
@@ -28,10 +28,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicRedeliverTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRedeliverTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
index de0ffdb940c..e40dd2c71ee 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
@@ -34,10 +34,13 @@
import org.apache.activemq.test.TestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicRequestReplyTest extends TestSupport implements MessageListener {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRequestReplyTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java
index 9e1feff61d2..48004253fe6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java
@@ -30,10 +30,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSelectorTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSelectorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java
index 4a10d2de84c..5e7952928ae 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java
@@ -25,10 +25,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
index 1ab31e4cf1a..eae47435b02 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
@@ -22,10 +22,13 @@
import jakarta.jms.JMSException;
import jakarta.jms.MessageConsumer;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @version
*/
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java
index cf5cdc0c034..c1e15dd6f91 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java
@@ -17,11 +17,14 @@
package org.apache.activemq;
import org.apache.activemq.test.JmsResourceProvider;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicTransactionTest extends JmsTransactionTestSupport {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
index 5857871ec8c..f6296953f41 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
@@ -29,10 +29,13 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
+import org.apache.activemq.test.annotations.ParallelTest;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
index 299eac51f28..b5b981011b9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
@@ -35,6 +35,7 @@
import org.apache.activemq.transport.tcp.TcpTransport;
import org.apache.activemq.util.DefaultTestAppender;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
@@ -47,7 +48,9 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ProducerFlowControlTest extends JmsTestSupport {
static final Logger LOG = LoggerFactory.getLogger(ProducerFlowControlTest.class);
ActiveMQQueue queueA = new ActiveMQQueue("QUEUE.A");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
index 686040456a6..0f0cb17aa36 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
@@ -34,6 +34,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Implements the test case attached to:
@@ -41,6 +43,7 @@
*
* This version avoids the spring deps.
*/
+@Category(ParallelTest.class)
public class AMQ4351Test extends BrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4351Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
index 4ff34bb36db..ac9a7d754be 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
@@ -35,9 +35,12 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class BrokerTest extends BrokerTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
index 35b53e63db5..90eebcb575a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
@@ -23,9 +23,12 @@
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.SessionId;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ConcurrentConnectSimulationTest extends BrokerTestSupport {
/*
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java
index c1864207c4a..7395d47c0a0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.broker;
import junit.framework.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DedicatedTaskRunnerBrokerTest extends BrokerTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java
index a4550ad26c0..bfe4fdd6623 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java
@@ -29,12 +29,15 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.network.NetworkTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Pretend to be an abusive client that sends multiple identical ConsumerInfo
* commands and make sure the broker doesn't stall because of it.
*/
+@Category(ParallelTest.class)
public class DoubleSubscriptionTest extends NetworkTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DurablePersistentFalseRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DurablePersistentFalseRestartTest.java
index e5c63cb1b89..c96d547cd12 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DurablePersistentFalseRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/DurablePersistentFalseRestartTest.java
@@ -29,7 +29,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.transport.failover.FailoverTransport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurablePersistentFalseRestartTest extends BrokerRestartTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerNoCacheTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerNoCacheTest.java
index ff953fffc76..a8498dd7473 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerNoCacheTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerNoCacheTest.java
@@ -20,7 +20,10 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JdbcXARecoveryBrokerNoCacheTest extends JdbcXARecoveryBrokerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
index d787e7aad4f..a290c64429f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
@@ -25,7 +25,10 @@
import org.apache.activemq.util.IOHelper;
import org.apache.derby.jdbc.EmbeddedDataSource;
import org.apache.derby.jdbc.EmbeddedXADataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JdbcXARecoveryBrokerTest extends XARecoveryBrokerTest {
EmbeddedXADataSource dataSource;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/KahaDBXARecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/KahaDBXARecoveryBrokerTest.java
index 6e010b8d11c..2c8bafaf1ed 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/KahaDBXARecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/KahaDBXARecoveryBrokerTest.java
@@ -29,7 +29,10 @@
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.command.XATransactionId;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBXARecoveryBrokerTest extends XARecoveryBrokerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
index 31751562ff4..2ebc6330ff8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
@@ -24,12 +24,15 @@
import org.apache.activemq.command.Response;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.wireformat.WireFormat;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Runs against the broker but marshals all request and response commands.
*
*
*/
+@Category(ParallelTest.class)
public class MarshallingBrokerTest extends BrokerTest {
public WireFormat wireFormat = new OpenWireFormat();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
index c2533719676..783e3760941 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
@@ -33,9 +33,12 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageExpirationTest extends BrokerTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
index 6d47a047524..3cd0817fa6a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
@@ -43,8 +43,11 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class NioQueueSubscriptionTest extends QueueSubscriptionTest {
protected static final Logger LOG = LoggerFactory.getLogger(NioQueueSubscriptionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/OutOfOrderXMLTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/OutOfOrderXMLTest.java
index 11fbb569025..0f0445f5a57 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/OutOfOrderXMLTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/OutOfOrderXMLTest.java
@@ -19,8 +19,11 @@
import java.net.URI;
import org.apache.activemq.xbean.XBeanBrokerFactory;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// https://issues.apache.org/activemq/browse/AMQ-2939
+@Category(ParallelTest.class)
public class OutOfOrderXMLTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
index 7e6c835e5c2..641525c46a6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
@@ -34,8 +34,11 @@
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class QueueMbeanRestartTest extends TestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(QueueMbeanRestartTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
index 6c3dc159cb7..d380a3a6830 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
@@ -24,8 +24,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport {
protected int messageCount = 1000; // 1000 Messages per producer
protected int prefetchCount = 10;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
index 15bfbd2d622..0a5bb0f3a26 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
@@ -34,12 +34,15 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.command.XATransactionId;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Used to simulate the recovery that occurs when a broker shuts down.
*
*
*/
+@Category(ParallelTest.class)
public class RecoveryBrokerTest extends BrokerRestartTestSupport {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryStatsBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryStatsBrokerTest.java
index 362e30406a0..f1c3f37d842 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryStatsBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryStatsBrokerTest.java
@@ -39,8 +39,11 @@
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class RecoveryStatsBrokerTest extends BrokerRestartTestSupport {
private RestartType restartType;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
index 37bd5f2e11f..caa2f9d98de 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
@@ -38,7 +38,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class RedeliveryRecoveryTest {
static final Logger LOG = LoggerFactory.getLogger(RedeliveryRecoveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
index 186aa38a620..e193fb63ccf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
@@ -38,8 +38,11 @@
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class RedeliveryRestartTest extends TestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(RedeliveryRestartTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartWithExceptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartWithExceptionTest.java
index 36daff54e1c..6de6b450c00 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartWithExceptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRestartWithExceptionTest.java
@@ -52,7 +52,10 @@
import org.junit.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class RedeliveryRestartWithExceptionTest extends TestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(RedeliveryRestartWithExceptionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java
index 61ba79c96d0..e9d5c6a2b2e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java
@@ -27,9 +27,12 @@
import org.junit.runners.BlockJUnit4ClassRunner;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class TopicSubscriptionTest extends QueueSubscriptionTest {
@Before
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
index e373c78a2d8..922e2bca3ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
@@ -42,12 +42,15 @@
import org.apache.activemq.util.JMXSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Used to simulate the recovery that occurs when a broker shuts down.
*
*
*/
+@Category(ParallelTest.class)
public class XARecoveryBrokerTest extends BrokerRestartTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(XARecoveryBrokerTest.class);
public boolean prioritySupport = true;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
index 5b8092db13e..97f18c82900 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
@@ -36,10 +36,7 @@
import org.junit.After;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.activemq.test.annotations.ParallelTest;
-import org.junit.experimental.categories.Category;
-@Category(ParallelTest.class)
public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnectionsTest implements ExceptionListener {
private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
index 266ead1be4c..ec0a5270cc2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
@@ -27,6 +27,7 @@
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +39,9 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ConcurrentMoveTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ConcurrentMoveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java
index 3ec7c924520..aad7bd10bcb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.broker.jmx;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
* A test case of the various MBeans in ActiveMQ with audit log turned on.
*/
+@Category(ParallelTest.class)
public class MBeanWithAuditLogTest extends MBeanTest {
static final String requiredAuditValue = "all";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
index 4cc57ba27c7..7547ac930c8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
@@ -25,7 +25,10 @@
import org.apache.activemq.store.kahadb.FilteredKahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.MultiKahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class mKahaDBXARecoveryBrokerTest extends XARecoveryBrokerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer0Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer0Test.java
index 762819b46df..4156962e061 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer0Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer0Test.java
@@ -55,7 +55,10 @@
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AbortSlowConsumer0Test extends AbortSlowConsumerBase {
private static final Logger LOG = LoggerFactory.getLogger(AbortSlowConsumer0Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
index 486e13a48f5..87825add974 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
@@ -32,8 +32,11 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AbortSlowConsumer1Test extends AbortSlowConsumerBase {
private static final Logger LOG = LoggerFactory.getLogger(AbortSlowConsumer1Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer2Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer2Test.java
index 047b90ea105..acbfbbf9e18 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer2Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer2Test.java
@@ -25,8 +25,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AbortSlowConsumer2Test extends AbortSlowConsumerBase {
@Parameterized.Parameters(name = "isTopic({0})")
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java
index 2eb956fb9ed..471eb9669c0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java
@@ -26,11 +26,14 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class DeadLetterTest extends DeadLetterTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DeadLetterTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MaxDestinationsPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MaxDestinationsPolicyTest.java
index bf9bc6b38eb..46d79091cd3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MaxDestinationsPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MaxDestinationsPolicyTest.java
@@ -39,6 +39,8 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
@@ -48,6 +50,7 @@
* during calculations.
*
*/
+@Category(ParallelTest.class)
public class MaxDestinationsPolicyTest {
BrokerService broker;
ConnectionFactory factory;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyMemoryUsageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyMemoryUsageTest.java
index 34ccf3d3aa2..6c1a3e540ad 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyMemoryUsageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyMemoryUsageTest.java
@@ -42,12 +42,15 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This unit test is to test that MessageInterceptorStrategy features
*
*/
+@Category(ParallelTest.class)
public class MessageInterceptorStrategyMemoryUsageTest extends TestSupport {
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyTest.java
index ae50d26d9aa..5537037cb74 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageInterceptorStrategyTest.java
@@ -41,12 +41,15 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This unit test is to test that MessageInterceptorStrategy features
*
*/
+@Category(ParallelTest.class)
public class MessageInterceptorStrategyTest extends TestSupport {
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
index 21c57e2b668..11c2f0e9dcc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
@@ -50,7 +50,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationGCStressTest {
protected static final Logger logger = LoggerFactory.getLogger(DestinationGCStressTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationRemoveRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationRemoveRestartTest.java
index b525fb49ed8..371a4fac32f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationRemoveRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationRemoveRestartTest.java
@@ -20,8 +20,11 @@
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// from https://issues.apache.org/activemq/browse/AMQ-2216
+@Category(ParallelTest.class)
public class DestinationRemoveRestartTest extends CombinationTestSupport {
private final static String destinationName = "TEST";
public byte destinationType = ActiveMQDestination.QUEUE_TYPE;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
index dd9bcc5aca0..ed6ed2d47d6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
@@ -54,11 +54,14 @@
import org.apache.activemq.store.PersistenceAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author gtully
* @see https://issues.apache.org/activemq/browse/AMQ-2020
**/
+@Category(ParallelTest.class)
public class QueueDuplicatesFromStoreTest extends TestCase {
private static final Logger LOG = LoggerFactory
.getLogger(QueueDuplicatesFromStoreTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
index 1e86ca62987..d5f58081f87 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java
@@ -42,7 +42,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueOptimizedDispatchExceptionTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueOptimizedDispatchExceptionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
index e474034a210..51eadb9c6c4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
@@ -43,14 +43,17 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LogEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class QueuePurgeTest extends CombinationTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(QueuePurgeTest.class);
private static final int NUM_TO_SEND = 20000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
index e429a1c6aca..7c36e7bc330 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
@@ -38,10 +38,13 @@
import org.slf4j.LoggerFactory;
import org.junit.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Confirm that the broker does not resend unacknowledged messages during a broker shutdown.
*/
+@Category(ParallelTest.class)
public class QueueResendDuringShutdownTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueResendDuringShutdownTest.class);
public static final int NUM_CONNECTION_TO_TEST = 8;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
index 9656e5a37e7..e752881f2c1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
@@ -54,7 +54,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SubscriptionAddRemoveQueueTest {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorNpeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorNpeTest.java
index b610f250925..9c768dadd34 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorNpeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorNpeTest.java
@@ -29,6 +29,8 @@
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.test.TestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test shows that a null pointer exception will not occur when unsubscribing from a
@@ -38,6 +40,7 @@
* on AbstractStoreCusor, it will consistently fail with a NPE.
*
*/
+@Category(ParallelTest.class)
public class AbstractStoreCursorNpeTest extends TestSupport {
protected Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java
index 0a7569f1d5a..d7f10a01d6f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java
@@ -25,7 +25,10 @@
import java.util.concurrent.FutureTask;
import static org.junit.Assert.assertFalse;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AbstractStoreCursorTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java
index 82470194acf..208dea49f27 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java
@@ -24,10 +24,13 @@
import jakarta.jms.Session;
import jakarta.jms.Topic;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class CursorDurableTest extends CursorSupport {
protected Destination getDestination(Session session) throws JMSException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java
index 5da4b63739f..226202de33f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java
@@ -29,10 +29,13 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.StorePendingQueueMessageStoragePolicy;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class CursorQueueStoreTest extends CursorSupport {
protected Destination getDestination(Session session) throws JMSException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/FullDestinationMemoryMessageExpirationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/FullDestinationMemoryMessageExpirationTest.java
index 170bee45644..39b9b225036 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/FullDestinationMemoryMessageExpirationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/FullDestinationMemoryMessageExpirationTest.java
@@ -42,13 +42,16 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class FullDestinationMemoryMessageExpirationTest {
private static final Logger LOG = LoggerFactory.getLogger(FullDestinationMemoryMessageExpirationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
index 31776ca7902..ace642fcef6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
@@ -56,6 +56,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that pending message metrics work properly with KahaDB
@@ -64,6 +66,7 @@
*
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class KahaDBPendingMessageCursorTest extends
AbstractPendingMessageCursorTest {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryMessageStoreQueueCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryMessageStoreQueueCursorTest.java
index ccaf0150e37..c1d964c282e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryMessageStoreQueueCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryMessageStoreQueueCursorTest.java
@@ -36,7 +36,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MemoryMessageStoreQueueCursorTest {
private static final Logger LOG = LoggerFactory.getLogger(MemoryMessageStoreQueueCursorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryPendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryPendingMessageCursorTest.java
index b1f537adabf..a9e0373057d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryPendingMessageCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryPendingMessageCursorTest.java
@@ -34,6 +34,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that PendingMessageCursor size statistics work with the MemoryPersistentAdapter
@@ -42,6 +44,7 @@
*
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MemoryPendingMessageCursorTest extends AbstractPendingMessageCursorTest {
protected static final Logger LOG = LoggerFactory
.getLogger(MemoryPendingMessageCursorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
index dbc6d3c63bd..14265252523 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
@@ -24,6 +24,8 @@
import org.apache.activemq.store.kahadb.FilteredKahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.MultiKahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that pending message metrics work properly with MultiKahaDB
@@ -31,6 +33,7 @@
* AMQ-5923
*
*/
+@Category(ParallelTest.class)
public class MultiKahaDBPendingMessageCursorTest extends
KahaDBPendingMessageCursorTest {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
index 74c7686b647..486babddf55 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
@@ -32,7 +32,10 @@
import org.apache.activemq.command.MessageId;
import org.apache.activemq.util.IdGenerator;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class OrderPendingListTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
index a790200cead..1366172133a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
@@ -31,7 +31,10 @@
import org.apache.activemq.command.MessageId;
import org.apache.activemq.util.IdGenerator;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class PrioritizedPendingListTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
index e7d8f6b8962..365dcbd1894 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
@@ -37,7 +37,10 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.usage.SystemUsage;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StoreBasedCursorTest extends TestCase {
protected String bindAddress = "tcp://localhost:60706";
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreCursorRemoveFromCacheTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreCursorRemoveFromCacheTest.java
index 4dd93646ed0..5ad2463b709 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreCursorRemoveFromCacheTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreCursorRemoveFromCacheTest.java
@@ -36,7 +36,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StoreCursorRemoveFromCacheTest {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java
index 6b49c8d5466..35a7c914c75 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java
@@ -20,11 +20,14 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author gtully
* @see https://issues.apache.org/activemq/browse/AMQ-2020
**/
+@Category(ParallelTest.class)
public class StoreQueueCursorJDBCNoDuplicateTest extends StoreQueueCursorNoDuplicateTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorKahaDBNoDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorKahaDBNoDuplicateTest.java
index 11a98d694d1..f5eb02b1d86 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorKahaDBNoDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorKahaDBNoDuplicateTest.java
@@ -22,11 +22,14 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author gtully
* @see https://issues.apache.org/activemq/browse/AMQ-2020
**/
+@Category(ParallelTest.class)
public class StoreQueueCursorKahaDBNoDuplicateTest extends StoreQueueCursorNoDuplicateTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java
index a62748a86b3..8ae1f28206e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java
@@ -18,11 +18,14 @@
package org.apache.activemq.broker.region.cursors;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author gtully
* @see https://issues.apache.org/activemq/browse/AMQ-2020
**/
+@Category(ParallelTest.class)
public class StoreQueueCursorMemoryNoDuplicateTest extends StoreQueueCursorNoDuplicateTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorNoDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorNoDuplicateTest.java
index 2406e88b94c..a4ed9172c20 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorNoDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorNoDuplicateTest.java
@@ -33,11 +33,14 @@
import org.apache.activemq.usage.SystemUsage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author gtully
* https://issues.apache.org/activemq/browse/AMQ-2020
**/
+@Category(ParallelTest.class)
public class StoreQueueCursorNoDuplicateTest extends TestCase {
static final Logger LOG = LoggerFactory.getLogger(StoreQueueCursorNoDuplicateTest.class);
ActiveMQQueue destination = new ActiveMQQueue("queue-"
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
index 771b884d801..a13ca7412db 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
@@ -45,7 +45,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StoreQueueCursorOrderTest {
private static final Logger LOG = LoggerFactory.getLogger(StoreQueueCursorOrderTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java
index fc35be6d2ed..83435233bac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java
@@ -16,11 +16,15 @@
*/
package org.apache.activemq.broker.region.group;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class MessageGroupHashBucketTest extends MessageGroupMapTest {
protected MessageGroupMap createMessageGroupMap() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java
index ab02426cce1..7f7ced2defc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java
@@ -20,11 +20,14 @@
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.SessionId;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class MessageGroupMapTest extends TestCase {
protected MessageGroupMap map;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
index d1f98f27401..8da2e9d2273 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
@@ -27,11 +27,14 @@
import org.apache.activemq.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageGroupTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(CombinationTestSupport.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
index fac787fdf20..9b2d54e275e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
@@ -41,7 +41,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JmsCronSchedulerTest extends JobSchedulerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsCronSchedulerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
index 4e1a1ce5c5c..fc47313769c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
@@ -31,11 +31,13 @@
import org.apache.activemq.util.DefaultTestAppender;
import org.apache.activemq.util.ProducerThread;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +49,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+@Category(ParallelTest.class)
public class JmsSchedulerTest extends JobSchedulerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsSchedulerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerBrokerShutdownTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerBrokerShutdownTest.java
index 7d7d888b7f3..9177632b579 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerBrokerShutdownTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerBrokerShutdownTest.java
@@ -27,7 +27,10 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.util.IOHelper;
import org.apache.activemq.util.ProducerThread;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JobSchedulerBrokerShutdownTest extends EmbeddedBrokerTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
index 31c0649a736..7d79aa7d7fd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
@@ -53,7 +53,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(JobSchedulerManagementTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerRedliveryPluginDLQStoreCleanupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerRedliveryPluginDLQStoreCleanupTest.java
index 5b93e832e41..7fe2979416b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerRedliveryPluginDLQStoreCleanupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerRedliveryPluginDLQStoreCleanupTest.java
@@ -59,10 +59,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test scheduler store GC cleanup with redelivery plugin and rollbacks.
*/
+@Category(ParallelTest.class)
public class JobSchedulerRedliveryPluginDLQStoreCleanupTest {
static final Logger LOG = LoggerFactory.getLogger(JobSchedulerStoreCheckpointTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTxTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTxTest.java
index f6853962ccd..bf67be5643f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTxTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTxTest.java
@@ -32,7 +32,10 @@
import org.apache.activemq.ScheduledMessage;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JobSchedulerTxTest extends JobSchedulerTestSupport {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerWithAdvisoryMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerWithAdvisoryMessageTest.java
index e70d39b24c2..f94fb309d1e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerWithAdvisoryMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerWithAdvisoryMessageTest.java
@@ -21,9 +21,11 @@
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.DestinationInfo;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import jakarta.jms.Connection;
import jakarta.jms.JMSException;
@@ -49,6 +51,7 @@
*
* See https://issues.apache.org/jira/browse/AMQ-9187
*/
+@Category(ParallelTest.class)
public class JobSchedulerWithAdvisoryMessageTest extends JobSchedulerTestSupport {
final AtomicLong uniqueQueueId = new AtomicLong(System.currentTimeMillis());
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java
index 07504ec0669..2115bbfeba0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java
@@ -44,10 +44,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*Test that the store recovers even if some log files are missing.
*/
+@Category(ParallelTest.class)
public class KahaDBSchedulerMissingJournalLogsTest {
static final Logger LOG = LoggerFactory.getLogger(KahaDBSchedulerIndexRebuildTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/LostScheduledMessagesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/LostScheduledMessagesTest.java
index 2b2caf10e72..4c0f27336ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/LostScheduledMessagesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/LostScheduledMessagesTest.java
@@ -39,7 +39,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class LostScheduledMessagesTest {
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/ReduceMemoryFootprintTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/ReduceMemoryFootprintTest.java
index 0f09a6f160b..8e0da8b4ffc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/ReduceMemoryFootprintTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/ReduceMemoryFootprintTest.java
@@ -42,11 +42,14 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Using the broker's scheduler and setting reduceMemoryFootprint="true" causes
* message properties to be lost.
*/
+@Category(ParallelTest.class)
public class ReduceMemoryFootprintTest {
private static final Logger LOG = LoggerFactory.getLogger(ReduceMemoryFootprintTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
index 88a477ef6f8..12f41749cc2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
@@ -45,7 +45,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SchedulerDBVersionTest {
static String basedir;
static {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerRepeatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerRepeatTest.java
index dbe7a8714cb..2ae3633b7a9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerRepeatTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerRepeatTest.java
@@ -33,7 +33,10 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.scheduler.memory.InMemoryJobSchedulerStore;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SchedulerRepeatTest {
private static BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJmsCronSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJmsCronSchedulerTest.java
index a3b7d046884..4a839b27d53 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJmsCronSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJmsCronSchedulerTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.broker.scheduler.memory;
import org.apache.activemq.broker.scheduler.JmsCronSchedulerTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* In memory version of the cron scheduler test.
*/
+@Category(ParallelTest.class)
public class InMemoryJmsCronSchedulerTest extends JmsCronSchedulerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerManagementTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerManagementTest.java
index e65d819e5c1..d9711d7f7ae 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerManagementTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerManagementTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.broker.scheduler.memory;
import org.apache.activemq.broker.scheduler.JobSchedulerManagementTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Tests management of in memory scheduler via JMS client.
*/
+@Category(ParallelTest.class)
public class InMemoryJobSchedulerManagementTest extends JobSchedulerManagementTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTest.java
index 9b86693054b..6606ea1b3e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTest.java
@@ -33,10 +33,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* In-Memory store based variation of the JobSchedulerTest
*/
+@Category(ParallelTest.class)
public class InMemoryJobSchedulerTest {
private static final Logger LOG = LoggerFactory.getLogger(JobSchedulerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTxTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTxTest.java
index fb879058811..158c0febf0e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTxTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/memory/InMemoryJobSchedulerTxTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.broker.scheduler.memory;
import org.apache.activemq.broker.scheduler.JobSchedulerTxTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* In memory version of the TX test case
*/
+@Category(ParallelTest.class)
public class InMemoryJobSchedulerTxTest extends JobSchedulerTxTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java
index 1e0e2a857b1..df4211a9888 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java
@@ -27,11 +27,14 @@
import org.apache.activemq.test.JmsTopicSendReceiveTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class PluginBrokerTest extends JmsTopicSendReceiveTest {
private static final Logger LOG = LoggerFactory.getLogger(PluginBrokerTest.class);
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/RedeliveryPluginTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/RedeliveryPluginTest.java
index dd12768f6d2..9d7c213bb7a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/RedeliveryPluginTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/util/RedeliveryPluginTest.java
@@ -24,7 +24,10 @@
import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class RedeliveryPluginTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(RedeliveryPluginTest.class);
RedeliveryPlugin underTest = new RedeliveryPlugin();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/AMQ9685Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/AMQ9685Test.java
index b5db60cdfc5..ddbf1a8f0ac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/AMQ9685Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/AMQ9685Test.java
@@ -32,7 +32,10 @@
import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ9685Test {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicMemoryUsageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicMemoryUsageTest.java
index ae407730668..0251f19a357 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicMemoryUsageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicMemoryUsageTest.java
@@ -43,11 +43,14 @@
import javax.management.ObjectName;
import java.util.ArrayList;
import java.util.Collection;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test to ensure the CompositeTopic Memory Usage returns to zero after messages forwarded to underlying queues
*/
+@Category(ParallelTest.class)
public class CompositeTopicMemoryUsageTest {
private static final Logger LOG = LoggerFactory.getLogger(CompositeTopicMemoryUsageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java
index 08079a8aaa5..d68fec1b530 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java
@@ -20,11 +20,14 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class CompositeTopicTest extends CompositeQueueTest {
protected Destination getConsumer1Dsetination() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/FilteredQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/FilteredQueueTest.java
index 17a870638cb..ef03b50025f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/FilteredQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/FilteredQueueTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.broker.virtual;
import org.apache.activemq.spring.ConsumerBean;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class FilteredQueueTest extends CompositeQueueTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueUsingVirtualTopicQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueUsingVirtualTopicQueueTest.java
index f9e5213ec09..c7e7ce51a55 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueUsingVirtualTopicQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueUsingVirtualTopicQueueTest.java
@@ -19,11 +19,14 @@
import jakarta.jms.Destination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class MirroredQueueUsingVirtualTopicQueueTest extends MirroredQueueTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MultipleCompositeToPhysicalQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MultipleCompositeToPhysicalQueueTest.java
index fd1bd51d046..7631b0415ae 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MultipleCompositeToPhysicalQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/MultipleCompositeToPhysicalQueueTest.java
@@ -44,10 +44,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* https://issues.apache.org/jira/browse/AMQ-5898
*/
+@Category(ParallelTest.class)
public class MultipleCompositeToPhysicalQueueTest {
private final ActiveMQQueue SUB1 = new ActiveMQQueue("SUB1");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualDestPerfTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualDestPerfTest.java
index f17228bba0d..f5dc5c30d7c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualDestPerfTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualDestPerfTest.java
@@ -47,7 +47,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class VirtualDestPerfTest {
private static final Logger LOG = LoggerFactory.getLogger(VirtualDestPerfTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicPubSubUsingXBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicPubSubUsingXBeanTest.java
index 69523313d51..31570d297c9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicPubSubUsingXBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicPubSubUsingXBeanTest.java
@@ -20,11 +20,14 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.XBeanBrokerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class VirtualTopicPubSubUsingXBeanTest extends VirtualTopicPubSubTest {
protected String getVirtualTopicConsumerName() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java
index 668b827a2ce..9413aaf208f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java
@@ -32,7 +32,10 @@
import org.apache.activemq.spring.ConsumerBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class VirtualTopicSelectorTest extends CompositeTopicTest {
private static final Logger LOG = LoggerFactory.getLogger(VirtualTopicSelectorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorWithAnotherInterceptorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorWithAnotherInterceptorTest.java
index a4a9967bedc..9700b7693f9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorWithAnotherInterceptorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorWithAnotherInterceptorTest.java
@@ -35,7 +35,10 @@
import org.apache.activemq.spring.ConsumerBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class VirtualTopicSelectorWithAnotherInterceptorTest extends CompositeTopicTest {
private static final Logger LOG = LoggerFactory.getLogger(VirtualTopicSelectorWithAnotherInterceptorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicWildcardTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicWildcardTest.java
index 63fa3defdcb..83b8444a32c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicWildcardTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicWildcardTest.java
@@ -43,8 +43,11 @@
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// https://issues.apache.org/jira/browse/AMQ-6643
+@Category(ParallelTest.class)
public class VirtualTopicWildcardTest {
private static final Logger LOG = LoggerFactory.getLogger(VirtualTopicWildcardTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicsAndDurableSubsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicsAndDurableSubsTest.java
index 6da55cf7151..477ed2b194f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicsAndDurableSubsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicsAndDurableSubsTest.java
@@ -25,7 +25,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.spring.ConsumerBean;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class VirtualTopicsAndDurableSubsTest extends MBeanTest {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java
index ce107d4495f..72eb6b1d4f2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java
@@ -37,7 +37,10 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ1893Test extends TestCase {
private static final Logger log = LoggerFactory.getLogger(AMQ1893Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
index 0c702dcdc56..6c67c37421d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
@@ -37,8 +37,11 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ1917Test extends TestCase {
private static final int NUM_MESSAGES = 4000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
index cecc8f88aa8..b38bdb4eae3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
@@ -45,11 +45,14 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* A AMQ1936Test
*
*/
+@Category(ParallelTest.class)
public class AMQ1936Test extends TestCase {
private final static Logger logger = LoggerFactory.getLogger(AMQ1936Test.class);
private final static String TEST_QUEUE_NAME = "dynamicQueues/duplicate.message.test.queue";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
index b9bd08199e3..d7a7a1505a3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
@@ -47,12 +47,15 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This is a test case for the issue reported at: https://issues.apache.org/activemq/browse/AMQ-2021 Bug is modification
* of inflight message properties so the failure can manifest itself in a bunch or ways, from message receipt with null
* properties to marshall errors
*/
+@Category(ParallelTest.class)
public class AMQ2021Test implements ExceptionListener, UncaughtExceptionHandler {
private static final Logger log = LoggerFactory.getLogger(AMQ2021Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java
index 589e47fcc8b..11cc47ad8f5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java
@@ -46,7 +46,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2084Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ2084Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2103Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2103Test.java
index cbb5e4a3a25..7826966644e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2103Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2103Test.java
@@ -35,6 +35,8 @@
import org.junit.Ignore;
import junit.framework.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
@@ -42,6 +44,7 @@
* so this test no longer works
*/
@Ignore
+@Category(ParallelTest.class)
public class AMQ2103Test extends BrokerTestSupport {
static PolicyEntry reduceMemoryFootprint = new PolicyEntry();
static {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2171Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2171Test.java
index 0f57f6c1f25..72c4769b062 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2171Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2171Test.java
@@ -31,7 +31,10 @@
import org.junit.Test;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2171Test implements Thread.UncaughtExceptionHandler {
private static final Logger LOG = LoggerFactory.getLogger(AMQ2171Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2364Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2364Test.java
index 4210ff9cd81..19383c61f91 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2364Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2364Test.java
@@ -45,8 +45,11 @@
import org.apache.activemq.transport.ResponseCorrelator;
import org.apache.activemq.transport.failover.FailoverTransport;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2364Test {
@SuppressWarnings("unchecked")
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
index 6921f32323f..a45359dc599 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
@@ -30,7 +30,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2383Test {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
index 6fcb11f3938..e21f6c8a7f7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
@@ -31,6 +31,7 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,10 +39,12 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.junit.experimental.categories.Category;
/**
* An AMQ-2401 Test
*/
+@Category(ParallelTest.class)
public class AMQ2401Test extends TestCase implements MessageListener {
private BrokerService broker;
private ActiveMQConnectionFactory factory;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2513Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2513Test.java
index 91cf66a5d90..edde183ed62 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2513Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2513Test.java
@@ -28,6 +28,8 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.DestinationViewMBean;
import org.apache.activemq.broker.jmx.ManagementContext;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This unit test verifies an issue when
@@ -35,6 +37,7 @@
* managementContext createConnector="false"
*
*/
+@Category(ParallelTest.class)
public class AMQ2513Test extends TestCase {
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java
index 9bcfdc0a6cc..e5fa6b97baf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java
@@ -45,10 +45,13 @@
import org.apache.activemq.util.IntrospectionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// variation on AMQ2584 where the DLQ consumer works in parallel to producer so
// that some dups are not suppressed as they are already acked by the consumer
// the audit needs to be disabled to allow these dupes to be consumed
+@Category(ParallelTest.class)
public class AMQ2584ConcurrentDlqTest extends org.apache.activemq.TestSupport {
static final Logger LOG = LoggerFactory.getLogger(AMQ2584ConcurrentDlqTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
index c3b63c152e3..72a72864b75 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
@@ -47,8 +47,11 @@
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ2584Test extends org.apache.activemq.TestSupport {
static final Logger LOG = LoggerFactory.getLogger(AMQ2584Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
index b4e832d21d4..e107b0c0062 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2585Test.java
@@ -29,7 +29,10 @@
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.Message;
import org.apache.activemq.spring.ConsumerBean;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2585Test extends EmbeddedBrokerAndConnectionTestSupport {
private final Destination destination = new ActiveMQQueue("MyQueue");
final static String LENGTH10STRING = "1234567890";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
index 0826444ce53..bd3d6e2fe11 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
@@ -42,7 +42,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2616Test {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
index d28479cc8da..d4d2218f142 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
@@ -51,7 +51,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2832Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ2832Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
index 00b1d796ab7..6dd68662bdd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
@@ -43,8 +43,11 @@
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ2870Test extends org.apache.activemq.TestSupport {
static final Logger LOG = LoggerFactory.getLogger(AMQ2870Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
index 3e2e5065392..88c958a90f8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
@@ -33,7 +33,10 @@
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ2902Test extends TestCase {
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(AMQ2580Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2910Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2910Test.java
index 1554cba9481..69a41ac71c5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2910Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2910Test.java
@@ -33,8 +33,11 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class AMQ2910Test extends JmsMultipleClientsTestSupport {
final int maxConcurrency = 60;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2982Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2982Test.java
index a6a470c9eeb..497ac279461 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2982Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2982Test.java
@@ -37,11 +37,14 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AMQ2982Test {
private static final int MAX_MESSAGES = 500;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2983Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2983Test.java
index db3c875f1b9..fe9b66be335 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2983Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2983Test.java
@@ -38,11 +38,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AMQ2983Test {
private static final int MAX_CONSUMER = 10;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
index a0aa8cb51ef..c1aae39b5f4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
@@ -40,7 +40,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3140Test {
private static final int MESSAGES_PER_THREAD = 100;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3166Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3166Test.java
index 66d9a108a32..fd9951beff1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3166Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3166Test.java
@@ -50,7 +50,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3166Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ3166Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
index 81b0e2b7d6c..1822a2f7d34 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
@@ -43,7 +43,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3274Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ3274Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3324Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3324Test.java
index 5a7e688fc8b..33d95b1884a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3324Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3324Test.java
@@ -42,7 +42,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3324Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ3324Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3352Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3352Test.java
index 132fca9f0c6..2b6b4d08785 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3352Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3352Test.java
@@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3352Test
{
TransportConnector connector;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3405Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3405Test.java
index 35999508c65..2cf163ecaf2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3405Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3405Test.java
@@ -46,7 +46,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3405Test extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AMQ3405Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3445Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3445Test.java
index cbfaf8115c9..75ba6804704 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3445Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3445Test.java
@@ -33,7 +33,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3445Test {
private ConnectionFactory connectionFactory;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
index 79566e85ff9..a371c2639ec 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
@@ -30,6 +30,8 @@
import org.apache.activemq.util.ClassLoadingAwareObjectInputStream;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Quick port to java to support AMQ build.
@@ -48,6 +50,7 @@
*
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
+@Category(ParallelTest.class)
public class AMQ3537Test implements InvocationHandler, Serializable {
static {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java
index efa962ffcf4..46f26abc16a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java
@@ -33,11 +33,14 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class AMQ3625Test {
protected BrokerService broker1;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
index 8b179ecc8c8..24a4dd8233a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
@@ -36,7 +36,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3674Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ3674Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3675Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3675Test.java
index fc0dddf6e90..2a8265f83cf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3675Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3675Test.java
@@ -38,7 +38,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3675Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ3675Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3678Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3678Test.java
index 83c2dfdcb90..d14b9a60b67 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3678Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3678Test.java
@@ -40,7 +40,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3678Test implements MessageListener {
private static Logger LOG = LoggerFactory.getLogger(AMQ3678Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3841Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3841Test.java
index 449d5e55397..266ccfd68a6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3841Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3841Test.java
@@ -34,7 +34,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3841Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ3841Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3932Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3932Test.java
index ec9d68a03e6..0347f04f6c3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3932Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3932Test.java
@@ -24,9 +24,11 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +40,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class AMQ3932Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ3932Test.class);
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3934Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3934Test.java
index ab019889944..59e3f15bace 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3934Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3934Test.java
@@ -37,7 +37,10 @@
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3934Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ3934Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3961Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3961Test.java
index fd962765e2f..1fcf6c1ba06 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3961Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3961Test.java
@@ -40,7 +40,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3961Test {
private static BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3992Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3992Test.java
index 0be1898d0cb..a551e6d82e7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3992Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3992Test.java
@@ -34,7 +34,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ3992Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ3992Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4083Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4083Test.java
index f395605c897..26a8c4daa7e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4083Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4083Test.java
@@ -44,7 +44,10 @@
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4083Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ3992Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4092Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4092Test.java
index edfee4ee5b8..055c72103d2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4092Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4092Test.java
@@ -39,7 +39,10 @@
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4092Test extends TestCase {
private static final Logger log = LoggerFactory.getLogger(AMQ4092Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4126Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4126Test.java
index 60245f08b7e..759eb2502e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4126Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4126Test.java
@@ -35,10 +35,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class AMQ4126Test {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4133Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4133Test.java
index 6474088084c..18ec3214ff7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4133Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4133Test.java
@@ -32,7 +32,10 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import java.net.Socket;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4133Test {
protected String java_security_auth_login_config = "java.security.auth.login.config";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java
index 335dfb0feeb..f34fb2ccf11 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java
@@ -29,12 +29,15 @@
import org.apache.activemq.network.DemandForwardingBridgeSupport;
import org.apache.activemq.util.MessageIdList;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test demonstrates a bug in {@link DemandForwardingBridgeSupport} when
* bridges are VM-to-VM. Specifically, memory usage from the local broker is
* manipulated by the remote broker.
*/
+@Category(ParallelTest.class)
public class AMQ4147Test extends JmsMultipleBrokersTestSupport {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4148Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4148Test.java
index 906131ef181..4e5da4e816c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4148Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4148Test.java
@@ -29,6 +29,8 @@
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.Wait;
import org.junit.Assert;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test demonstrates a bug in {@link DemandForwardingBridgeSupport} whereby
@@ -36,6 +38,7 @@
* though the network TTL is 1. This results in duplicate subscriptions on
* broker3.
*/
+@Category(ParallelTest.class)
public class AMQ4148Test extends JmsMultipleBrokersTestSupport {
public void test() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java
index ea67580d3e1..e325327849d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java
@@ -43,8 +43,11 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4157Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ4157Test.class);
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4160Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4160Test.java
index 5563ded869e..b2bddbd89c5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4160Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4160Test.java
@@ -43,6 +43,8 @@
import org.apache.activemq.transport.discovery.DiscoveryListener;
import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
import org.junit.Assert;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test demonstrates a number of race conditions in
@@ -50,6 +52,7 @@
* longer being reported as active and vice-versa, an inactive bridge still
* being reported as active.
*/
+@Category(ParallelTest.class)
public class AMQ4160Test extends JmsMultipleBrokersTestSupport {
final long MAX_TEST_TIME = TimeUnit.MINUTES.toMillis(2);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4212Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4212Test.java
index 0e6af817db8..bcc871edbfb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4212Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4212Test.java
@@ -48,7 +48,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4212Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4212Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4220Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4220Test.java
index 7084bde44c1..500293ba565 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4220Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4220Test.java
@@ -34,7 +34,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4220Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ4220Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4221Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4221Test.java
index 5c727553247..882c5e44909 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4221Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4221Test.java
@@ -54,7 +54,10 @@
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4221Test extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4221Test.class);
public int PAYLOAD_SIZE_BYTES = 4 * 1024;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4222Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4222Test.java
index da6e6fe5b5b..65f2680cf07 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4222Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4222Test.java
@@ -45,10 +45,13 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Christian Posta
*/
+@Category(ParallelTest.class)
public class AMQ4222Test extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4222Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4356Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4356Test.java
index c4414a70434..dbfd39285e2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4356Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4356Test.java
@@ -33,7 +33,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4356Test {
private static BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4407Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4407Test.java
index 516c81f5d9b..6937c928e2d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4407Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4407Test.java
@@ -42,7 +42,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4407Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ4407Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4472Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4472Test.java
index e8ed528387e..d1f5e82375a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4472Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4472Test.java
@@ -32,7 +32,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4472Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4472Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4475Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4475Test.java
index 8151d13d43a..1888e4455e8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4475Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4475Test.java
@@ -49,7 +49,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4475Test {
private final Log LOG = LogFactory.getLog(AMQ4475Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
index 117c7c7dfa4..f4f7ee86256 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
@@ -59,7 +59,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport {
static final String payload = new String(new byte[10 * 1024]);
private static final Logger LOG = LoggerFactory.getLogger(AMQ4485LowLimitTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
index 3867d7687ee..83231da4b68 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
@@ -91,7 +91,6 @@ protected BrokerService createBroker(int brokerid) throws Exception {
broker.setDeleteAllMessagesOnStartup(true);
broker.getManagementContext().setCreateConnector(false);
-
broker.setUseJmx(true);
broker.setBrokerName("B" + brokerid);
broker.addConnector(new URI("tcp://localhost:0"));
@@ -100,7 +99,6 @@ protected BrokerService createBroker(int brokerid) throws Exception {
broker.getSystemUsage().setSendFailIfNoSpace(true);
broker.getSystemUsage().getMemoryUsage().setLimit(512 * 1024 * 1024);
-
PolicyMap policyMap = new PolicyMap();
PolicyEntry policyEntry = new PolicyEntry();
policyEntry.setExpireMessagesPeriod(0);
@@ -156,7 +154,6 @@ public void testBrokers() throws Exception {
verifyPeerBrokerInfos(numBrokers - 1);
-
final List consumerStates = startAllGWConsumers(numBrokers);
startAllGWFanoutConsumers(numBrokers);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485Test.java
index c1bc99fccfc..fc72ee9939d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485Test.java
@@ -46,7 +46,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4485Test extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4485Test.class);
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
index 864fa3a6abd..75f247400d7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
@@ -31,7 +31,10 @@
import static org.junit.Assert.assertNotNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4504Test {
BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4513Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4513Test.java
index 49cbe82fea5..858541a0bd5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4513Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4513Test.java
@@ -38,7 +38,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4513Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4517Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4517Test.java
index cbd08cadc63..e605a4513d2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4517Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4517Test.java
@@ -44,7 +44,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4517Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4518Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4518Test.java
index 6177b57c61f..0d6b9a94dfc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4518Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4518Test.java
@@ -44,7 +44,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4518Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4530Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4530Test.java
index 2bfe77617ac..ee8499628c1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4530Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4530Test.java
@@ -43,7 +43,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4530Test {
private static BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4531Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4531Test.java
index cb3de24fa03..78ce1beb5d3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4531Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4531Test.java
@@ -35,10 +35,13 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Unit test for simple App.
*/
+@Category(ParallelTest.class)
public class AMQ4531Test extends TestCase {
private final Logger LOG = LoggerFactory.getLogger(AMQ4531Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4554Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4554Test.java
index c2b727aade3..c50f86069a3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4554Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4554Test.java
@@ -31,10 +31,13 @@
import org.apache.activemq.broker.BrokerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Unit test for simple App.
*/
+@Category(ParallelTest.class)
public class AMQ4554Test extends TestCase {
private final Logger LOG = LoggerFactory.getLogger(AMQ4554Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4595Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4595Test.java
index 8c81d4c273d..505cae24155 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4595Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4595Test.java
@@ -39,7 +39,10 @@
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4595Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4595Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
index e38eddd460f..ba317058e25 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
@@ -37,7 +37,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4607Test extends JmsMultipleBrokersTestSupport implements UncaughtExceptionHandler {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4607Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
index b43b9349167..ecd7025bbbd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
@@ -45,6 +45,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Testing how the broker reacts when a SQL Exception is thrown from
@@ -52,6 +54,7 @@
*
* see https://issues.apache.org/jira/browse/AMQ-4636
*/
+@Category(ParallelTest.class)
public class AMQ4636Test {
private static final String MY_TEST_TOPIC = "MY_TEST_TOPIC";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4656Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4656Test.java
index 594baa36cda..3a5a5b023a0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4656Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4656Test.java
@@ -41,15 +41,18 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.StorePendingDurableSubscriberMessageStoragePolicy;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ4656Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ4656Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4853Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4853Test.java
index 91a9fc53057..2cfddd56e14 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4853Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4853Test.java
@@ -49,7 +49,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4853Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ4853Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4887Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4887Test.java
index 6898d36fa05..4ccff717897 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4887Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4887Test.java
@@ -36,7 +36,10 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4887Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ4887Test.class);
private static final Integer ITERATIONS = 10;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4893Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4893Test.java
index c1f0707b842..2824326a4b7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4893Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4893Test.java
@@ -28,7 +28,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4893Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ4893Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4930Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4930Test.java
index b0521ba611d..b5c4f87bc14 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4930Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4930Test.java
@@ -33,7 +33,10 @@
import org.apache.activemq.command.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ4930Test extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(AMQ4930Test.class);
final int messageCount = 150;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5212Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5212Test.java
index ad4d0f65f5a..782be854efc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5212Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5212Test.java
@@ -48,8 +48,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ5212Test {
BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java
index cef6fcf8a00..8b1b5c3810c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java
@@ -33,11 +33,13 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +61,7 @@
* pause producers if consumers stall and verify broker drained before resume
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ5266StarvedConsumerTest {
static Logger LOG = LoggerFactory.getLogger(AMQ5266StarvedConsumerTest.class);
String activemqURL;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5274Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5274Test.java
index e4238a365ec..ce26ad54e1a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5274Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5274Test.java
@@ -42,7 +42,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ5274Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ5274Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5336Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5336Test.java
index 7886c6e2751..50382fe1fea 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5336Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5336Test.java
@@ -27,10 +27,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for priority backup URI handling.
*/
+@Category(ParallelTest.class)
public class AMQ5336Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5426Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5426Test.java
index fab80b07bdc..3cc291f380b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5426Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5426Test.java
@@ -41,6 +41,7 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LogEvent;
@@ -51,9 +52,11 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class AMQ5426Test {
private static final Logger LOG = LoggerFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5486Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5486Test.java
index 85d7b03f09e..6de06c6d769 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5486Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5486Test.java
@@ -23,9 +23,11 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jms.support.JmsUtils;
@@ -41,6 +43,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class AMQ5486Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ5486Test.class);
private static final int maxConnections = 100;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5712Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5712Test.java
index 70fe46870f9..3ec7c85cf28 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5712Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5712Test.java
@@ -56,10 +56,13 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test behavior of senders when broker side producer flow control kicks in.
*/
+@Category(ParallelTest.class)
public class AMQ5712Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ5712Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5814Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5814Test.java
index 94d87cce3d6..3f047afa4be 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5814Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5814Test.java
@@ -42,7 +42,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ5814Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5844Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5844Test.java
index 90fc88fc2d0..13f866aadbc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5844Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5844Test.java
@@ -57,11 +57,14 @@
import jakarta.jms.TextMessage;
import jakarta.jms.TransactionRolledBackException;
import java.io.IOException;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* The FailoverTransport maintains state is the ConnectionStateTracker object. Aborted slow consumers must be removed
* from this state tracker so that the FailoverTransport does not re-register the aborted slow consumers.
*/
+@Category(ParallelTest.class)
public class AMQ5844Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ5844Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5893Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5893Test.java
index 8b04218a9b4..16e3012f9bc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5893Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5893Test.java
@@ -44,7 +44,10 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ5893Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ5893Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6000Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6000Test.java
index 12512e45c32..97d5f14af55 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6000Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6000Test.java
@@ -40,10 +40,13 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for AMQ-6000 issue with pause / resume feature.
*/
+@Category(ParallelTest.class)
public class AMQ6000Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ6000Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6059Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6059Test.java
index 5e06ca90b96..8fbc6337a07 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6059Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6059Test.java
@@ -50,10 +50,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Once the wire format is completed we can test against real persistence storage.
*/
+@Category(ParallelTest.class)
public class AMQ6059Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6059Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6094Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6094Test.java
index 3c53be59f50..539b88b5d76 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6094Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6094Test.java
@@ -39,7 +39,10 @@
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6094Test {
private static Logger LOG = LoggerFactory.getLogger(AMQ6094Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6117Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6117Test.java
index e00a0f5a9c5..e46b1866204 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6117Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6117Test.java
@@ -47,10 +47,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class AMQ6117Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6117Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6122Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6122Test.java
index 797a9ec788f..25121325d50 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6122Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6122Test.java
@@ -42,7 +42,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6122Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
index 1c28d64504f..844c62db426 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
@@ -50,10 +50,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This class is to show that a durable can lose messages after index deletion.
*/
+@Category(ParallelTest.class)
public class AMQ6131Test {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6133PersistJMSRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6133PersistJMSRedeliveryTest.java
index f281a6b8797..5989ca72d02 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6133PersistJMSRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6133PersistJMSRedeliveryTest.java
@@ -55,10 +55,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test loss of message on index rebuild when presistJMSRedelivered is on.
*/
+@Category(ParallelTest.class)
public class AMQ6133PersistJMSRedeliveryTest {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6133PersistJMSRedeliveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
index ff030b435f5..e936693c1f5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
@@ -38,12 +38,15 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test that statistics for a sent message are properly counted for a temporary destination
* whether inside a transaction or not.
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ6194Test {
private boolean transaction;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6244Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6244Test.java
index d62c94d73f5..cb054274019 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6244Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6244Test.java
@@ -38,7 +38,10 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6244Test {
public static final byte[] ORIG_MSG_CONTENT = randomByteArray();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6254Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6254Test.java
index 9b2a66bd9a7..14c0b5dea9a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6254Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6254Test.java
@@ -61,8 +61,11 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ6254Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6254Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6264Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6264Test.java
index 59de6d788e3..74407b0c7e5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6264Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6264Test.java
@@ -41,7 +41,10 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6264Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6264Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6293Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6293Test.java
index 1b2b582bca1..25ad3581320 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6293Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6293Test.java
@@ -44,7 +44,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6293Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ6293Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6387Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6387Test.java
index 4898169d0d8..a0882bf0560 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6387Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6387Test.java
@@ -1,268 +1,271 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.bugs;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import jakarta.jms.BytesMessage;
-import jakarta.jms.Connection;
-import jakarta.jms.DeliveryMode;
-import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
-import jakarta.jms.MessageConsumer;
-import jakarta.jms.MessageProducer;
-import jakarta.jms.Queue;
-import jakarta.jms.Session;
-import jakarta.jms.Topic;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.jmx.QueueViewMBean;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.usage.MemoryUsage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AMQ6387Test {
-
- private static final Logger LOG = LoggerFactory.getLogger(AMQ6387Test.class);
-
- private final String QUEUE_NAME = "testQueue";
- private final String TOPIC_NAME = "testTopic";
- private final String SUBSCRIPTION_NAME = "subscriberId";
- private final String CLIENT_ID = "client1";
- private final int MSG_COUNT = 150;
-
- private ActiveMQConnectionFactory connectionFactory;
- private BrokerService brokerService;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void setUp() throws Exception {
-
- LOG.info("=============== Starting test: {} ====================", testName.getMethodName());
-
- brokerService = new BrokerService();
- brokerService.setAdvisorySupport(false);
- brokerService.setPersistent(false);
- brokerService.setUseJmx(true);
- brokerService.setKeepDurableSubsActive(false);
- brokerService.start();
- connectionFactory = new ActiveMQConnectionFactory(brokerService.getVmConnectorURI());
- }
-
- @After
- public void tearDown() throws Exception {
- brokerService.stop();
-
- LOG.info("=============== Finished test: {} ====================", testName.getMethodName());
- }
-
- @Test
- public void testQueueMessagesKeptAfterDelivery() throws Exception {
- createDurableSubscription();
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- sendBytesMessage(Queue.class);
-
- logBrokerMemoryUsage(Queue.class);
-
- assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
-
- receiveMessages(Queue.class);
-
- assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
-
- logBrokerMemoryUsage(Queue.class);
-
- assertEquals(0, getCurrentMemoryUsage(Queue.class));
- }
-
- @Test
- public void testQueueMessagesKeptAfterPurge() throws Exception {
- createDurableSubscription();
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- sendBytesMessage(Queue.class);
-
- logBrokerMemoryUsage(Queue.class);
-
- assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
-
- getProxyToQueue(QUEUE_NAME).purge();
-
- assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
-
- logBrokerMemoryUsage(Queue.class);
-
- assertEquals(0, getCurrentMemoryUsage(Queue.class));
- }
-
- @Test
- public void testDurableTopicSubscriptionMessagesKeptAfterDelivery() throws Exception {
- createDurableSubscription();
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- sendBytesMessage(Topic.class);
-
- logBrokerMemoryUsage(Topic.class);
-
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- receiveMessages(Topic.class);
-
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- logBrokerMemoryUsage(Topic.class);
-
- assertEquals(0, getCurrentMemoryUsage(Topic.class));
- }
-
- @Test
- public void testDurableTopicSubscriptionMessagesKeptAfterUnsubscribe() throws Exception {
- createDurableSubscription();
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- sendBytesMessage(Topic.class);
-
- logBrokerMemoryUsage(Topic.class);
-
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- unsubscribeDurableSubscription();
-
- assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
- assertEquals(0, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
-
- logBrokerMemoryUsage(Topic.class);
-
- assertEquals(0, getCurrentMemoryUsage(Topic.class));
- }
-
- private void createDurableSubscription() throws JMSException {
- final Connection connection = connectionFactory.createConnection();
- connection.setClientID(CLIENT_ID);
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- final Topic topic = session.createTopic(TOPIC_NAME);
- connection.start();
-
- session.createDurableSubscriber(topic, SUBSCRIPTION_NAME, null, false);
- LOG.info("Created durable subscription.");
-
- connection.stop();
- connection.close();
- }
-
- private void receiveMessages(Class destType) throws JMSException {
- final Connection connection = connectionFactory.createConnection();
- connection.setClientID(CLIENT_ID);
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- final Destination destination;
- if (destType.equals(Queue.class)) {
- destination = session.createQueue(QUEUE_NAME);
- } else {
- destination = session.createTopic(TOPIC_NAME);
- }
-
- final MessageConsumer consumer;
- if (destType.equals(Queue.class)) {
- consumer = session.createConsumer(destination);
- } else {
- consumer = session.createDurableSubscriber((Topic) destination, SUBSCRIPTION_NAME, null, false);
- }
-
- connection.start();
-
- for (int i = 0; i < MSG_COUNT; ++i) {
- assertNotNull(consumer.receive(5000));
- }
-
- connection.close();
- }
-
- private void sendBytesMessage(Class destType) throws JMSException {
- final Connection connection = connectionFactory.createConnection();
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- final Destination destination;
- if (destType.equals(Queue.class)) {
- destination = session.createQueue(QUEUE_NAME);
- } else {
- destination = session.createTopic(TOPIC_NAME);
- }
- final MessageProducer producer = session.createProducer(destination);
- final BytesMessage bytesMessage = session.createBytesMessage();
-
- bytesMessage.writeBytes(new byte[1024 * 1024]);
-
- producer.setDeliveryMode(DeliveryMode.PERSISTENT);
- for (int i = 0; i < MSG_COUNT; ++i) {
- producer.send(bytesMessage);
- }
-
- connection.close();
- }
-
- private void unsubscribeDurableSubscription() throws JMSException {
- final Connection connection = connectionFactory.createConnection();
- connection.setClientID(CLIENT_ID);
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- session.unsubscribe(SUBSCRIPTION_NAME);
- LOG.info("Unsubscribed durable subscription.");
-
- connection.stop();
- connection.close();
- }
-
- private long getCurrentMemoryUsage(Class destType) throws Exception {
- final MemoryUsage usage;
- if (destType.equals(Queue.class)) {
- usage = brokerService.getDestination(ActiveMQDestination.createDestination(QUEUE_NAME, ActiveMQDestination.QUEUE_TYPE)).getMemoryUsage();
- } else {
- usage = brokerService.getDestination(ActiveMQDestination.createDestination(TOPIC_NAME, ActiveMQDestination.TOPIC_TYPE)).getMemoryUsage();
- }
-
- return usage.getUsage();
- }
-
- private void logBrokerMemoryUsage(Class destType) throws Exception {
- LOG.info("Memory usage: broker={}% destination={}", brokerService.getAdminView().getMemoryPercentUsage(), getCurrentMemoryUsage(destType));
- }
-
- protected QueueViewMBean getProxyToQueue(String name) throws MalformedObjectNameException, JMSException {
- ObjectName queueViewMBeanName = new ObjectName("org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName="+name);
- QueueViewMBean proxy = (QueueViewMBean) brokerService.getManagementContext()
- .newProxyInstance(queueViewMBeanName, QueueViewMBean.class, true);
- return proxy;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import jakarta.jms.BytesMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.QueueViewMBean;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.usage.MemoryUsage;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
+@Category(ParallelTest.class)
+public class AMQ6387Test {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AMQ6387Test.class);
+
+ private final String QUEUE_NAME = "testQueue";
+ private final String TOPIC_NAME = "testTopic";
+ private final String SUBSCRIPTION_NAME = "subscriberId";
+ private final String CLIENT_ID = "client1";
+ private final int MSG_COUNT = 150;
+
+ private ActiveMQConnectionFactory connectionFactory;
+ private BrokerService brokerService;
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Before
+ public void setUp() throws Exception {
+
+ LOG.info("=============== Starting test: {} ====================", testName.getMethodName());
+
+ brokerService = new BrokerService();
+ brokerService.setAdvisorySupport(false);
+ brokerService.setPersistent(false);
+ brokerService.setUseJmx(true);
+ brokerService.setKeepDurableSubsActive(false);
+ brokerService.start();
+ connectionFactory = new ActiveMQConnectionFactory(brokerService.getVmConnectorURI());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ brokerService.stop();
+
+ LOG.info("=============== Finished test: {} ====================", testName.getMethodName());
+ }
+
+ @Test
+ public void testQueueMessagesKeptAfterDelivery() throws Exception {
+ createDurableSubscription();
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ sendBytesMessage(Queue.class);
+
+ logBrokerMemoryUsage(Queue.class);
+
+ assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
+
+ receiveMessages(Queue.class);
+
+ assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
+
+ logBrokerMemoryUsage(Queue.class);
+
+ assertEquals(0, getCurrentMemoryUsage(Queue.class));
+ }
+
+ @Test
+ public void testQueueMessagesKeptAfterPurge() throws Exception {
+ createDurableSubscription();
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ sendBytesMessage(Queue.class);
+
+ logBrokerMemoryUsage(Queue.class);
+
+ assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
+
+ getProxyToQueue(QUEUE_NAME).purge();
+
+ assertEquals(0, brokerService.getAdminView().getQueueSubscribers().length);
+
+ logBrokerMemoryUsage(Queue.class);
+
+ assertEquals(0, getCurrentMemoryUsage(Queue.class));
+ }
+
+ @Test
+ public void testDurableTopicSubscriptionMessagesKeptAfterDelivery() throws Exception {
+ createDurableSubscription();
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ sendBytesMessage(Topic.class);
+
+ logBrokerMemoryUsage(Topic.class);
+
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ receiveMessages(Topic.class);
+
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ logBrokerMemoryUsage(Topic.class);
+
+ assertEquals(0, getCurrentMemoryUsage(Topic.class));
+ }
+
+ @Test
+ public void testDurableTopicSubscriptionMessagesKeptAfterUnsubscribe() throws Exception {
+ createDurableSubscription();
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ sendBytesMessage(Topic.class);
+
+ logBrokerMemoryUsage(Topic.class);
+
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(1, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ unsubscribeDurableSubscription();
+
+ assertEquals(0, brokerService.getAdminView().getDurableTopicSubscribers().length);
+ assertEquals(0, brokerService.getAdminView().getInactiveDurableTopicSubscribers().length);
+
+ logBrokerMemoryUsage(Topic.class);
+
+ assertEquals(0, getCurrentMemoryUsage(Topic.class));
+ }
+
+ private void createDurableSubscription() throws JMSException {
+ final Connection connection = connectionFactory.createConnection();
+ connection.setClientID(CLIENT_ID);
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final Topic topic = session.createTopic(TOPIC_NAME);
+ connection.start();
+
+ session.createDurableSubscriber(topic, SUBSCRIPTION_NAME, null, false);
+ LOG.info("Created durable subscription.");
+
+ connection.stop();
+ connection.close();
+ }
+
+ private void receiveMessages(Class destType) throws JMSException {
+ final Connection connection = connectionFactory.createConnection();
+ connection.setClientID(CLIENT_ID);
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final Destination destination;
+ if (destType.equals(Queue.class)) {
+ destination = session.createQueue(QUEUE_NAME);
+ } else {
+ destination = session.createTopic(TOPIC_NAME);
+ }
+
+ final MessageConsumer consumer;
+ if (destType.equals(Queue.class)) {
+ consumer = session.createConsumer(destination);
+ } else {
+ consumer = session.createDurableSubscriber((Topic) destination, SUBSCRIPTION_NAME, null, false);
+ }
+
+ connection.start();
+
+ for (int i = 0; i < MSG_COUNT; ++i) {
+ assertNotNull(consumer.receive(5000));
+ }
+
+ connection.close();
+ }
+
+ private void sendBytesMessage(Class destType) throws JMSException {
+ final Connection connection = connectionFactory.createConnection();
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final Destination destination;
+ if (destType.equals(Queue.class)) {
+ destination = session.createQueue(QUEUE_NAME);
+ } else {
+ destination = session.createTopic(TOPIC_NAME);
+ }
+ final MessageProducer producer = session.createProducer(destination);
+ final BytesMessage bytesMessage = session.createBytesMessage();
+
+ bytesMessage.writeBytes(new byte[1024 * 1024]);
+
+ producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+ for (int i = 0; i < MSG_COUNT; ++i) {
+ producer.send(bytesMessage);
+ }
+
+ connection.close();
+ }
+
+ private void unsubscribeDurableSubscription() throws JMSException {
+ final Connection connection = connectionFactory.createConnection();
+ connection.setClientID(CLIENT_ID);
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ session.unsubscribe(SUBSCRIPTION_NAME);
+ LOG.info("Unsubscribed durable subscription.");
+
+ connection.stop();
+ connection.close();
+ }
+
+ private long getCurrentMemoryUsage(Class destType) throws Exception {
+ final MemoryUsage usage;
+ if (destType.equals(Queue.class)) {
+ usage = brokerService.getDestination(ActiveMQDestination.createDestination(QUEUE_NAME, ActiveMQDestination.QUEUE_TYPE)).getMemoryUsage();
+ } else {
+ usage = brokerService.getDestination(ActiveMQDestination.createDestination(TOPIC_NAME, ActiveMQDestination.TOPIC_TYPE)).getMemoryUsage();
+ }
+
+ return usage.getUsage();
+ }
+
+ private void logBrokerMemoryUsage(Class destType) throws Exception {
+ LOG.info("Memory usage: broker={}% destination={}", brokerService.getAdminView().getMemoryPercentUsage(), getCurrentMemoryUsage(destType));
+ }
+
+ protected QueueViewMBean getProxyToQueue(String name) throws MalformedObjectNameException, JMSException {
+ ObjectName queueViewMBeanName = new ObjectName("org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName="+name);
+ QueueViewMBean proxy = (QueueViewMBean) brokerService.getManagementContext()
+ .newProxyInstance(queueViewMBeanName, QueueViewMBean.class, true);
+ return proxy;
+ }
+}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6432Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6432Test.java
index 61929987a7e..3f951d47c53 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6432Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6432Test.java
@@ -54,7 +54,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6432Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6432Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
index e89be6720c0..77269094a11 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
@@ -43,11 +43,14 @@
import java.util.List;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Ensure the tempPercentUsage JMX attribute decreases after temp store usage is decreased
*
*/
+@Category(ParallelTest.class)
public class AMQ6459Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ6459Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6579Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6579Test.java
index a892ebaf3ff..9ce9dfebae0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6579Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6579Test.java
@@ -38,7 +38,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6579Test {
protected BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6599Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6599Test.java
index 72c9b88ddc8..08d43b60e38 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6599Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6599Test.java
@@ -34,8 +34,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ6599Test {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6815Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6815Test.java
index e2a75633a41..15a9ab968c0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6815Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6815Test.java
@@ -30,9 +30,11 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +42,7 @@
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class AMQ6815Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ6815Test.class);
private final static int MEM_LIMIT = 1024*1024; // 1 MB
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7013Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7013Test.java
index 87e21a3004d..083b177f41e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7013Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7013Test.java
@@ -20,7 +20,10 @@
import org.junit.Test;
import static org.junit.Assert.assertNotEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ7013Test {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7077Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7077Test.java
index cc1eaed8e4d..fff251db17e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7077Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7077Test.java
@@ -41,7 +41,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ7077Test {
private static final Logger LOG = LoggerFactory.getLogger(AMQ7077Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7185Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7185Test.java
index d83b12781fa..8c82735496c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7185Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7185Test.java
@@ -35,7 +35,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ7185Test
{
private final String xaDestinationName = "DestinationXA";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7270Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7270Test.java
index 8b173f25d84..1291d3c6fc8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7270Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7270Test.java
@@ -32,7 +32,10 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ7270Test extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(AMQ7270Test.class);
final int messageCount = 150;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ9475Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ9475Test.java
index e5ed5e24ad2..fdc8797f7fa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ9475Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ9475Test.java
@@ -40,6 +40,8 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This tests that subscribing to a wildcard and sending a ConsumerControl
@@ -47,6 +49,7 @@
* by mistake.
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ9475Test {
@Parameters(name = "queue={0}")
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/CursorMemoryHighWaterMarkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/CursorMemoryHighWaterMarkTest.java
index be650b1d3a9..66d085b2b1f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/CursorMemoryHighWaterMarkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/CursorMemoryHighWaterMarkTest.java
@@ -36,11 +36,14 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* ensure a message will be pages in from the store when another dest has stopped caching
*/
+@Category(ParallelTest.class)
public class CursorMemoryHighWaterMarkTest {
private static final Logger LOG = LoggerFactory
.getLogger(CursorMemoryHighWaterMarkTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
index 753e41aa2c5..4394c3ddbf7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
@@ -48,7 +48,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DuplicateFromStoreTest {
static Logger LOG = LoggerFactory.getLogger(DuplicateFromStoreTest.class);
String activemqURL;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JMSQueueBrowserPriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JMSQueueBrowserPriorityTest.java
index 8bb9bd327c2..ac6fc8ae75e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JMSQueueBrowserPriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JMSQueueBrowserPriorityTest.java
@@ -35,8 +35,11 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// https://issues.apache.org/jira/browse/AMQ-6128
+@Category(ParallelTest.class)
public class JMSQueueBrowserPriorityTest extends TestCase {
static final Logger LOG = LoggerFactory.getLogger(JMSQueueBrowserPriorityTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
index 835d14a8dab..dd0cc5cdbe7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
@@ -33,10 +33,13 @@
import org.apache.activemq.test.JmsTopicSendReceiveTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableTopicSlowReceiveTest extends JmsTopicSendReceiveTest {
static final int NMSG = 200;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxRecoveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxRecoveryTest.java
index 5ea39e17995..38ec5b38d87 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxRecoveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxRecoveryTest.java
@@ -65,7 +65,10 @@
import java.util.concurrent.atomic.AtomicReference;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MKahaDBTxRecoveryTest {
static final Logger LOG = LoggerFactory.getLogger(MKahaDBTxRecoveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxVirtualTopicTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxVirtualTopicTest.java
index 6340825f5ad..b2ce3dc453e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxVirtualTopicTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MKahaDBTxVirtualTopicTest.java
@@ -56,8 +56,11 @@
import static org.apache.activemq.util.TestUtils.createXid;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MKahaDBTxVirtualTopicTest {
static final Logger LOG = LoggerFactory.getLogger(MKahaDBTxVirtualTopicTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBrokerTest.java
index ee3dd0cf620..81ad6065e31 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBrokerTest.java
@@ -27,9 +27,12 @@
import jakarta.jms.*;
import java.io.File;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MemoryUsageBrokerTest extends BrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(MemoryUsageBrokerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
index d133b22c2e5..f502becb865 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
@@ -35,11 +35,14 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test to determine if expired messages are being reaped if there is
* no active consumer connected to the broker.
*/
+@Category(ParallelTest.class)
public class MessageExpirationReaperTest {
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryClientSideTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryClientSideTest.java
index 8d3aa70da76..698b200d599 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryClientSideTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryClientSideTest.java
@@ -41,7 +41,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MessageExpiryClientSideTest {
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryTimeDifferenceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryTimeDifferenceTest.java
index 75243cfd8d3..4aae272891c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryTimeDifferenceTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MessageExpiryTimeDifferenceTest.java
@@ -50,7 +50,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MessageExpiryTimeDifferenceTest {
public static final String QUEUE_NAME = "timeout.test";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MultiKahaDBMultipleFilteredAdapterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MultiKahaDBMultipleFilteredAdapterTest.java
index b292ba39f2a..e259f89e5d5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MultiKahaDBMultipleFilteredAdapterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MultiKahaDBMultipleFilteredAdapterTest.java
@@ -40,7 +40,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MultiKahaDBMultipleFilteredAdapterTest {
private final static int maxFileLength = 1024*1024*32;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/PfcTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/PfcTimeoutTest.java
index 556b5d298eb..15680c550fe 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/PfcTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/PfcTimeoutTest.java
@@ -43,8 +43,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class PfcTimeoutTest {
private static final Logger LOG = LoggerFactory.getLogger(PfcTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java
index af25aca80ed..159f4d79ab5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java
@@ -39,11 +39,14 @@
import org.apache.activemq.broker.BrokerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test case demonstrating situation where messages are not delivered to
* consumers.
*/
+@Category(ParallelTest.class)
public class QueueWorkerPrefetchTest extends TestCase implements
MessageListener {
private static final Logger LOG = LoggerFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
index d28474ce748..2791f6ca212 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
@@ -35,7 +35,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SlowConsumerTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(SlowConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
index d2b80131895..e64bae6e257 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
@@ -24,10 +24,13 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Demonstrates how unmarshalled VM advisory messages for temporary queues prevent other connections from being closed.
*/
+@Category(ParallelTest.class)
public class TempQueueDeleteOnCloseTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java
index cb064f77b86..11d524d582a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java
@@ -38,16 +38,19 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.MessageDatabase;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// https://issues.apache.org/jira/browse/AMQ-4262
+@Category(ParallelTest.class)
public class TransactedStoreUsageSuspendResumeTest {
private static final Logger LOG = LoggerFactory.getLogger(TransactedStoreUsageSuspendResumeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
index 61acf2b493e..671b64aeffe 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
@@ -29,6 +29,8 @@
import org.apache.activemq.broker.BrokerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/*
* simulate message flow which cause the following exception in the broker
@@ -40,6 +42,7 @@
* This appears to be consistent in a MacBook. Haven't been able to replicate it
* on Windows though
*/
+@Category(ParallelTest.class)
public class TransactionNotStartedErrorTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(TransactionNotStartedErrorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
index b3cd0060f53..73940a8b56f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
@@ -45,6 +45,8 @@
import org.apache.logging.log4j.LogManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test to demostrate a message trapped in the JDBC store and not
@@ -57,6 +59,7 @@
*
*/
+@Category(ParallelTest.class)
public class TrapMessageInJDBCStoreTest extends TestCase {
private static final String MY_TEST_Q = "MY_TEST_Q";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
index 95af3942e91..f78f11e6f25 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
@@ -20,7 +20,10 @@
import org.apache.activemq.command.ActiveMQTopic;
import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationFilterTest extends TestCase {
public void testPrefixFilter() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
index 42edaf43fa2..0438004aa1a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
@@ -19,7 +19,10 @@
import junit.framework.TestCase;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationMapMemoryTest extends TestCase {
public void testLongDestinationPath() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
index 21dd60d9464..78ad0c1ab35 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
@@ -23,7 +23,10 @@
import org.apache.activemq.command.ActiveMQTempQueue;
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.util.IdGenerator;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationMapTempDestinationTest extends TestCase {
public void testtestTempDestinations() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
index 755c3c393c4..18594d8d004 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
@@ -27,7 +27,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationMapTest extends TestCase {
protected DestinationMap map = new DestinationMap();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
index 397cccaadf5..977050669dd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.filter;
import org.apache.activemq.test.TestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationPathTest extends TestSupport {
public void testPathParse() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
index 5d71c54741e..6ba5e8e0914 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
@@ -22,10 +22,13 @@
import org.apache.activemq.command.ActiveMQTopic;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class DummyPolicyTest extends SpringTestSupport {
public void testPolicy() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2AckModesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2AckModesTest.java
index 1cdbbe6bc75..0ccb9b347c8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2AckModesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2AckModesTest.java
@@ -39,8 +39,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class ActiveMQJMS2AckModesTest extends ActiveMQJMS2TestBase {
private final String destinationName;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
index 3755a069760..41e97be85f9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
@@ -22,7 +22,10 @@
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2ConnectionTest extends ActiveMQJMS2TestBase {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
index cf1e0fa594c..0f107a868e1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.ActiveMQContext;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2ContextTest extends ActiveMQJMS2TestBase {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageListenerTest.java
index 9edea8b0b75..bf4255a108b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageListenerTest.java
@@ -42,13 +42,16 @@
import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class ActiveMQJMS2MessageListenerTest extends ActiveMQJMS2TestBase {
private final String destinationName;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTest.java
index d7334f0c48d..afdd5e72a2a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.util.ByteSequence;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2MessageTest {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTypesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTypesTest.java
index 37757b1d61c..8d4c78ab294 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTypesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTypesTest.java
@@ -49,8 +49,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class ActiveMQJMS2MessageTypesTest extends ActiveMQJMS2TestBase {
private final Set VALID_PRIORITIES = Set.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ProducerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ProducerTest.java
index e47d022a17f..05d3fce7a4c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ProducerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ProducerTest.java
@@ -37,7 +37,10 @@
import org.apache.activemq.ActiveMQMessageProducerSupport;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2ProducerTest extends ActiveMQJMS2TestBase {
private static final String PROPERTY_NAME_VALID="ValidName";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAConnectionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAConnectionTest.java
index e16ba7c2163..dd5119e0b68 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAConnectionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAConnectionTest.java
@@ -18,7 +18,10 @@
import org.junit.Test;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2XAConnectionTest extends ActiveMQJMS2XATestBase {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAContextTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAContextTest.java
index 239d2117bd7..e569f4cfec7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAContextTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2XAContextTest.java
@@ -27,7 +27,10 @@
import org.apache.activemq.ActiveMQXAContext;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ActiveMQJMS2XAContextTest extends ActiveMQJMS2XATestBase {
@Before
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/DLQRetryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/DLQRetryTest.java
index 3ba36ef0b26..28ecf19fe1d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/DLQRetryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/DLQRetryTest.java
@@ -33,6 +33,7 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +43,10 @@
import javax.management.ObjectName;
import java.util.ArrayList;
import java.util.List;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class DLQRetryTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DLQRetryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxAuditLogTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxAuditLogTest.java
index d4014e6cb31..2180a5783b2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxAuditLogTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxAuditLogTest.java
@@ -47,7 +47,10 @@
import static org.apache.activemq.broker.util.JMXAuditLogEntry.VERBS;
import static org.apache.activemq.util.TestUtils.findOpenPort;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JmxAuditLogTest extends TestSupport
{
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/OpenTypeSupportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/OpenTypeSupportTest.java
index 627fa32e1c9..1314618decd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/OpenTypeSupportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/OpenTypeSupportTest.java
@@ -38,7 +38,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class OpenTypeSupportTest {
private static final Logger LOG = LoggerFactory.getLogger(OpenTypeSupportTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/TotalMessageCountTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/TotalMessageCountTest.java
index bb51e303675..b641cf05bb4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/TotalMessageCountTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jmx/TotalMessageCountTest.java
@@ -38,10 +38,13 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Torsten Mielke
*/
+@Category(ParallelTest.class)
public class TotalMessageCountTest {
private static final Logger LOG = LoggerFactory.getLogger(TotalMessageCountTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java
index 86e5a439397..1f95113096a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java
@@ -21,10 +21,13 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ActiveMQInitialContextFactoryTest extends JNDITestSupport {
public void testConnectionFactoriesArePresent() throws NamingException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQSslInitialContextFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQSslInitialContextFactoryTest.java
index e6859a8fe05..b2302c48a9e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQSslInitialContextFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQSslInitialContextFactoryTest.java
@@ -37,8 +37,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class ActiveMQSslInitialContextFactoryTest {
protected Context context;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java
index 517735b855a..31ccf76b283 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java
@@ -19,12 +19,15 @@
import javax.naming.NamingException;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test case for AMQ-141
*
*
*/
+@Category(ParallelTest.class)
public class CustomConnectionFactoryNameTest extends ActiveMQInitialContextFactoryTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java
index 6e3e9da76e3..1102d65f208 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java
@@ -16,12 +16,16 @@
*/
package org.apache.activemq.jndi;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
* Test case for AMQ-140
*
*
*/
+@Category(ParallelTest.class)
public class DestinationNameWithSlashTest extends JNDITestSupport {
public void testNameWithSlash() throws Exception {
assertDestinationExists("jms/Queue");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/InitialContextTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/InitialContextTest.java
index 2c983a5a36e..ad7021919a7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/InitialContextTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/InitialContextTest.java
@@ -26,10 +26,13 @@
import org.apache.activemq.ActiveMQXAConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class InitialContextTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(InitialContextTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ObjectFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ObjectFactoryTest.java
index 1b6e59b7d16..c58f4a6732a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ObjectFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/ObjectFactoryTest.java
@@ -22,9 +22,12 @@
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ObjectFactoryTest extends CombinationTestSupport {
public void testConnectionFactory() throws Exception {
// Create sample connection factory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XAConnectionFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XAConnectionFactoryTest.java
index a31aa362163..1bd78e1ae7c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XAConnectionFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XAConnectionFactoryTest.java
@@ -21,7 +21,10 @@
import jakarta.jms.XAConnectionFactory;
import javax.naming.Context;
import javax.naming.NamingException;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class XAConnectionFactoryTest extends ActiveMQInitialContextFactoryTest {
public void testConnectionFactoriesIsXA() throws NamingException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XASslConnectionFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XASslConnectionFactoryTest.java
index 6f1e3370f41..3632e8b1d5e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XASslConnectionFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/jndi/XASslConnectionFactoryTest.java
@@ -22,7 +22,10 @@
import javax.naming.spi.InitialContextFactory;
import org.apache.activemq.ActiveMQXASslConnectionFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class XASslConnectionFactoryTest extends ActiveMQInitialContextFactoryTest {
public void testConnectionFactoriesIsXA() throws NamingException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java
index 467e9e39d88..375a7d7bb5a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/joramtests/JoramJmsTest.java
@@ -38,10 +38,13 @@
import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
import org.objectweb.jtests.jms.conform.session.UnifiedSessionTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Hiram Chirino
*/
+@Category(ParallelTest.class)
public class JoramJmsTest extends TestCase {
static {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java
index 194cbbcf112..0a0fc2830ff 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.management;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
+@Category(ParallelTest.class)
public class BoundaryStatisticTest extends StatisticTestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java
index b920718c75d..614a1df9726 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java
@@ -16,11 +16,15 @@
*/
package org.apache.activemq.management;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class BoundedRangeStatisticTest extends RangeStatisticTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/CountStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/CountStatisticTest.java
index 85f8be104d1..6b338054c8f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/management/CountStatisticTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/management/CountStatisticTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.management;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
+@Category(ParallelTest.class)
public class CountStatisticTest extends StatisticTestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/RangeStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/RangeStatisticTest.java
index 49caa986fc9..ac7fb8e363a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/management/RangeStatisticTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/management/RangeStatisticTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.management;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
+@Category(ParallelTest.class)
public class RangeStatisticTest extends StatisticTestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java
index 88ec2eac1c9..61a174dde9d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.management;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
+@Category(ParallelTest.class)
public class TimeStatisticTest extends StatisticTestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
index 2e771f27066..65ed01ab3fc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
@@ -18,12 +18,15 @@
import org.apache.activemq.memory.buffer.MessageBuffer;
import org.apache.activemq.memory.buffer.OrderBasedMessageBuffer;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class OrderBasedMemoryBufferTest extends MemoryBufferTestSupport {
public void testSizeWorks() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java
index ad02821c484..7b8de4b6ee5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java
@@ -18,12 +18,15 @@
import org.apache.activemq.memory.buffer.MessageBuffer;
import org.apache.activemq.memory.buffer.SizeBasedMessageBuffer;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class SizeBasedMessageBufferTest extends MemoryBufferTestSupport {
public void testSizeWorks() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompositeConsumerNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompositeConsumerNetworkBridgeTest.java
index 17b0447dd40..624e7a094de 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompositeConsumerNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompositeConsumerNetworkBridgeTest.java
@@ -43,6 +43,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test class to verify composite consumers correctly create demand
@@ -50,6 +52,7 @@
* See AMQ-9262
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class CompositeConsumerNetworkBridgeTest extends DynamicNetworkTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(CompositeConsumerNetworkBridgeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeFilterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeFilterTest.java
index 099bb48f11b..36d318a1de7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeFilterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeFilterTest.java
@@ -27,8 +27,11 @@
import org.apache.activemq.command.SessionInfo;
import java.util.Arrays;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DemandForwardingBridgeFilterTest extends NetworkTestSupport {
private DemandForwardingBridge bridge;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
index dee08ba5aa3..bd2c29a009f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeSupportTest.java
@@ -23,7 +23,10 @@
import java.io.IOException;
import java.net.ServerSocket;
import java.util.Arrays;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DemandForwardingBridgeSupportTest extends NetworkTestSupport {
private DemandForwardingBridge bridge;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java
index 4e4eae5a6bf..fc9d8bb29ae 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java
@@ -30,7 +30,10 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DemandForwardingBridgeTest extends NetworkTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
index 4d2cc2f4d91..c65fd91fa15 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
@@ -38,7 +38,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeNotNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DuplexNetworkMBeanTest {
protected static final Logger LOG = LoggerFactory.getLogger(DuplexNetworkMBeanTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexStartNpeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexStartNpeTest.java
index 09aa4c8d388..f359a281085 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexStartNpeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexStartNpeTest.java
@@ -44,7 +44,10 @@
import java.util.concurrent.TimeUnit;
import static junit.framework.TestCase.assertNotNull;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DuplexStartNpeTest {
private static final Logger LOG = LoggerFactory.getLogger(DuplexStartNpeTest.class);
final ActiveMQQueue dest = new ActiveMQQueue("QQ");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableSyncNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableSyncNetworkBridgeTest.java
index 9727dbc41a7..2a36dd673a9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableSyncNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableSyncNetworkBridgeTest.java
@@ -50,6 +50,7 @@
import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
import org.apache.activemq.util.Wait;
import org.apache.activemq.util.Wait.Condition;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
@@ -59,10 +60,12 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSyncNetworkBridgeTest extends DynamicNetworkTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(DurableSyncNetworkBridgeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForceDurableNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForceDurableNetworkBridgeTest.java
index 06ee66f31b9..dc250d962f2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForceDurableNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForceDurableNetworkBridgeTest.java
@@ -42,8 +42,11 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class ForceDurableNetworkBridgeTest extends DynamicNetworkTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(ForceDurableNetworkBridgeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
index 9f4fe36bfdd..1295dd8cff4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.command.Message;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ForwardingBridgeTest extends NetworkTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/MQTTNetworkOfBrokersFailoverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/MQTTNetworkOfBrokersFailoverTest.java
index ad52fecf702..ab84ce6c44b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/MQTTNetworkOfBrokersFailoverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/MQTTNetworkOfBrokersFailoverTest.java
@@ -46,11 +46,14 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Created by ceposta
* exceptions = new HashMap();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
index 965c1217e2e..6258a46006a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
@@ -64,6 +64,8 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test to see if the JDBCExceptionIOHandler will restart the transport connectors correctly after
@@ -71,6 +73,7 @@
*
* see AMQ-4575
*/
+@Category(ParallelTest.class)
public class JDBCIOExceptionHandlerTest {
private static final Logger LOG = LoggerFactory.getLogger(JDBCIOExceptionHandlerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
index 4c4890c30d9..670f572ab4b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
@@ -44,7 +44,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCMessagePriorityTest extends MessagePriorityTest {
private static final Logger LOG = LoggerFactory.getLogger(JDBCMessagePriorityTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.java
index 52c512909f2..b4ca9636bb5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.java
@@ -27,7 +27,10 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.cursors.NegativeQueueTest;
import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCNegativeQueueTest extends NegativeQueueTest {
DataSource dataSource;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
index 8a19397ad62..3e5fd0ea72a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
@@ -25,7 +25,10 @@
import org.apache.derby.jdbc.EmbeddedDataSource;
import org.junit.After;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCNetworkBrokerDetachTest extends NetworkBrokerDetachTest {
LinkedList dataSources = new LinkedList<>();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterExpiredMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterExpiredMessageTest.java
index e4fd991e6c3..e470dd70ffe 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterExpiredMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterExpiredMessageTest.java
@@ -47,7 +47,10 @@
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCPersistenceAdapterExpiredMessageTest {
private static final Logger LOG = LoggerFactory.getLogger(JDBCPersistenceAdapterExpiredMessageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.java
index 116e9552d4a..e6aca2d9d07 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.java
@@ -22,7 +22,10 @@
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.PersistenceAdapterTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCPersistenceAdapterTest extends PersistenceAdapterTestSupport {
protected PersistenceAdapter createPersistenceAdapter(boolean delete) throws IOException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java
index 894eca95ecc..a91937ddd54 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java
@@ -53,6 +53,8 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.derby.jdbc.EmbeddedDataSource;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* to be compliant with JDBC spec; officially commit is not supposed to be
@@ -64,6 +66,7 @@
* autocommit, wrapper throws a SQLException.
*/
+@Category(ParallelTest.class)
public class JDBCStoreAutoCommitTest {
private static final String BROKER_NAME = "AutoCommitTest";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
index c2abc1ccf6f..28c1bb05fa1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
@@ -23,7 +23,10 @@
import org.apache.derby.jdbc.EmbeddedDataSource;
import javax.sql.DataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JDBCStoreBrokerTest extends BrokerTest {
protected void configureJDBCPersistenceAdapter(JDBCPersistenceAdapter jdbc, final String name) throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreOrderTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreOrderTest.java
index dd9c541d6a5..05d6c49eed4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreOrderTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreOrderTest.java
@@ -28,8 +28,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// https://issues.apache.org/activemq/browse/AMQ-2594
+@Category(ParallelTest.class)
public class JDBCStoreOrderTest extends StoreOrderTest {
private static final Logger LOG = LoggerFactory.getLogger(JDBCStoreOrderTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JmsTransactionCommitFailureTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JmsTransactionCommitFailureTest.java
index c04e751f4ae..703a5c95c38 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JmsTransactionCommitFailureTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JmsTransactionCommitFailureTest.java
@@ -39,7 +39,10 @@
import java.sql.Statement;
import java.util.List;
import java.util.Properties;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JmsTransactionCommitFailureTest {
private static final Log LOGGER = LogFactory.getLog(JmsTransactionCommitFailureTest.class);
private static final String OUTPUT_DIR = "target/" + JmsTransactionCommitFailureTest.class.getSimpleName();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
index a18f8d9a005..6df37e61e67 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
@@ -46,8 +46,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@Ignore // AMQ-9239 FIXME: mock / byte-buddy opens
+@Category(ParallelTest.class)
public class LeaseDatabaseLockerTest {
private static final Logger LOG = LoggerFactory.getLogger(LeaseDatabaseLockerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
index 9041f7d7eae..5d03e9b6ddb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
@@ -23,7 +23,10 @@
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TransactionContextTest {
org.apache.activemq.store.jdbc.TransactionContext underTest;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/XACompletionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/XACompletionTest.java
index 5b7a3a417fe..8f394c80b55 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/XACompletionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/XACompletionTest.java
@@ -68,9 +68,12 @@
import java.util.Enumeration;
import static org.apache.activemq.util.TestUtils.createXid;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class XACompletionTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(XACompletionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/h2/H2JDBCStoreBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/h2/H2JDBCStoreBrokerTest.java
index 38e19327be2..f05dc4929a7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/h2/H2JDBCStoreBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/h2/H2JDBCStoreBrokerTest.java
@@ -22,7 +22,10 @@
import org.apache.activemq.store.jdbc.adapter.H2JDBCAdapter;
import javax.sql.DataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class H2JDBCStoreBrokerTest extends JDBCStoreBrokerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBDurableMessageRecoveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBDurableMessageRecoveryTest.java
index 041fce238f2..4edd42ffd44 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBDurableMessageRecoveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBDurableMessageRecoveryTest.java
@@ -54,8 +54,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class KahaDBDurableMessageRecoveryTest {
@Parameters(name = "recoverIndex={0},enableSubscriptionStats={1}")
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
index 5965eff08c7..4690a6e1633 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
@@ -48,7 +48,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBFastEnqueueTest {
private static final Logger LOG = LoggerFactory.getLogger(KahaDBFastEnqueueTest.class);
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBInFlightTxMemoryUsageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBInFlightTxMemoryUsageTest.java
index ba9ecc5b7de..68555ccfbee 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBInFlightTxMemoryUsageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBInFlightTxMemoryUsageTest.java
@@ -47,7 +47,10 @@
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBInFlightTxMemoryUsageTest {
static final Logger LOG = LoggerFactory.getLogger(KahaDBInFlightTxMemoryUsageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBIndexLocationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBIndexLocationTest.java
index 51b0c9b6172..4be500290f0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBIndexLocationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBIndexLocationTest.java
@@ -40,10 +40,13 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class KahaDBIndexLocationTest {
private static final Logger LOG = LoggerFactory.getLogger(KahaDBIndexLocationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.java
index 438b8c0f96e..072dd40d1dd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.java
@@ -21,7 +21,10 @@
import org.apache.activemq.store.MessagePriorityTest;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBMessagePriorityTest extends MessagePriorityTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
index 5e093898529..d7c56750eaa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
@@ -34,6 +34,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that KahaDB properly sets the new storeMessageSize
@@ -43,6 +45,7 @@
*
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class KahaDBMessageStoreSizeStatTest extends
AbstractMessageStoreSizeStatTest {
protected static final Logger LOG = LoggerFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
index 6a84aef5ba1..2a740b456ba 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
@@ -45,7 +45,10 @@
import java.util.List;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBOffsetRecoveryListenerTest {
private static final Logger logger = LoggerFactory.getLogger(KahaDBOffsetRecoveryListenerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBRecoverExpiredTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBRecoverExpiredTest.java
index 3aaef774ba2..0b2785362de 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBRecoverExpiredTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBRecoverExpiredTest.java
@@ -51,10 +51,13 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for {@link TopicMessageStore#recoverExpired(Set, int, org.apache.activemq.store.MessageRecoveryListener)}
*/
+@Category(ParallelTest.class)
public class KahaDBRecoverExpiredTest {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreBrokerTest.java
index 2152501606b..6d9a6ce5326 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreBrokerTest.java
@@ -23,12 +23,15 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTest;
import org.apache.activemq.util.IOHelper;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Once the wire format is completed we can test against real persistence storage.
*
*
*/
+@Category(ParallelTest.class)
public class KahaDBStoreBrokerTest extends BrokerTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDbVmConcurrentDispatchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDbVmConcurrentDispatchTest.java
index 36d5a81c773..0b46560062f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDbVmConcurrentDispatchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDbVmConcurrentDispatchTest.java
@@ -26,8 +26,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class KahaDbVmConcurrentDispatchTest extends AbstractVmConcurrentDispatchTest {
private final boolean concurrentDispatch;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
index 8da8d9c16b2..6bd8480e1fa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
@@ -38,6 +38,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that KahaDB properly sets the new storeMessageSize
@@ -47,6 +49,7 @@
*
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MultiKahaDBMessageStoreSizeStatTest extends
AbstractMessageStoreSizeStatTest {
protected static final Logger LOG = LoggerFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeTest.java
index 398b2f730b2..8439cee64b4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeTest.java
@@ -22,6 +22,8 @@
import org.apache.activemq.store.MessageStore;
import org.apache.commons.io.FileUtils;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test is for AMQ-5748 to verify that {@link MessageStore} implements correctly
@@ -29,6 +31,7 @@
*
*
*/
+@Category(ParallelTest.class)
public class MultiKahaDBMessageStoreSizeTest extends AbstractKahaDBMessageStoreSizeTest {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBQueueDeletionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBQueueDeletionTest.java
index 140573e459e..bf8bddb7512 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBQueueDeletionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBQueueDeletionTest.java
@@ -32,6 +32,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* AMQ-5875
@@ -43,6 +45,7 @@
*
* */
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MultiKahaDBQueueDeletionTest extends AbstractMultiKahaDBDeletionTest {
protected static final Logger LOG = LoggerFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBTopicDeletionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBTopicDeletionTest.java
index 52941284538..10b460c42c9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBTopicDeletionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBTopicDeletionTest.java
@@ -33,6 +33,8 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* AMQ-5875
@@ -44,6 +46,7 @@
*
* */
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MultiKahaDBTopicDeletionTest extends AbstractMultiKahaDBDeletionTest {
protected static final Logger LOG = LoggerFactory
.getLogger(MultiKahaDBTopicDeletionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDbVmConcurrentDispatchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDbVmConcurrentDispatchTest.java
index efe8688edce..8be641b9b15 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDbVmConcurrentDispatchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDbVmConcurrentDispatchTest.java
@@ -26,8 +26,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class MultiKahaDbVmConcurrentDispatchTest extends AbstractVmConcurrentDispatchTest {
private final boolean concurrentDispatch;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java
index 73ed6ecce06..b6b9f6033ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java
@@ -32,7 +32,10 @@
import org.slf4j.LoggerFactory;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class NoSpaceIOTest {
private static final Logger LOG = LoggerFactory.getLogger(NoSpaceIOTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java
index 8d1ed683b42..c339661fc7e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.util.DataByteArrayInputStream;
import org.apache.activemq.util.DataByteArrayOutputStream;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class PBMesssagesTest extends TestCase {
@SuppressWarnings("rawtypes")
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/SubscriptionRecoveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/SubscriptionRecoveryTest.java
index a9ccf8585a0..1cf1ac7e348 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/SubscriptionRecoveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/SubscriptionRecoveryTest.java
@@ -50,7 +50,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SubscriptionRecoveryTest {
private static final Logger LOG = LoggerFactory.getLogger(SubscriptionRecoveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/TempKahaDBStoreBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/TempKahaDBStoreBrokerTest.java
index e2d91093291..af41aed2ac7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/TempKahaDBStoreBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/TempKahaDBStoreBrokerTest.java
@@ -22,12 +22,15 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Once the wire format is completed we can test against real persistence storage.
*
*
*/
+@Category(ParallelTest.class)
public class TempKahaDBStoreBrokerTest extends BrokerTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaBulkLoadingTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaBulkLoadingTest.java
index d67c5bad2d2..27f783f95d7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaBulkLoadingTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaBulkLoadingTest.java
@@ -36,12 +36,15 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This tests bulk loading and unloading of messages to a Queue.s
*
*
*/
+@Category(ParallelTest.class)
public class KahaBulkLoadingTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(KahaBulkLoadingTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaStoreQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaStoreQueueTest.java
index 3db1c33c57b..a9e4266fe50 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaStoreQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/KahaStoreQueueTest.java
@@ -20,10 +20,13 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.perf.SimpleQueueTest;
import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class KahaStoreQueueTest extends SimpleQueueTest {
protected void configureBroker(BrokerService answer,String uri) throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/TempKahaStoreQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/TempKahaStoreQueueTest.java
index 7f0b6aa8800..204b5c8a0e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/TempKahaStoreQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/perf/TempKahaStoreQueueTest.java
@@ -21,10 +21,13 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.perf.SimpleQueueTest;
import org.apache.activemq.store.kahadb.TempKahaDBStore;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class TempKahaStoreQueueTest extends SimpleQueueTest {
protected void configureBroker(BrokerService answer,String uri) throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/KahaDBFilePendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/KahaDBFilePendingMessageCursorTest.java
index 481950e4d04..99faf680791 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/KahaDBFilePendingMessageCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/KahaDBFilePendingMessageCursorTest.java
@@ -31,10 +31,13 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Hiram Chirino
*/
+@Category(ParallelTest.class)
public class KahaDBFilePendingMessageCursorTest extends FilePendingMessageCursorTestSupport {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeStatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeStatTest.java
index 0f608d003a1..14095186630 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeStatTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeStatTest.java
@@ -28,6 +28,8 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test checks that KahaDB properly sets the new storeMessageSize statistic.
@@ -35,6 +37,7 @@
* AMQ-5748
*
*/
+@Category(ParallelTest.class)
public class MemoryMessageStoreSizeStatTest extends AbstractMessageStoreSizeStatTest {
protected static final Logger LOG = LoggerFactory
.getLogger(MemoryMessageStoreSizeStatTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeTest.java
index 19a01ab77dc..c95b1704bc3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeTest.java
@@ -18,7 +18,10 @@
import org.apache.activemq.store.AbstractMessageStoreSizeTest;
import org.apache.activemq.store.MessageStore;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class MemoryMessageStoreSizeTest extends AbstractMessageStoreSizeTest {
MemoryMessageStore messageStore;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java
index 71fadf338d0..aeec59a791c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java
@@ -25,10 +25,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
index 70038a7ff6e..fd0ecfc9ef6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
@@ -26,7 +26,10 @@
import org.apache.activemq.broker.TransportConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest extends JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
index a68788a6469..39181d354b4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
@@ -25,7 +25,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveWithTwoConnectionsTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java
index b386a7e28c3..53d80ce8e0a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java
@@ -23,7 +23,10 @@
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TemporaryDestinationToFromNameTest extends EmbeddedBrokerAndConnectionTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TemporaryDestinationToFromNameTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java
index 97bb749aad4..2b55ad875e9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java
@@ -27,11 +27,14 @@
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Tests that a Message can have nested Map and List properties attached.
*
*/
+@Category(ParallelTest.class)
public class NestedMapAndListPropertyTest extends JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest {
private static final Logger LOG = LoggerFactory.getLogger(NestedMapAndListPropertyTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java
index a7712f1797c..35d27637936 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java
@@ -28,10 +28,13 @@
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class NestedMapMessageTest extends JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest {
private static final Logger LOG = LoggerFactory.getLogger(NestedMapMessageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
index 33f2f665788..ca562778dca 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
@@ -29,7 +29,10 @@
import org.slf4j.LoggerFactory;
import jakarta.jms.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class RetroactiveConsumerBrokerRestartedTest extends TestCase {
private static final Logger log = LoggerFactory.getLogger(RetroactiveConsumerBrokerRestartedTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
index 0248109ac89..a7fe20cb555 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.test.retroactive;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class RetroactiveConsumerTestWithDestinationBasedBufferTest extends RetroactiveConsumerTestWithSimpleMessageListTest {
protected String getBrokerXml() {
return "org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java
index 1ed1420fb54..d4bc5734467 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java
@@ -22,10 +22,13 @@
import jakarta.jms.TextMessage;
import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest extends RetroactiveConsumerTestWithSimpleMessageListTest {
private int counter = 1;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
index bb99b5d00ab..02ca4e92955 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.test.retroactive;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class RetroactiveConsumerTestWithTimePolicyTest extends RetroactiveConsumerTestWithSimpleMessageListTest {
protected String getBrokerXml() {
return "org/apache/activemq/test/retroactive/activemq-timed-policy.xml";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/MaxFrameSizeEnabledTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/MaxFrameSizeEnabledTest.java
index ed6635480d5..caa624e54e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/MaxFrameSizeEnabledTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/MaxFrameSizeEnabledTest.java
@@ -22,11 +22,13 @@
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.transport.nio.SelectorManager;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import jakarta.jms.Connection;
import jakarta.jms.JMSException;
@@ -46,6 +48,7 @@
//Test for AMQ-8142
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class MaxFrameSizeEnabledTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/QueueClusterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/QueueClusterTest.java
index 447e2e2e875..1fc611efdd7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/QueueClusterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/QueueClusterTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq.transport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class QueueClusterTest extends TopicClusterTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/RestrictedThreadPoolInactivityTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/RestrictedThreadPoolInactivityTimeoutTest.java
index d5e2a1a8428..1166213eb77 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/RestrictedThreadPoolInactivityTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/RestrictedThreadPoolInactivityTimeoutTest.java
@@ -32,7 +32,10 @@
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class RestrictedThreadPoolInactivityTimeoutTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(RestrictedThreadPoolInactivityTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
index 9b4b5caf49b..4ed752684ad 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SoWriteTimeoutTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(SoWriteTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOSslTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOSslTransportBrokerTest.java
index 1758f6501be..43e0f63218c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOSslTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOSslTransportBrokerTest.java
@@ -23,7 +23,10 @@
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoNIOSslTransportBrokerTest extends TransportBrokerTestSupport {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOTransportBrokerTest.java
index 02810439c10..cebeaad730f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoNIOTransportBrokerTest.java
@@ -19,7 +19,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoNIOTransportBrokerTest extends TransportBrokerTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslAuthTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslAuthTest.java
index be6043b3637..73a2ba6d20d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslAuthTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslAuthTest.java
@@ -39,8 +39,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AutoSslAuthTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslTransportBrokerTest.java
index 603153921e1..89fe708a138 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoSslTransportBrokerTest.java
@@ -21,7 +21,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoSslTransportBrokerTest extends TransportBrokerTestSupport {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportBrokerTest.java
index e3f3349e0f0..b5958a232e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportBrokerTest.java
@@ -19,7 +19,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoTransportBrokerTest extends TransportBrokerTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConfigureTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConfigureTest.java
index 55817a73f84..52bc5fb321f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConfigureTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConfigureTest.java
@@ -34,8 +34,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AutoTransportConfigureTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConnectionsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConnectionsTest.java
index bcfb2dc1ea7..ea3eb039d9c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConnectionsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoTransportConnectionsTest.java
@@ -44,8 +44,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AutoTransportConnectionsTest {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoWireFormatConfigurationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoWireFormatConfigurationTest.java
index 8f0e27ba8d0..6dbdfde8d69 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoWireFormatConfigurationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/AutoWireFormatConfigurationTest.java
@@ -32,8 +32,11 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AutoWireFormatConfigurationTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverClusterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverClusterTest.java
index a612e229ef6..e813e30265d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverClusterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverClusterTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.transport.auto.failover;
import org.apache.activemq.transport.failover.FailoverClusterTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoFailoverClusterTest extends FailoverClusterTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverTimeoutTest.java
index b62c24584cb..a598a151495 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/AutoFailoverTimeoutTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.transport.auto.failover;
import org.apache.activemq.transport.failover.FailoverTimeoutTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoFailoverTimeoutTest extends FailoverTimeoutTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoRandomTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoRandomTest.java
index 05da980123b..86d71c3889c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoRandomTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoRandomTest.java
@@ -18,7 +18,10 @@
package org.apache.activemq.transport.auto.failover;
import org.apache.activemq.transport.failover.FailoverRandomTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverAutoRandomTest extends FailoverRandomTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoTransportBrokerTest.java
index 808f72d24a1..58d1da83474 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/failover/FailoverAutoTransportBrokerTest.java
@@ -19,7 +19,10 @@
import junit.framework.Test;
import org.apache.activemq.transport.failover.FailoverTransportBrokerTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverAutoTransportBrokerTest extends FailoverTransportBrokerTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsDurableTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsDurableTopicSendReceiveTest.java
index bfa0b6bf414..9b545f6c690 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsDurableTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsDurableTopicSendReceiveTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.transport.auto.nio;
import org.apache.activemq.transport.nio.NIOJmsDurableTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AutoNIOJmsDurableTopicSendReceiveTest extends NIOJmsDurableTopicSendReceiveTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsSendAndReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsSendAndReceiveTest.java
index c3020a40581..a608828589c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsSendAndReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOJmsSendAndReceiveTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.transport.auto.nio;
import org.apache.activemq.transport.nio.NIOJmsSendAndReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class AutoNIOJmsSendAndReceiveTest extends NIOJmsSendAndReceiveTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOPersistentSendAndReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOPersistentSendAndReceiveTest.java
index a18e4a5f548..a33a1ed1d37 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOPersistentSendAndReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOPersistentSendAndReceiveTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.transport.auto.nio;
import org.apache.activemq.transport.nio.NIOPersistentSendAndReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AutoNIOPersistentSendAndReceiveTest extends NIOPersistentSendAndReceiveTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLBasicTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLBasicTest.java
index 3ab93fa9e26..abbdd9b943d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLBasicTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLBasicTest.java
@@ -17,7 +17,10 @@
package org.apache.activemq.transport.auto.nio;
import org.apache.activemq.transport.nio.NIOSSLBasicTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AutoNIOSSLBasicTest extends NIOSSLBasicTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
index 92614107d67..487de5eaae3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.transport.discovery;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class ZeroconfDiscoverTransportTest extends DiscoveryTransportBrokerTest {
protected String getDiscoveryUri() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
index 718ff68cf96..7eb8708c369 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
@@ -45,12 +45,15 @@
import org.apache.activemq.util.ServiceStopper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* TestCase showing the message-destroying described in AMQ-1925
*
*
*/
+@Category(ParallelTest.class)
public class AMQ1925Test extends TestCase implements ExceptionListener {
private static final Logger log = LoggerFactory.getLogger(AMQ1925Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java
index dd89456e873..41d37ea2b73 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java
@@ -26,10 +26,13 @@
import org.apache.activemq.transport.TransportListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class BadConnectionTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(BadConnectionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
index fec5ce2860f..3762557cbd0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
@@ -29,10 +29,13 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Ensures connections aren't leaked when when we use backup=true and randomize=false
*/
+@Category(ParallelTest.class)
public class FailoverBackupLeakTest {
private static BrokerService s1, s2;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java
index 48e3901bfac..d60cd20de89 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java
@@ -33,7 +33,10 @@
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverClusterTest extends TestCase {
private static final int NUMBER = 10;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
index 66b48b2515c..2496840afea 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
@@ -46,11 +46,14 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class FailoverConsumerOutstandingCommitTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerOutstandingCommitTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
index 913ca7fc605..3a26ae60798 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
@@ -46,12 +46,15 @@
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.SessionId;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
// see https://issues.apache.org/activemq/browse/AMQ-2573
+@Category(ParallelTest.class)
public class FailoverConsumerUnconsumedTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerUnconsumedTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
index 8aea7f4ece1..0f61fc67ba5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
@@ -40,9 +40,12 @@
import org.apache.activemq.broker.ProducerBrokerExchange;
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class FailoverDuplicateTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FailoverDuplicateTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDurableSubTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDurableSubTransactionTest.java
index f4a4d2a2f99..9f184fac46c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDurableSubTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDurableSubTransactionTest.java
@@ -22,10 +22,12 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.*;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,6 +46,7 @@
@RunWith(Parameterized.class)
@Ignore("This test is going to be fixed in the PR: AMQ-9829 Track prefetched messages for duplicate suppression during failover")
+@Category(ParallelTest.class)
public class FailoverDurableSubTransactionTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverDurableSubTransactionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
index 9a19bbf41a3..592a4f362e5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
@@ -35,15 +35,18 @@
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.MessagePull;
import org.apache.activemq.command.Response;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertTrue;
// see: https://issues.apache.org/activemq/browse/AMQ-2877
+@Category(ParallelTest.class)
public class FailoverPrefetchZeroTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverPrefetchZeroTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
index 4edd67a77c7..60bfc574bac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
@@ -22,7 +22,10 @@
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverRandomTest extends TestCase {
BrokerService brokerA, brokerB;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
index c8d4c511a67..8eeb13ed655 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
@@ -21,7 +21,10 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverRedeliveryTransactionTest extends FailoverTransactionTest {
public static Test suite() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverStateTrackingTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverStateTrackingTest.java
index c32559bdc25..678b02c89f6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverStateTrackingTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverStateTrackingTest.java
@@ -47,10 +47,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test state tracking operations during failover
*/
+@Category(ParallelTest.class)
public class FailoverStateTrackingTest {
private static final Logger LOG = LoggerFactory.getLogger(LinkStealingTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
index 46d134f18f9..53f88aa4360 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
@@ -47,7 +47,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverTimeoutTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 3d911e3f5dd..a2fb2a7d9e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -40,6 +40,7 @@
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.util.SocketProxy;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,10 +68,12 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.experimental.categories.Category;
// see https://issues.apache.org/activemq/browse/AMQ-2473
// https://issues.apache.org/activemq/browse/AMQ-2590
+@Category(ParallelTest.class)
public class FailoverTransactionTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FailoverTransactionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
index 270b038f9cc..5fccefe2023 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.transport.TransportListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverTransportBrokerTest extends NetworkTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FailoverTransportBrokerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
index 30051d89152..b5293e4b961 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
@@ -49,7 +49,10 @@
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverTxSlowAckTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverTxSlowAckTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUriTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUriTest.java
index 01a8966e0ce..e777f96277c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUriTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUriTest.java
@@ -19,7 +19,10 @@
import junit.framework.Test;
import org.apache.activemq.transport.tcp.TransportUriTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class FailoverUriTest extends TransportUriTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverXATransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverXATransactionTest.java
index 9125611ae2e..7a7309dcd99 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverXATransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverXATransactionTest.java
@@ -25,7 +25,9 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.util.TestUtils;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +45,7 @@
import static org.junit.Assert.assertEquals;
+@Category(ParallelTest.class)
public class FailoverXATransactionTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverXATransactionTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
index 1809e039166..034c0d6b0dc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SlowConnectionTest extends TestCase {
private CountDownLatch socketReadyLatch = new CountDownLatch(1);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOAsyncSendWithPFCTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOAsyncSendWithPFCTest.java
index d34f94b9d2f..ecd3601dece 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOAsyncSendWithPFCTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOAsyncSendWithPFCTest.java
@@ -38,11 +38,14 @@
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/*
demonstrates that with nio it does not make sense to block on the broker but thread pool
shold grow past initial corepoolsize of 10
*/
+@Category(ParallelTest.class)
public class NIOAsyncSendWithPFCTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(NIOAsyncSendWithPFCTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
index b9e9fa59b82..6db62f9b1a7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
@@ -19,7 +19,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.JmsDurableTopicSendReceiveTest;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class NIOJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java
index 4464ee309c3..2d1233df002 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java
@@ -18,11 +18,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class NIOJmsSendAndReceiveTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOMaxFrameSizeCleanupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOMaxFrameSizeCleanupTest.java
index 81fe2869d00..d9b2c9309db 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOMaxFrameSizeCleanupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOMaxFrameSizeCleanupTest.java
@@ -34,8 +34,11 @@
import java.util.concurrent.ThreadPoolExecutor;
import static junit.framework.TestCase.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
//Test for AMQ-8183
+@Category(ParallelTest.class)
public class NIOMaxFrameSizeCleanupTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
index fd1a7fa2502..fc54782cf15 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
@@ -19,7 +19,10 @@
import jakarta.jms.DeliveryMode;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class NIOPersistentSendAndReceiveTest extends NIOJmsSendAndReceiveTest {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
index df6e065016d..791e5f0ef01 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
@@ -34,8 +34,11 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@SuppressWarnings({ "javadoc" })
+@Category(ParallelTest.class)
public class NIOSSLConcurrencyTest extends TestCase {
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
index d32537b1295..818e8a348c8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
@@ -23,10 +23,12 @@
import org.apache.activemq.util.ConsumerThread;
import org.apache.activemq.util.ProducerThread;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +44,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+@Category(ParallelTest.class)
public class NIOSSLLoadTest {
private static final Logger LOG = LoggerFactory.getLogger(NIOSSLLoadTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
index 1d7a3a7b058..009d13c8368 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
@@ -21,7 +21,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class NIOSSLTransportBrokerTest extends TransportBrokerTestSupport {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLWindowSizeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLWindowSizeTest.java
index 7e63c10b547..e77e77efcaa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLWindowSizeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLWindowSizeTest.java
@@ -27,8 +27,11 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@SuppressWarnings("javadoc")
+@Category(ParallelTest.class)
public class NIOSSLWindowSizeTest extends TestCase {
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java
index 5706ee67a5b..549fd263b24 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java
@@ -19,7 +19,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class NIOTransportBrokerTest extends TransportBrokerTestSupport {
protected String getBindLocation() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
index 21288aeb9d0..4df9744bbe2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
@@ -39,10 +39,13 @@
import org.apache.activemq.util.MessageIdList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class PeerTransportTest extends TestCase {
protected static final int MESSAGE_COUNT = 50;
protected static final int NUMBER_IN_CLUSTER = 3;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java
index 4f00e062517..30c03e6be76 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java
@@ -24,10 +24,13 @@
import org.apache.activemq.transport.StubTransportListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ReliableTransportTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(ReliableTransportTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
index c1ff0264a7e..433bb1656a9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
@@ -52,7 +52,10 @@
import org.hamcrest.Matcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class InactivityMonitorTest extends CombinationTestSupport implements TransportAcceptListener {
private static final Logger LOG = LoggerFactory.getLogger(InactivityMonitorTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java
index 9e229d2aa27..385395d41b5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java
@@ -21,7 +21,10 @@
import java.util.Map;
import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QualityOfServiceUtilsTest extends TestCase {
/**
* Keeps track of the value that the System has set for the ECN bits, which
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
index 9fe466def93..57406689c34 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
@@ -44,7 +44,10 @@
import org.apache.activemq.transport.TransportFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class SslBrokerServiceTest extends TransportBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(SslBrokerServiceTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
index 6913a8f9529..0146c4baee3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
@@ -21,7 +21,10 @@
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class SslTransportBrokerTest extends TransportBrokerTestSupport {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java
index d0497454505..b301717f172 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java
@@ -27,10 +27,13 @@
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.transport.StubTransportListener;
import org.apache.activemq.wireformat.ObjectStreamWireFormat;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Unit tests for the SslTransport class.
*/
+@Category(ParallelTest.class)
public class SslTransportTest extends TestCase {
SSLSocket sslSocket;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
index 9ce2e8bbcbc..b366e0536b8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
@@ -18,7 +18,10 @@
import junit.framework.Test;
import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TcpTransportBrokerTest extends TransportBrokerTestSupport {
protected String getBindLocation() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketNoWarnTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketNoWarnTest.java
index d5529956238..79effd04c62 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketNoWarnTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketNoWarnTest.java
@@ -45,7 +45,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TcpTransportCloseSocketNoWarnTest {
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(TcpTransportCloseSocketNoWarnTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketTest.java
index 252dd22a65e..6aa32bbca12 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketTest.java
@@ -33,12 +33,15 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for https://issues.apache.org/jira/browse/AMQ-6561 to make sure sockets
* are closed on all connection attempt errors
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class TcpTransportCloseSocketTest {
public static final String KEYSTORE_TYPE = "jks";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportInactiveDuringHandshakeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportInactiveDuringHandshakeTest.java
index 959dd9ca411..ff977ae62df 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportInactiveDuringHandshakeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportInactiveDuringHandshakeTest.java
@@ -44,7 +44,10 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TcpTransportInactiveDuringHandshakeTest {
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(TcpTransportInactiveDuringHandshakeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
index f746d58ff01..82d0f23c84e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
@@ -25,12 +25,15 @@
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class TransportUriTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TransportUriTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.java
index 01d69b47969..6c1e9eaaccf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.transport.udp;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest extends UdpSendReceiveWithTwoConnectionsTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
index eccbf1bf10b..e857de100ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
@@ -46,7 +46,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class VMTransportThreadSafeTest {
private static final Logger LOG = LoggerFactory.getLogger(VMTransportThreadSafeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/JobSchedulerStoreUsageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/JobSchedulerStoreUsageTest.java
index 3e952a5b1cf..c48348125a0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/JobSchedulerStoreUsageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/JobSchedulerStoreUsageTest.java
@@ -34,7 +34,10 @@
import java.io.File;
import static org.junit.Assert.assertNotEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class JobSchedulerStoreUsageTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JobSchedulerStoreUsageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PercentDiskUsageLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PercentDiskUsageLimitTest.java
index ad2a89b874b..fb83e83b696 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PercentDiskUsageLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PercentDiskUsageLimitTest.java
@@ -34,6 +34,8 @@
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
@@ -42,6 +44,7 @@
* because another process uses up disk space.
*
*/
+@Category(ParallelTest.class)
public class PercentDiskUsageLimitTest {
protected static final Logger LOG = LoggerFactory
.getLogger(PercentDiskUsageLimitTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java
index 65478dce844..13bc4d88a18 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java
@@ -39,6 +39,8 @@
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
@@ -47,6 +49,7 @@
* because another process uses up disk space.
*
*/
+@Category(ParallelTest.class)
public class PeriodicDiskUsageLimitTest {
protected static final Logger LOG = LoggerFactory
.getLogger(PeriodicDiskUsageLimitTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
index 3259f40acd7..de365310216 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
@@ -33,11 +33,14 @@
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for AMQ-6798
*/
+@Category(ParallelTest.class)
public class QueueMemoryAndStoreUsageCleanupTest {
protected static final Logger LOG = LoggerFactory
.getLogger(QueueMemoryAndStoreUsageCleanupTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageLimitsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageLimitsTest.java
index 40112e70212..70daba92baa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageLimitsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageLimitsTest.java
@@ -34,7 +34,10 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StoreUsageLimitsTest {
final int WAIT_TIME_MILLS = 20 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
index 928b7193bb2..4bb4bc286a3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/StoreUsageTest.java
@@ -30,7 +30,10 @@
import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StoreUsageTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(StoreUsageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6366Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6366Test.java
index f4eab900bf6..fd0a12e8e52 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6366Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6366Test.java
@@ -36,11 +36,14 @@
import org.apache.activemq.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Show that both directions of a duplex bridge will properly restart the
* network durable consumers if dynamicOnly is false.
*/
+@Category(ParallelTest.class)
public class AMQ6366Test extends JmsMultipleBrokersTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(AMQ6366Test.class);
final ActiveMQTopic dest = new ActiveMQTopic("TEST.FOO");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6446Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6446Test.java
index f677c53d836..e9d99fe2696 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6446Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6446Test.java
@@ -39,7 +39,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class AMQ6446Test {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6477Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6477Test.java
index 9b6bb24cf43..bb9135fe53f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6477Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6477Test.java
@@ -55,11 +55,14 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test that clearUnMarshalled data gets called properly to reduce memory usage
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class AMQ6477Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ6477Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ActiveDurableSubscriptionBrowseExpireTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ActiveDurableSubscriptionBrowseExpireTest.java
index 5ee5bf5f363..3422ceaeb63 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ActiveDurableSubscriptionBrowseExpireTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ActiveDurableSubscriptionBrowseExpireTest.java
@@ -43,8 +43,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class ActiveDurableSubscriptionBrowseExpireTest extends DurableSubscriptionOfflineTestBase {
private boolean enableExpiration = true;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AdvisoryViaNetworkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AdvisoryViaNetworkTest.java
index e865b35670b..4b0079286ce 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AdvisoryViaNetworkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AdvisoryViaNetworkTest.java
@@ -36,9 +36,12 @@
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.MessageIdList;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AdvisoryViaNetworkTest extends JmsMultipleBrokersTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AdvisoryViaNetworkTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
index b9e61f8249b..ca7c878f504 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
@@ -25,7 +25,10 @@
import org.apache.activemq.util.MessageIdList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class BacklogNetworkCrossTalkTest extends JmsMultipleBrokersTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(BacklogNetworkCrossTalkTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BatchedMessagePriorityConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BatchedMessagePriorityConsumerTest.java
index ba244e72321..3cdf4f9fbcb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BatchedMessagePriorityConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BatchedMessagePriorityConsumerTest.java
@@ -22,11 +22,14 @@
import jakarta.jms.Session;
import org.apache.activemq.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class BatchedMessagePriorityConsumerTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(BatchedMessagePriorityConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
index ffdd850112a..2ac50d40519 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
@@ -27,10 +27,13 @@
import jakarta.jms.Session;
import org.apache.activemq.test.TestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ChangeSentMessageTest extends TestSupport {
static {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
index 7b4a1e333d0..9d2f826aa42 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
@@ -27,10 +27,13 @@
import jakarta.jms.Session;
import org.apache.activemq.test.TestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ChangeSessionDeliveryModeTest extends TestSupport implements MessageListener {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
index 2ffef2c6a8b..bdc68bfef8e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java
@@ -34,7 +34,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ConcurrentDestinationCreationTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ConcurrentDestinationCreationTest.class);
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
index 475d11b96f5..fa9b367d503 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
@@ -62,8 +62,11 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class ConcurrentProducerDurableConsumerTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ConcurrentProducerDurableConsumerTest.class);
private final int consumerCount = 5;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
index 7e0ebdaf52a..53fd73d3e88 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
@@ -54,7 +54,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ConcurrentProducerQueueConsumerTest extends TestSupport
{
private static final Logger LOG = LoggerFactory.getLogger(ConcurrentProducerQueueConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
index 78bf11e426d..93dddd407e7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
@@ -21,7 +21,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class ConsumeQueuePrefetchTest extends ConsumeTopicPrefetchTest {
private static final Logger LOG = LoggerFactory.getLogger(ConsumeQueuePrefetchTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
index 670c60b2922..1969d405039 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
@@ -30,10 +30,13 @@
import org.apache.activemq.util.Wait.Condition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ConsumeTopicPrefetchTest extends ProducerConsumerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ConsumeTopicPrefetchTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
index f5926970f3a..53c74ee6306 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
@@ -25,10 +25,13 @@
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class CreateLotsOfTemporaryQueuesTest extends EmbeddedBrokerAndConnectionTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(CreateLotsOfTemporaryQueuesTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
index eb6394d0e89..8e413d0709f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
@@ -29,11 +29,14 @@
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Peter Henning
*
*/
+@Category(ParallelTest.class)
public class CreateTemporaryQueueBeforeStartTest extends TestCase {
private final String bindAddress = "tcp://localhost:0";
private String connectionUri;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.java
index e830bb1a08b..bdb63ff533f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.java
@@ -27,6 +27,8 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test case intended to demonstrate delivery interruption to queue consumers when a JMS selector leaves some messages
@@ -43,6 +45,7 @@
* https://issues.apache.org/activemq/browse/AMQ-2217
*
*/
+@Category(ParallelTest.class)
public class DiscriminatingConsumerLoadTest extends TestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(DiscriminatingConsumerLoadTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
index d7abf3cbbc5..5642e882bcf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
@@ -31,10 +31,13 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Rajani Chennamaneni
*/
+@Category(ParallelTest.class)
public class DispatchMultipleConsumersTest extends TestCase {
private final static Logger logger = LoggerFactory.getLogger(DispatchMultipleConsumersTest.class);
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DuplexAdvisoryRaceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DuplexAdvisoryRaceTest.java
index 87fd037efa5..4ee62035188 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DuplexAdvisoryRaceTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DuplexAdvisoryRaceTest.java
@@ -56,8 +56,11 @@
import java.util.concurrent.atomic.AtomicLong;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// https://issues.apache.org/jira/browse/AMQ-6640
+@Category(ParallelTest.class)
public class DuplexAdvisoryRaceTest {
private static final Logger LOG = LoggerFactory.getLogger(DuplexAdvisoryRaceTest.class);
private static String hostName;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
index 49eabe014b8..de3da38281a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
@@ -36,10 +36,13 @@
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class DurableConsumerCloseAndReconnectTest extends TestSupport {
protected static final long RECEIVE_TIMEOUT = 5000L;
private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerCloseAndReconnectTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableRedeliveryTest.java
index f0e0c6829d4..6d7c5e3ce23 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableRedeliveryTest.java
@@ -41,12 +41,15 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for AMQ-7071
* Test to show prefetched messages will be marked as redelivered if connection terminated improperly
* and the lastDeliveredSequenceId is unknown
*/
+@Category(ParallelTest.class)
public class DurableRedeliveryTest {
static final Logger LOG = LoggerFactory.getLogger(DurableRedeliveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubCacheTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubCacheTest.java
index 0470b340db1..fc11f123f8e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubCacheTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubCacheTest.java
@@ -46,7 +46,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubCacheTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubCacheTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
index 7d6a5dfbc91..e99be15e408 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
@@ -49,10 +49,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/*
* A cut down version of DurableSubProcessWithRestartTest that focuses on kahaDB file retention
*/
+@Category(ParallelTest.class)
public class DurableSubDelayedUnsubscribeTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubDelayedUnsubscribeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
index 8c1fd1e272d..b617dfce673 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java
@@ -32,6 +32,8 @@
import org.apache.activemq.network.NetworkTestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Tests durable topic subscriptions inside a network of brokers.
@@ -39,6 +41,7 @@
* @author tmielke
*
*/
+@Category(ParallelTest.class)
public class DurableSubInBrokerNetworkTest extends NetworkTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubInBrokerNetworkTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
index 9c78ef92c63..9f13d6c1a35 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
@@ -53,7 +53,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubProcessConcurrentCommitActivateNoDuplicateTest.class);
public static final long RUNTIME = 5 * 60 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
index c657449e4b4..51c1df4983b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
@@ -46,7 +46,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubProcessMultiRestartTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubProcessMultiRestartTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
index 795ed1d5b29..c4458187d4e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
@@ -35,9 +35,12 @@
import java.util.Vector;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
// see https://issues.apache.org/activemq/browse/AMQ-2985
// this demonstrated receiving old messages eventually along with validating order receipt
+@Category(ParallelTest.class)
public class DurableSubProcessTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubProcessTest.class);
public static final long RUNTIME = 4 * 60 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java
index bc9dc5fe23b..e20c9bd2e6f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java
@@ -49,7 +49,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubProcessWithRestartTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubProcessWithRestartTest.class);
public static final long RUNTIME = 5 * 60 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java
index c1271df4a42..31bfd64d1d5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java
@@ -40,7 +40,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubSelectorDelayTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubSelectorDelayTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.java
index e2a097a2f6f..c77f67f2090 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.java
@@ -40,7 +40,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubSelectorDelayWithRestartTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubSelectorDelayWithRestartTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java
index a4750194ab8..cd55b9dde9d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
index 3eebe9bebd7..51faf85bbe3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
@@ -36,7 +36,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubsOfflineSelectorIndexUseTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubsOfflineSelectorIndexUseTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
index 777f160a065..5ff3cacc425 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionActivationTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubscriptionActivationTest extends org.apache.activemq.TestSupport {
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java
index d076c2b03d0..6e301cbe3c3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java
@@ -33,8 +33,11 @@
import java.util.List;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionOffline1Test extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOffline1Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java
index 0265685603c..8e27acb4777 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java
@@ -36,9 +36,12 @@
import java.util.List;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionOffline2Test extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOffline2Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java
index abe59ba1706..3011c672965 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java
@@ -35,9 +35,12 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionOffline3Test extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOffline3Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
index 1db4f2b6a63..f29513eb4a9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
@@ -34,9 +34,12 @@
import java.util.List;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionOffline4Test extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOffline4Test.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineBrowseRemoveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineBrowseRemoveTest.java
index f74c42334d2..29c79763feb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineBrowseRemoveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineBrowseRemoveTest.java
@@ -48,9 +48,12 @@
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionOfflineBrowseRemoveTest extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOfflineBrowseRemoveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
index e15840fc9dc..5ca3797ff37 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
@@ -46,7 +46,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubscriptionOfflineTest extends DurableSubscriptionOfflineTestBase {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOfflineTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionPartialAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionPartialAckTest.java
index 31776199a9a..b4bb09f265f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionPartialAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionPartialAckTest.java
@@ -36,7 +36,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubscriptionPartialAckTest {
private BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java
index 63a2d1769a4..f16c4fbabbf 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java
@@ -35,7 +35,10 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubscriptionSelectorTest extends org.apache.activemq.TestSupport {
MBeanServer mbs;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
index c01a0a5c5c3..bc87936f428 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
@@ -39,7 +39,10 @@
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DurableSubscriptionUnsubscribeTest extends TestSupport {
BrokerService broker = null;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUpdatesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUpdatesTest.java
index c84571d4dc9..ff07928ca29 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUpdatesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUpdatesTest.java
@@ -43,10 +43,13 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test that the durable sub updates when the offline sub is reactivated with new values.
*/
+@Category(ParallelTest.class)
public class DurableSubscriptionUpdatesTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionUpdatesTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionWithNoLocalTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionWithNoLocalTest.java
index dd24575dcd1..b9e4a41ae1a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionWithNoLocalTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionWithNoLocalTest.java
@@ -50,11 +50,14 @@
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test for spec compliance for durable subscriptions that change the noLocal flag.
*/
@RunWith(Parameterized.class)
+@Category(ParallelTest.class)
public class DurableSubscriptionWithNoLocalTest {
private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionWithNoLocalTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java
index 8e03b5f9777..81f963a5553 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java
@@ -38,7 +38,10 @@
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.core.layout.MessageLayout;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class EmptyTransactionTest extends TestCase {
private static final int CHECKPOINT_INTERVAL = 500;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
index e5394872ef9..6fa0c5c7bc8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
@@ -40,10 +40,13 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Oliver Belikan
*/
+@Category(ParallelTest.class)
public class ExceptionListenerTest implements ExceptionListener {
private static final Logger LOG = LoggerFactory.getLogger(ExceptionListenerTest.class);
BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
index f7bd5fad8fc..81c9182b990 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
@@ -40,6 +40,7 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +48,9 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ExpiredMessagesWithNoConsumerTest extends CombinationTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ExpiredMessagesWithNoConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
index 184baa0b562..be1964d3653 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
@@ -37,10 +37,13 @@
import jakarta.jms.TextMessage;
import jakarta.jms.Topic;
import jakarta.jms.TopicSubscriber;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JDBCDurableSubscriptionTest extends DurableSubscriptionTestSupport {
protected PersistenceAdapter createPersistenceAdapter() throws IOException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
index 26faccc8fbb..436c1cd4e09 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.java
@@ -18,7 +18,10 @@
import java.io.IOException;
import org.apache.activemq.store.PersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class KahaDBDurableSubscriptionTest extends DurableSubscriptionTestSupport {
protected PersistenceAdapter createPersistenceAdapter() throws IOException {
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 320ae4f1180..aab2a0a1715 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
@@ -49,8 +49,11 @@
import jakarta.jms.Queue;
import jakarta.jms.ResourceAllocationException;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class MaxUncommittedCountExceededTest {
public static final String DEFAULT_JMX_DOMAIN_NAME = "org.apache.activemq";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
index 23e7dcae3f3..85131488b94 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
@@ -33,18 +33,21 @@
import org.apache.activemq.util.ConsumerThread;
import org.apache.activemq.util.ProducerThread;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class MemoryLimitTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(MemoryLimitTest.class);
final byte[] payload = new byte[10 * 1024]; //10KB
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
index ea889785b01..7a253724cdb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
@@ -31,10 +31,13 @@
import org.apache.activemq.util.MessageIdList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class MultiBrokersMultiClientsTest extends JmsMultipleBrokersTestSupport implements UncaughtExceptionHandler {
public static final int BROKER_COUNT = 6; // number of brokers to network
public static final int CONSUMER_COUNT = 25; // consumers per broker
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
index 23cf042107b..393f74d19bc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
@@ -26,10 +26,13 @@
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class MultiBrokersMultiClientsUsingTcpTest extends MultiBrokersMultiClientsTest {
protected List bridges;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java
index 2cda502e4d8..de9dad8a236 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java
@@ -40,6 +40,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* This test demonstrates and verifies the behaviour of a network bridge when it
@@ -97,6 +99,7 @@
*
* @author schow
*/
+@Category(ParallelTest.class)
public class NetworkBridgeProducerFlowControlTest extends
JmsMultipleBrokersTestSupport {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java
index 6c06149450f..0384e73de96 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java
@@ -26,11 +26,14 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*
*/
+@Category(ParallelTest.class)
public class NewConsumerCreatesDestinationTest extends EmbeddedBrokerAndConnectionTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(NewConsumerCreatesDestinationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
index 6dfd3daa7f4..393c7bf63e7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
@@ -44,7 +44,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class NonBlockingConsumerRedeliveryTest {
private static final Logger LOG = LoggerFactory.getLogger(NonBlockingConsumerRedeliveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectSerializationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectSerializationTest.java
index e1ca778e52b..89f6302d19f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectSerializationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectSerializationTest.java
@@ -28,10 +28,13 @@
import jakarta.jms.Session;
import org.apache.activemq.test.TestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* Test that java.util Object serialization is not allowed by default
*/
+@Category(ParallelTest.class)
public class ObjectSerializationTest extends TestSupport {
private static final String VALUE_NAME = "value";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
index 92dae5d6f37..3ca69903c07 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
@@ -40,7 +40,10 @@
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class OfflineDurableSubscriberTimeoutTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(OfflineDurableSubscriberTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PriorityRedeliveryOrderTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PriorityRedeliveryOrderTest.java
index 20f80f7ab0e..543d603a73d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PriorityRedeliveryOrderTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PriorityRedeliveryOrderTest.java
@@ -38,6 +38,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
@@ -47,6 +49,7 @@
* for dispatch again.
*/
+@Category(ParallelTest.class)
public class PriorityRedeliveryOrderTest {
private static final Logger LOG = LoggerFactory.getLogger(PriorityRedeliveryOrderTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
index c701301a3e7..324127cd8ec 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq.usecases;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class PublishOnDurableTopicConsumedMessageTest extends PublishOnTopicConsumedMessageTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
index 584af37edc5..9841e05302a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq.usecases;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class PublishOnQueueConsumedMessageTest extends PublishOnTopicConsumedMessageTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
index c6b9450e99b..61a520bd6ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.usecases;
import jakarta.jms.DeliveryMode;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class PublishOnTemporaryQueueConsumedMessageTest extends PublishOnTopicConsumedMessageTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
index 9740817b181..29b9a781754 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
@@ -20,13 +20,16 @@
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageProducer;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class PublishOnTopicConsumedMessageTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
private static final Logger LOG = LoggerFactory.getLogger(PublishOnTopicConsumedMessageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingDisableConcurrentStoreAndDispatchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingDisableConcurrentStoreAndDispatchTest.java
index 66095fe2b41..d44e3e1030a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingDisableConcurrentStoreAndDispatchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingDisableConcurrentStoreAndDispatchTest.java
@@ -21,7 +21,10 @@
import java.io.File;
import java.io.IOException;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueBrowsingDisableConcurrentStoreAndDispatchTest extends QueueBrowsingTest {
@Override
public BrokerService createBroker() throws IOException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingLimitTest.java
index b0a0b67cfef..d27aca86973 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingLimitTest.java
@@ -38,7 +38,10 @@
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueBrowsingLimitTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueBrowsingLimitTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingTest.java
index 30802adab85..6b233ce01c9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingTest.java
@@ -43,7 +43,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueBrowsingTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueBrowsingTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
index 73fa27ae529..a0dd007a833 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq.usecases;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class QueueConsumerCloseAndReconnectTest extends DurableConsumerCloseAndReconnectTest {
protected boolean isTopic() {
return false;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
index 822aca2e90d..c70f06cfa32 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
@@ -39,7 +39,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueDuplicatesTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(QueueDuplicatesTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
index 6ec3d66cc58..59341f4ed06 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java
@@ -33,7 +33,10 @@
import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.usage.SystemUsage;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueMemoryFullMultiBrokersTest extends JmsMultipleBrokersTestSupport {
public static final int BROKER_COUNT = 2;
public static final int MESSAGE_COUNT = 2000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueOrderSingleTransactedConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueOrderSingleTransactedConsumerTest.java
index 8896cac733b..308591c2ea7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueOrderSingleTransactedConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueOrderSingleTransactedConsumerTest.java
@@ -38,7 +38,10 @@
import java.util.List;
import static org.junit.Assert.assertEquals;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class QueueOrderSingleTransactedConsumerTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueOrderSingleTransactedConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
index b9f821a98fb..0e1728899e0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq.usecases;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class QueueRedeliverTest extends TopicRedeliverTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
index dd4dd8e356f..bad349239e4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
@@ -42,13 +42,16 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class QueueZeroPrefetchLazyDispatchPriorityTest {
private static final Logger LOG = LoggerFactory.getLogger(QueueZeroPrefetchLazyDispatchPriorityTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndConcurrentStopBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndConcurrentStopBrokerTest.java
index fc84009f192..8ca8e4eb5d4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndConcurrentStopBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndConcurrentStopBrokerTest.java
@@ -59,8 +59,11 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class StartAndConcurrentStopBrokerTest {
private static final Logger LOG = LoggerFactory.getLogger(StartAndConcurrentStopBrokerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
index e4990b06201..267db6a9b38 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
@@ -24,11 +24,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Oliver Belikan
*
*/
+@Category(ParallelTest.class)
public class StartAndStopBrokerTest extends TestCase {
public void testStartupShutdown() throws Exception {
// This systemproperty is used if we dont want to
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
index 18adf5ddfba..2da6db0ee57 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
@@ -29,11 +29,14 @@
import org.apache.activemq.test.TestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Paul Smith
*
*/
+@Category(ParallelTest.class)
public class SubscribeClosePublishThenConsumeTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(SubscribeClosePublishThenConsumeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TempTopicProducerFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TempTopicProducerFlowControlTest.java
index 2730303f13f..e9f1bd255f8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TempTopicProducerFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TempTopicProducerFlowControlTest.java
@@ -21,7 +21,10 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TempTopicProducerFlowControlTest extends TopicProducerFlowControlTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
index 2a87b7d06e2..72b6fac3974 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
@@ -25,10 +25,13 @@
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ThreeBrokerQueueNetworkUsingTcpTest extends ThreeBrokerQueueNetworkTest {
protected List bridges;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
index 6e50b6ecb03..ff96266b33d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
@@ -25,10 +25,13 @@
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class ThreeBrokerTopicNetworkUsingTcpTest extends ThreeBrokerTopicNetworkTest {
protected List bridges;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java
index 16aeeb9209e..2d169b6dfd6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java
@@ -46,7 +46,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TopicDurableConnectStatsTest extends org.apache.activemq.TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TopicDurableConnectStatsTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerDurableSubFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerDurableSubFlowControlTest.java
index 148fd2c4bf6..a502c12b886 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerDurableSubFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerDurableSubFlowControlTest.java
@@ -36,7 +36,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TopicProducerDurableSubFlowControlTest extends TestCase implements MessageListener {
private static final Logger LOG = LoggerFactory.getLogger(TopicProducerDurableSubFlowControlTest.class);
private static final String brokerName = "testBroker";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
index 7b232ef8a64..e44b93c736b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
@@ -50,7 +50,10 @@
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TopicProducerFlowControlTest extends TestCase implements MessageListener {
private static final Logger LOG = LoggerFactory.getLogger(TopicProducerFlowControlTest.class);
private static final String brokerName = "testBroker";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerToSubFileCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerToSubFileCursorTest.java
index dc59353f8d9..38241be1ca9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerToSubFileCursorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerToSubFileCursorTest.java
@@ -36,7 +36,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TopicProducerToSubFileCursorTest extends TestCase implements MessageListener {
private static final Logger LOG = LoggerFactory.getLogger(TopicProducerToSubFileCursorTest.class);
private static final String brokerName = "testBroker";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
index 23be836d0d2..06f1286151b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
@@ -33,10 +33,13 @@
import org.apache.activemq.util.IdGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class TopicRedeliverTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TopicRedeliverTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionZeroPrefetchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionZeroPrefetchTest.java
index 1bc7abcb7c7..dafbb1b5f83 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionZeroPrefetchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionZeroPrefetchTest.java
@@ -29,12 +29,14 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +49,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class TopicSubscriptionZeroPrefetchTest {
private static final Logger LOG = LoggerFactory.getLogger(TopicSubscriptionZeroPrefetchTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
index 0aaaf859fe4..2b3f7704b25 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq.usecases;
import jakarta.jms.DeliveryMode;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class TransientQueueRedeliverTest extends TopicRedeliverTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
index d6d0d65ad54..d6b5a582870 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
@@ -18,7 +18,10 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.network.NetworkConnector;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest extends AbstractTwoBrokerNetworkConnectorWildcardIncludedDestinationTestSupport {
protected void addIncludedDestination(NetworkConnector nc) {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
index a8051db4f84..ddb80553aac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
@@ -18,7 +18,10 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.network.NetworkConnector;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest extends AbstractTwoBrokerNetworkConnectorWildcardIncludedDestinationTestSupport {
protected void addIncludedDestination(NetworkConnector nc) {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
index de9cbe28aa4..c4499183c40 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
@@ -46,10 +46,13 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSupport {
protected static final int MESSAGE_COUNT = 100; // Best if a factor of 100
protected static final int PREFETCH_COUNT = 1;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
index 0f6611a32b3..a65a7282c1e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.usecases;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*/
+@Category(ParallelTest.class)
public class TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest extends TwoBrokerTopicSendReceiveUsingTcpTest {
protected void setUp() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokersStopSlaveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokersStopSlaveTest.java
index e82a389bc07..ff26324c301 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokersStopSlaveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokersStopSlaveTest.java
@@ -25,10 +25,13 @@
import java.io.File;
import java.net.URI;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* @author Carlo Dapor
*/
+@Category(ParallelTest.class)
public class TwoBrokersStopSlaveTest extends TestCase {
private final static File KahaDbDirectory = new File("target/TwoBrokersStopSlaveTest");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
index 4c5b8113af9..82ee22dea4d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
@@ -19,10 +19,13 @@
import jakarta.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
* reproduced: https://issues.apache.org/jira/browse/AMQ-4107
*/
+@Category(ParallelTest.class)
public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends TwoBrokerTopicSendReceiveTest {
protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
index 65bc58391e9..88f4960c5d5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
@@ -44,7 +44,10 @@
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertTrue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class UnlimitedEnqueueTest {
private static final Logger LOG = LoggerFactory.getLogger(UnlimitedEnqueueTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest.java
index ae5d30df0bd..0e4f016d95b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest.java
@@ -20,7 +20,10 @@
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import java.io.IOException;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest extends UsageBlockedDispatchTest {
@Override
protected BrokerService createBroker() throws IOException {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchTest.java
index 59c8b3934c2..29844cfebde 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchTest.java
@@ -27,6 +27,7 @@
import org.apache.activemq.usage.SystemUsage;
import org.apache.activemq.util.DefaultTestAppender;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LogEvent;
@@ -39,7 +40,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class UsageBlockedDispatchTest extends TestSupport {
private static final int MESSAGES_COUNT = 100;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
index bf111f2d8fc..3f58ac8e785 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
@@ -38,7 +38,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class VerifyNetworkConsumersDisconnectTest extends JmsMultipleBrokersTestSupport implements UncaughtExceptionHandler {
public static final int BROKER_COUNT = 3;
public static final int CONSUMER_COUNT = 5;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
index 3cd14aa9dff..a6d1d4b35e4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
@@ -21,7 +21,10 @@
import org.apache.activemq.broker.BrokerService;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+@Category(ParallelTest.class)
public class DestinationBridgeAccessorsTest extends Assert {
@Test
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
index 100f2449933..32fee5d6ab3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
@@ -22,10 +22,13 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class JDBCPersistenceAdapterXBeanConfigTest extends TestCase {
protected BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
index 5397dc223e1..5b4d6c8d748 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.activemq.xbean;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class MultipleTestsWithEmbeddedBrokerAndPersistenceTest extends MultipleTestsWithEmbeddedBrokerTest {
protected boolean isPersistent() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
index e8094d9f7ab..07bb3f258d6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
@@ -18,12 +18,15 @@
import jakarta.jms.Connection;
import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class MultipleTestsWithEmbeddedBrokerTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(MultipleTestsWithEmbeddedBrokerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
index 9315bc5faab..f8b96f04d18 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
@@ -25,12 +25,15 @@
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
* @author Neil Clayton
*
*/
+@Category(ParallelTest.class)
public class MultipleTestsWithSpringFactoryBeanTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(MultipleTestsWithSpringFactoryBeanTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
index 830facc7e51..3861d85973a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
@@ -18,10 +18,13 @@
import org.apache.activemq.broker.BrokerService;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class MultipleTestsWithSpringXBeanFactoryBeanTest extends MultipleTestsWithEmbeddedBrokerTest {
private ClassPathXmlApplicationContext context;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
index c29a08cc2e5..6d16226bba8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
@@ -31,10 +31,13 @@
import org.apache.activemq.command.ConnectionInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
/**
*
*/
+@Category(ParallelTest.class)
public class XBeanConfigTest extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(XBeanConfigTest.class);