diff --git a/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java index a159f3e087..21f4ce29de 100755 --- a/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java @@ -17,6 +17,7 @@ package org.apache.activemq; import java.lang.Thread.UncaughtExceptionHandler; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -46,8 +47,6 @@ import org.apache.activemq.command.ActiveMQQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.emory.mathcs.backport.java.util.Collections; - /** * Test cases used to test the JMS message consumer. * diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java index 20ce751c47..872da8b299 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java @@ -18,6 +18,7 @@ package org.apache.activemq.broker; import java.net.URI; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,8 +37,6 @@ import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.emory.mathcs.backport.java.util.Collections; - @SuppressWarnings("unchecked") public class NioQueueSubscriptionTest extends QueueSubscriptionTest implements ExceptionListener { diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java index e9845f8e02..9221686789 100644 --- a/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java @@ -21,6 +21,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -43,8 +44,6 @@ import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.util.ServiceStopper; import org.apache.log4j.Logger; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; - /** * TestCase showing the message-destroying described in AMQ-1925 * diff --git a/pom.xml b/pom.xml index 4b661bcac1..975dcd46b4 100755 --- a/pom.xml +++ b/pom.xml @@ -265,12 +265,12 @@ org.apache.activemq activeio-core - 3.1.0 + 3.1.2 org.apache.activemq activeio-core - 3.1.0 + 3.1.2 test-jar test