Bump mockito to 4.11.0

https://github.com/mockito/mockito/releases/tag/v4.10.0
https://github.com/mockito/mockito/releases/tag/v4.11.0

Also use mockito-bom to import all dependencies.

Change-Id: I8367b843abc4e05ab11414798988e514f36be4f5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 9de4768e9da4a30af192c2ea1aa179ab97dbb6d0..8e60ce61ee6a596b76e136820b65199563ddac4e 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -244,15 +244,9 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
+            <artifactId>mockito-bom</artifactId>
+            <type>pom</type>
+            <version>4.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 3b2f9c13f829262e0268bb5202c72430e1e2f446..a9c5cdcd75793fca7067269e3309b601313c5d6a 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -135,6 +135,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-bom</artifactId>
+        <version>4.11.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -142,24 +149,6 @@
         <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>4.9.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-junit-jupiter</artifactId>
-        <version>4.9.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>4.9.0</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest</artifactId>