Repository: camel Updated Branches: refs/heads/camel-2.18.x a8fa3ebd3 -> 752ac58a2
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/84a2eefe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84a2eefe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84a2eefe Branch: refs/heads/camel-2.18.x Commit: 84a2eefe4b61a6f134eba8582f9313c163e52371 Parents: a8fa3eb Author: James Netherton <jamesnether...@gmail.com> Authored: Wed Oct 19 09:34:20 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Wed Oct 19 13:41:28 2016 +0200 ---------------------------------------------------------------------- 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/84a2eefe/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index d0bc64b..5008577 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/84a2eefe/components/camel-aws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index 5ebb477..5cffb8a 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -131,7 +131,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/84a2eefe/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 2c1f749..358d510 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -148,7 +148,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/84a2eefe/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 5652157..b018961 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -290,7 +290,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/84a2eefe/components/camel-hipchat/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml index 760141a..635ade5 100644 --- a/components/camel-hipchat/pom.xml +++ b/components/camel-hipchat/pom.xml @@ -85,7 +85,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/84a2eefe/components/camel-mina/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 7a4ce79..8587015 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/84a2eefe/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/84a2eefe/components/camel-mina2/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index 5367492..870dd0f 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/84a2eefe/components/camel-smpp/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index 5b0cedc..203c708 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/84a2eefe/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/84a2eefe/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/84a2eefe/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/84a2eefe/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/84a2eefe/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/84a2eefe/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/84a2eefe/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/84a2eefe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e13bd9c..5a4879f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -160,7 +160,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> @@ -3849,11 +3849,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/84a2eefe/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 db1e48f..06deb1d 100644 --- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -2802,12 +2802,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>
