Repository: camel Updated Branches: refs/heads/master 71996da18 -> 87b1ee34c
CAMEL-11845: Migrate easymock and powermock to mockito remove no longer necessary easymock dependency Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87b1ee34 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87b1ee34 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87b1ee34 Branch: refs/heads/master Commit: 87b1ee34ce45bbb9428073a7854a3ffb97efdc4a Parents: 22500d9 Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Wed Oct 11 23:44:24 2017 +0200 Committer: Pascal Schumacher <pascalschumac...@gmx.net> Committed: Thu Oct 12 20:33:18 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 6 ------ .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 ----- 2 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87b1ee34/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1ed4918..ea1f3be 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -190,7 +190,6 @@ <dozer-version>6.1.0</dozer-version> <drools-version>7.3.0.Final</drools-version> <dropbox-version>3.0.4</dropbox-version> - <easymock-version>3.4</easymock-version> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> <egit-github-core-version>2.1.5</egit-github-core-version> <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> @@ -4370,11 +4369,6 @@ <version>${awaitility-version}</version> </dependency> <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</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/87b1ee34/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index c4b61b6..2bb397b 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3242,11 +3242,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.4</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> <version>9.4.6.v20170531</version>