Repository: camel Updated Branches: refs/heads/master e275446a4 -> b0c2d2bd8
CAMEL-10400: Upgrade easymock to version 3.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd55146a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd55146a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd55146a Branch: refs/heads/master Commit: fd55146af4986fe77cebba753562dad40caf272a Parents: e275446 Author: James Netherton <jamesnether...@gmail.com> Authored: Wed Oct 19 09:34:20 2016 +0100 Committer: James Netherton <jamesnether...@gmail.com> Committed: Wed Oct 19 12:11:19 2016 +0100 ---------------------------------------------------------------------- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 8 +++++++- components/camel-hipchat/pom.xml | 2 +- components/camel-mina/pom.xml | 2 +- .../camel/component/mina/MinaProducerShutdownMockTest.java | 6 +++--- components/camel-mina2/pom.xml | 2 +- components/camel-smpp/pom.xml | 2 +- .../component/smpp/MessageReceiverListenerImplTest.java | 6 +++--- .../apache/camel/component/smpp/SmppCancelSmCommandTest.java | 6 +++--- .../org/apache/camel/component/smpp/SmppEndpointTest.java | 6 +++--- .../component/smpp/SmppProducerLazySessionCreationTest.java | 6 +++--- .../org/apache/camel/component/smpp/SmppProducerTest.java | 6 +++--- .../apache/camel/component/smpp/SmppQuerySmCommandTest.java | 6 +++--- .../camel/component/smpp/SmppReplaceSmCommandTest.java | 6 +++--- parent/pom.xml | 7 +------ spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 7 +------ 18 files changed, 40 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index ad67f08..e076fc0 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-aws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index 5525824..43da218 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -130,7 +130,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 65377e6..5e40d80 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -147,7 +147,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index c77c29c..be08f29 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -288,7 +288,13 @@ <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${cglib-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-hipchat/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml index baf31b6..0105e87 100644 --- a/components/camel-hipchat/pom.xml +++ b/components/camel-hipchat/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-mina/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 511bae2..c7de5c4c 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -85,7 +85,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java index 177a656..732bac0 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java @@ -26,9 +26,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.mina.transport.socket.nio.SocketConnector; import org.junit.Test; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; /** * Unit testing for using a MinaProducer that it can shutdown properly (CAMEL-395) http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-mina2/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index e93df1a..7623b43 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index 101fd0c..dcc8c6f 100644 --- a/components/camel-smpp/pom.xml +++ b/components/camel-smpp/pom.xml @@ -70,7 +70,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java index 32fbf7b..d571efa 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java @@ -32,9 +32,9 @@ import org.junit.Before; import org.junit.Test; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppCancelSmCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppCancelSmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppCancelSmCommandTest.java index ec44223..484c0e5 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppCancelSmCommandTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppCancelSmCommandTest.java @@ -26,9 +26,9 @@ import org.jsmpp.session.SMPPSession; import org.junit.Before; import org.junit.Test; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; public class SmppCancelSmCommandTest { http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java index 040d02c..679b0d4 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java @@ -31,9 +31,9 @@ import org.junit.Test; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java index effefd7..56d95a0 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java @@ -29,9 +29,9 @@ import org.junit.Test; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; /** * JUnit test class for <code>org.apache.camel.component.smpp.SmppProducer</code> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java index a479bcc..217a5b6 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java @@ -30,9 +30,9 @@ import org.junit.Test; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertSame; /** http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppQuerySmCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppQuerySmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppQuerySmCommandTest.java index 124f21a..0a40e04 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppQuerySmCommandTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppQuerySmCommandTest.java @@ -29,9 +29,9 @@ import org.junit.Before; import org.junit.Test; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java index 228206c..1cc6539 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java @@ -37,9 +37,9 @@ import org.junit.Test; import static org.easymock.EasyMock.aryEq; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.isNull; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; public class SmppReplaceSmCommandTest { http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c047bbf..66aa701 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -162,7 +162,7 @@ <dozer-version>5.5.1</dozer-version> <drools-version>6.4.0.Final</drools-version> <dropbox-version>1.8.2</dropbox-version> - <easymock-version>3.2</easymock-version> + <easymock-version>3.4</easymock-version> <eclipse-compiler-version>4.2.2</eclipse-compiler-version> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> <egit-github-core-version>2.1.5</egit-github-core-version> @@ -3880,11 +3880,6 @@ <version>${easymock-version}</version> </dependency> <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>${easymock-version}</version> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>${mockito-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/fd55146a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 0b68929..6aeab32 100644 --- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -2791,12 +2791,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>3.2</version> + <version>3.4</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId>
