From 3efd3f7adf6abcf8d25ca7dd01e9da88654eba96 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Thu, 29 Aug 2019 23:07:33 +0000
Subject: [PATCH] upgrade commons-codec and mockito

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1866106 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath         |  4 ++--
 build.gradle       |  4 ++--
 build.xml          | 25 ++++++++++++-------------
 maven/poi.pom      |  2 +-
 sonar/main/pom.xml |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.classpath b/.classpath
index d3744e86e8..a5a9fbdb83 100644
--- a/.classpath
+++ b/.classpath
@@ -34,14 +34,14 @@
 	<classpathentry kind="lib" path="ooxml-testlib/guava.jar"/>
 	<classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/>
 	<classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/xmlunit-core-2.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/commons-compress-1.18.jar"/>
-	<classpathentry kind="lib" path="lib/mockito-core-2.23.4.jar"/>
+	<classpathentry kind="lib" path="lib/mockito-core-3.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/byte-buddy-1.9.3.jar"/>
 	<classpathentry kind="lib" path="lib/byte-buddy-agent-1.9.3.jar"/>
 	<classpathentry kind="lib" path="compile-lib/batik-all-1.11.jar"/>
diff --git a/build.gradle b/build.gradle
index 346d0774c8..2c8b15ff65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -178,7 +178,7 @@ project('main') {
     sourceSets.test.java.srcDirs = ['../../src/testcases']
 
     dependencies {
-        compile 'commons-codec:commons-codec:1.12'
+        compile 'commons-codec:commons-codec:1.13'
         compile 'commons-logging:commons-logging:1.2'
         compile 'org.apache.commons:commons-collections4:4.3'
         compile 'org.apache.commons:commons-math3:3.6.1'
@@ -188,7 +188,7 @@ project('main') {
         compile 'javax.activation:activation:1.1.1'
 
         testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:2.23.4'
+        testCompile 'org.mockito:mockito-core:3.0.0'
         testCompile 'org.reflections:reflections:0.9.11'
     }
 
diff --git a/build.xml b/build.xml
index 301249cc6c..8604752e5a 100644
--- a/build.xml
+++ b/build.xml
@@ -172,9 +172,9 @@ under the License.
     <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.2.jar"/>
     <property name="main.commons-logging.url"
               value="${repository.m2}/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.12.jar"/>
+    <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.13.jar"/>
     <property name="main.commons-codec.url"
-              value="${repository.m2}/maven2/commons-codec/commons-codec/1.12/commons-codec-1.12.jar"/>
+              value="${repository.m2}/maven2/commons-codec/commons-codec/1.13/commons-codec-1.13.jar"/>
     <property name="main.log4j.jar" location="${main.lib}/log4j-1.2.17.jar"/>
     <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
     <property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/>
@@ -188,12 +188,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.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.mockito.jar" location="${main.lib}/mockito-core-3.0.0.jar"/>
+    <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/3.0.0/mockito-core-3.0.0.jar"/>
+    <property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.10.1.jar"/>
+    <property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.10.1/byte-buddy-1.10.1.jar"/>
+    <property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.10.1.jar"/>
+    <property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.10.1/byte-buddy-agent-1.10.1.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"/>
@@ -649,6 +649,7 @@ under the License.
                 <include name="commons-codec-1.9*"/>
                 <include name="commons-codec-1.10*"/>
                 <include name="commons-codec-1.11*"/>
+                <include name="commons-codec-1.12*"/>
                 <include name="commons-compress-1.16*"/>
                 <include name="commons-compress-1.17*"/>
                 <include name="commons-collections4-4.1*"/>
@@ -677,16 +678,14 @@ 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.21.0.jar"/>
-                <include name="byte-buddy-1.7.9.jar"/>
-                <include name="byte-buddy-agent-1.7.9.jar"/>
+                <include name="mockito-core-2*.jar"/>
+                <include name="byte-buddy-*1.7*.jar"/>
+                <include name="byte-buddy-*1.9*.jar"/>
                 <include name="lib/jaxb-api-2.3.0.jar"/>
                 <include name="lib/jaxb-impl-2.3.0.1.jar"/>
             </fileset>
             <fileset dir="${ooxml.lib}">
                 <!-- remove jars from previous versions, but not the current version -->
-                <include name="commons-collections4-4.1*"/>
                 <include name="ooxml-schemas-src-1.1.jar"/>
                 <include name="ooxml-schemas-1.1-sources.jar"/>
                 <include name="ooxml-schemas-1.1.jar"/>
diff --git a/maven/poi.pom b/maven/poi.pom
index a99f1962fb..f53e22cb37 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.12</version>
+      <version>1.13</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 9fd676da09..0e368f00f4 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.12</version>
+            <version>1.13</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
-- 
2.39.5