From 34b700be89d966f2e155e3c8680f578e206257df Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Fri, 27 May 2022 16:01:27 -0700
Subject: [PATCH] Move mockito dependency management to root pom

---
 dependencies/pom.xml                   | 6 ------
 examples/security/spi-examples/pom.xml | 5 +++++
 examples/webserver/opentracing/pom.xml | 2 ++
 pom.xml                                | 6 ++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index eb634f06844..a22ea41f90f 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -121,7 +121,6 @@
         <version.lib.microprofile-tracing>3.0</version.lib.microprofile-tracing>
         <version.lib.microprofile-lra-api>2.0-RC1</version.lib.microprofile-lra-api>
         <version.lib.microstream>05.00.02-MS-GA</version.lib.microstream>
-        <version.lib.mockito>2.23.4</version.lib.mockito>
         <version.lib.mongodb.reactivestreams>1.11.0</version.lib.mongodb.reactivestreams>
         <version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
         <version.lib.mysql-connector-java>8.0.28</version.lib.mysql-connector-java>
@@ -1392,11 +1391,6 @@
             <!-- END OF Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
 
             <!-- Section 4: Testing -->
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${version.lib.mockito}</version>
-            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
diff --git a/examples/security/spi-examples/pom.xml b/examples/security/spi-examples/pom.xml
index ff57dd5c4d4..bec6ff5257f 100644
--- a/examples/security/spi-examples/pom.xml
+++ b/examples/security/spi-examples/pom.xml
@@ -35,6 +35,10 @@
         Example of implementation of custom providers and other SPI implementations
     </description>
 
+    <properties>
+        <version.lib.mockito>2.23.4</version.lib.mockito>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.helidon.security</groupId>
@@ -57,6 +61,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>${version.lib.mockito}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/examples/webserver/opentracing/pom.xml b/examples/webserver/opentracing/pom.xml
index 6add050598b..84c08a4a0e9 100644
--- a/examples/webserver/opentracing/pom.xml
+++ b/examples/webserver/opentracing/pom.xml
@@ -37,6 +37,7 @@
 
     <properties>
         <mainClass>io.helidon.webserver.examples.opentracing.Main</mainClass>
+        <version.lib.mockito>2.23.4</version.lib.mockito>
     </properties>
 
     <dependencies>
@@ -65,6 +66,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>${version.lib.mockito}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 8cdb3727a60..a20421982c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
         <version.lib.jboss-logging-annotations>2.2.1.Final</version.lib.jboss-logging-annotations>
         <version.lib.junit4>4.13.1</version.lib.junit4>
         <version.lib.kafka-junit5>3.2.3</version.lib.kafka-junit5>
+        <version.lib.mockito>2.23.4</version.lib.mockito>
         <version.lib.netty.tcnative>2.0.52.Final</version.lib.netty.tcnative>
         <version.lib.restito>0.9.1</version.lib.restito>
         <version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
@@ -960,6 +961,11 @@
                 <artifactId>netty-tcnative-boringssl-static</artifactId>
                 <version>${version.lib.netty.tcnative}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${version.lib.mockito}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit.junit</artifactId>