Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "https://issues.apache.org/jira/browse/AMQ-6065" 

CPL dependency is not fully compatable with ASF and is not really necessary

This reverts commit 39a20bd788.
This commit is contained in:
gtully 2015-11-30 12:47:13 +00:00
parent 1499f2eee0
commit 1bef4de4dc
3 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-broker/pom.xml
View File

@ -78,11 +78,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>

26
activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java
View File

@ -17,43 +17,27 @@
package org.apache.activemq.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.SuppressReplyException;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ExpectedSystemExit;
import org.junit.contrib.java.lang.system.internal.NoExitSecurityManager;
import static org.junit.Assert.*;
public class DefaultIOExceptionHandlerTest {
@Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none();
DefaultIOExceptionHandler underTest = new DefaultIOExceptionHandler();
@Test(timeout=20000)
@Test
public void testHandleWithShutdownOnExit() throws Exception {
exit.expectSystemExit();
doTest(true);
assertTrue(Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return ((NoExitSecurityManager)System.getSecurityManager()).isCheckExitCalled();
}
}, 10000));
}
@Test(timeout=20000)
@Test
public void testHandleWithOutShutdownOnExit() throws Exception {
doTest(false);
}

7
pom.xml
View File

@ -117,7 +117,6 @@
<spring-version>4.1.8.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<stax2-api-version>3.0.2</stax2-api-version>
<system-rules-version>1.13.0</system-rules-version>
<velocity-version>1.7</velocity-version>
<woodstox-core-asl-version>4.2.0</woodstox-core-asl-version>
<xalan-version>2.7.2</xalan-version>
@ -996,12 +995,6 @@
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>${system-rules-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>