mirror of https://github.com/apache/activemq.git
fix for https://issues.apache.org/activemq/browse/AMQ-1380 - upgrade to activeio 3.1.2 and remove backport dependencies
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@797359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2350d8b764
commit
444412f0df
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -265,12 +265,12 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activeio-core</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>3.1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activeio-core</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>3.1.2</version>
|
||||
<type>test-jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
|
Loading…
Reference in New Issue