diff --git a/aws/pom.xml b/aws/pom.xml
index 176ecaa40d..26bc0c8037 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -137,7 +137,7 @@
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
         <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
-        <mockito-core.version>2.8.9</mockito-core.version>
+        <mockito-core.version>2.21.0</mockito-core.version>
         <assertj-core.version>3.8.0</assertj-core.version>
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index f07ed2c6a0..434898635f 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -213,7 +213,7 @@
         <web3j.core.version>3.3.1</web3j.core.version>
         <springframework.version>5.0.5.RELEASE</springframework.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <jackson-databind.version>2.5.0</jackson-databind.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jackson.version>2.9.3</jackson.version>
diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index afee807428..7b4eecd880 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -84,7 +84,7 @@
         <spring-test.version>5.0.5.RELEASE</spring-test.version>
         <gson.version>2.8.2</gson.version>
         <assertj.version>3.9.1</assertj.version>
-        <mockito.version>2.18.3</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-io.version>2.6</commons-io.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
diff --git a/pom.xml b/pom.xml
index db3bef7fda..5a46ae2b19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1238,7 +1238,7 @@
 		<!-- <gib.enabled>false</gib.enabled> -->
 		<junit.version>4.12</junit.version>
 		<org.hamcrest.version>1.3</org.hamcrest.version>
-		<mockito.version>2.8.9</mockito.version>
+		<mockito.version>2.21.0</mockito.version>
 		<!-- logging -->
 		<org.slf4j.version>1.7.21</org.slf4j.version>
 		<logback.version>1.1.7</logback.version>
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index 9e885462f3..60f3262f08 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -16,11 +16,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -82,15 +77,7 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>https://maven.java.net/content/repositories/releases/</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <mockito.version>1.10.19</mockito.version>
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>
diff --git a/spring-mockito/pom.xml b/spring-mockito/pom.xml
index 6aeaa9a1e8..d1fa7f410e 100644
--- a/spring-mockito/pom.xml
+++ b/spring-mockito/pom.xml
@@ -24,13 +24,13 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 
 </project>
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java b/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
index 05cb43e4df..51db07fde7 100644
--- a/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
+++ b/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
@@ -3,7 +3,7 @@ package com.baeldung.domain.util;
 import com.baeldung.domain.model.Message;
 import org.mockito.ArgumentMatcher;
 
-public class MessageMatcher extends ArgumentMatcher<Message> {
+public class MessageMatcher implements ArgumentMatcher<Message> {
 
     private Message left;
 
@@ -12,16 +12,11 @@ public class MessageMatcher extends ArgumentMatcher<Message> {
     }
 
     @Override
-    public boolean matches(Object object) {
-        if (object instanceof Message) {
-            Message right = (Message) object;
-            return left.getFrom().equals(right.getFrom()) &&
-                    left.getTo().equals(right.getTo()) &&
-                    left.getText().equals(right.getText()) &&
-                    right.getDate() != null &&
-                    right.getId() != null;
-        }
-
-        return false;
+    public boolean matches(Message right) {
+        return left.getFrom().equals(right.getFrom()) &&
+          left.getTo().equals(right.getTo()) &&
+          left.getText().equals(right.getText()) &&
+          right.getDate() != null &&
+          right.getId() != null;
     }
 }
\ No newline at end of file
diff --git a/testing-modules/mockito-2/pom.xml b/testing-modules/mockito-2/pom.xml
index 4b7dc70155..cab4d7977b 100644
--- a/testing-modules/mockito-2/pom.xml
+++ b/testing-modules/mockito-2/pom.xml
@@ -15,6 +15,6 @@
     </parent>
 
     <properties>
-        <mockito.version>2.8.9</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 </project>
diff --git a/testing-modules/mocks/mock-comparisons/pom.xml b/testing-modules/mocks/mock-comparisons/pom.xml
index 9424757a7a..df54db0c70 100644
--- a/testing-modules/mocks/mock-comparisons/pom.xml
+++ b/testing-modules/mocks/mock-comparisons/pom.xml
@@ -46,7 +46,7 @@
     </build>
 
     <properties>
-        <mockito.version>2.9.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <easymock.version>3.5.1</easymock.version>
         <jmockit.version>1.34</jmockit.version>
     </properties>
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index 0ace187555..1f4c483988 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -104,7 +104,7 @@
         <junit.vintage.version>4.12.1</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
-        <mockito.version>2.11.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <spring.version>5.0.1.RELEASE</spring.version>
         <testcontainers.version>1.7.2</testcontainers.version>
         <postgresql.version>42.2.2</postgresql.version>