Repository: activemq Updated Branches: refs/heads/master 1499f2eee -> f09000d1e
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 39a20bd788c664105c18886abf77c372cf9229aa. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1bef4de4 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1bef4de4 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1bef4de4 Branch: refs/heads/master Commit: 1bef4de4dc6744c23c22d2dac0faf0c9a6ab68d9 Parents: 1499f2e Author: gtully <gary.tu...@gmail.com> Authored: Mon Nov 30 12:47:13 2015 +0000 Committer: gtully <gary.tu...@gmail.com> Committed: Mon Nov 30 13:24:18 2015 +0000 ---------------------------------------------------------------------- activemq-broker/pom.xml | 5 ---- .../util/DefaultIOExceptionHandlerTest.java | 26 ++++---------------- pom.xml | 7 ------ 3 files changed, 5 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/1bef4de4/activemq-broker/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml index b905db3..5f8545b 100755 --- a/activemq-broker/pom.xml +++ b/activemq-broker/pom.xml @@ -79,11 +79,6 @@ <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> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/activemq/blob/1bef4de4/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java b/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java index 0d63e1e..a9e2070 100644 --- a/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java +++ b/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java @@ -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; -public class DefaultIOExceptionHandlerTest { - @Rule - public final ExpectedSystemExit exit = ExpectedSystemExit.none(); +import static org.junit.Assert.*; + +public class DefaultIOExceptionHandlerTest { 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); } http://git-wip-us.apache.org/repos/asf/activemq/blob/1bef4de4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d26d332..f988a3f 100755 --- a/pom.xml +++ b/pom.xml @@ -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> @@ -997,12 +996,6 @@ <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> <version>${mockito-version}</version>
