From 1e4c425e662e4dae857b34832f21e84d79408607 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Fri, 8 Oct 2021 07:53:00 +0000
Subject: [PATCH] mockito 4

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894015 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle | 2 +-
 build.xml    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 81230377d4..68d827776e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,7 @@ subprojects {
         commonsMathVersion = '3.6.1'
         junitVersion = '5.7.2'
         log4jVersion = '2.14.1'
-        mockitoVersion = '3.12.4'
+        mockitoVersion = '4.0.0'
         hamcrestVersion = '2.2'
         xmlbeansVersion = '5.0.1'
         batikVersion = '1.14'
diff --git a/build.xml b/build.xml
index 894de31c92..326ddfa0ea 100644
--- a/build.xml
+++ b/build.xml
@@ -284,7 +284,7 @@ under the License.
     <dependency prefix="main.jmhAnnotation" artifact="org.openjdk.jmh:jmh-generator-annprocess:1.33" usage="main-tests"/>
     <dependency prefix="main.hamcrest" artifact="org.hamcrest:hamcrest:2.2" usage="main-tests"/>
     <dependency prefix="main.xmlunit" artifact="org.xmlunit:xmlunit-core:2.8.2" usage="main-tests"/>
-    <dependency prefix="main.mockito" artifact="org.mockito:mockito-core:3.6.28" usage="main-tests"/>
+    <dependency prefix="main.mockito" artifact="org.mockito:mockito-core:4.0.0" usage="main-tests"/>
     <dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.11.19" usage="main-tests"/>
     <dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.11.19" usage="main-tests"/>
     <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
@@ -681,8 +681,7 @@ under the License.
                 <include name="*slf4j*.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/main-tests">
-                <include name="mockito-core-3.2*.jar"/>
-                <include name="mockito-core-3.5*.jar"/>
+                <include name="mockito-core-3*.jar"/>
                 <include name="hamcrest-core*"/>
                 <include name="junit-4*.jar"/>
                 <include name="*slf4j*.jar"/>
-- 
2.39.5