From 3d7a9ff9d2c3ef48f869a4f23aedeaaeede99fb4 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sun, 13 May 2018 16:43:48 +0200 Subject: [PATCH] Update to Mockito 2.18.3. This also swaps out the dependency on mockito-all with mockito-core, which is actually maintained. The purpose of updating is to allow for new Mockito features, such as mocking final methods, which happens due to the test resource org.mockito.plugins.MockMaker. --- pom.xml | 4 ++-- .../mockito-extensions/org.mockito.plugins.MockMaker | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/pom.xml b/pom.xml index fb591ef..1a27f31 100644 --- a/pom.xml +++ b/pom.xml @@ -97,8 +97,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 2.18.3 \ No newline at end of file diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 0000000..1f0955d --- /dev/null +++ b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline