migrate to latest mockito - works with no changes now that test-support is brought in
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/19297853 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/19297853 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/19297853 Branch: refs/heads/master Commit: 19297853ac1d03deeb64dab59d9e07b0079eafba Parents: a4511ac Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Aug 3 11:46:02 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Aug 3 11:46:02 2018 +0100 ---------------------------------------------------------------------- modularity-server/external-modules/pom.xml | 2 +- modularity-server/module-api/pom.xml | 2 +- pom.xml | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/19297853/modularity-server/external-modules/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/external-modules/pom.xml b/modularity-server/external-modules/pom.xml index 0204c8f..1ca9927 100644 --- a/modularity-server/external-modules/pom.xml +++ b/modularity-server/external-modules/pom.xml @@ -47,7 +47,7 @@ <!--TEST SCOPE--> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/19297853/modularity-server/module-api/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/module-api/pom.xml b/modularity-server/module-api/pom.xml index ba8fd82..5ae263c 100644 --- a/modularity-server/module-api/pom.xml +++ b/modularity-server/module-api/pom.xml @@ -67,7 +67,7 @@ <!--TEST SCOPE--> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/19297853/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 79989af..237b16b 100644 --- a/pom.xml +++ b/pom.xml @@ -105,9 +105,6 @@ <node.version>v8.4.0</node.version> <npm.version>5.4.1</npm.version> - <!-- deps from brooklyn-server deliberately overridden here (tests, don't matter so much if at different version) --> - <mockito.version>1.10.19</mockito.version> - </properties> <build>
