updated mockito to 2.23.4 to fix java 11 build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1850590 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index cdf4f1767ecc35b422304c631ee9fafa901a50b9..4db3d90586f1859a4a09c096f13fed7304d1886c 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -185,7 +185,7 @@ project('main') {
         compile 'javax.activation:activation:1.1.1'
 
         testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:2.21.0'
+        testCompile 'org.mockito:mockito-core:2.23.4'
         testCompile 'org.reflections:reflections:0.9.11'
     }
 
@@ -248,7 +248,7 @@ project('ooxml') {
         compile files('../../ooxml-lib/ooxml-security-1.1.jar')
 
         testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:2.21.0'
+        testCompile 'org.mockito:mockito-core:2.23.4'
         testCompile 'org.xmlunit:xmlunit-core:2.5.1'
         testCompile 'org.reflections:reflections:0.9.11'
         testCompile project(path: ':main', configuration: 'tests')

diff --git a/build.xml b/build.xml
index e4736655c84860faef07bd0b393c33d67b43c645..c2c19e61c364318de372fa7f1fe651130515ecbc 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -176,12 +176,12 @@ under the License.
     <property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
     <property name="main.xmlunit.jar" location="${main.lib}/xmlunit-core-2.5.1.jar"/>
     <property name="main.xmlunit.url" value="${repository.m2}/maven2/org/xmlunit/xmlunit-core/2.5.1/xmlunit-core-2.5.1.jar"/>
-    <property name="main.mockito.jar" location="${main.lib}/mockito-core-2.21.0.jar"/>
-    <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/2.21.0/mockito-core-2.21.0.jar"/>
-    <property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.7.9.jar"/>
-    <property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9.jar"/>
-    <property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.7.9.jar"/>
-    <property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.7.9/byte-buddy-agent-1.7.9.jar"/>
+    <property name="main.mockito.jar" location="${main.lib}/mockito-core-2.23.4.jar"/>
+    <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar"/>
+    <property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.9.3.jar"/>
+    <property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3.jar"/>
+    <property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.9.3.jar"/>
+    <property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3.jar"/>
     <property name="main.ant.jar" location="${main.lib}/ant-1.10.1.jar"/>
     <property name="main.objenesis.jar" location="${main.lib}/objenesis-2.6.jar"/>
     <property name="main.objenesis.url" value="${repository.m2}/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.jar"/>
@@ -671,7 +671,10 @@ under the License.
                 <include name="forbiddenapis-2.3.jar"/>
                 <include name="forbiddenapis-2.5.jar"/>
                 <include name="apache-rat-0.11.jar"/>
-                <include name="mockito-core-2.13.0.jar"/>
+                               <include name="mockito-core-2.13.0.jar"/>
+                <include name="mockito-core-2.21.0.jar"/>
+                               <include name="byte-buddy-1.7.9.jar"/>
+                               <include name="byte-buddy-agent-1.7.9.jar"/>
             </fileset>
             <fileset dir="${ooxml.lib}">
                 <!-- remove jars from previous versions, but not the current version -->