upgrade bouncycastle

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

diff --git a/.classpath b/.classpath
index 2b8a9f099024f6e9e1b1b5dbd864f6887850eed6..e486e2df9d24a2a2ddaf123d8f0bc064c32634d6 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -28,8 +28,8 @@
        <classpathentry kind="lib" path="lib/jmh-generator-annprocess-1.19.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.26.jar"/>
-       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.61.jar"/>
-       <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.61.jar"/>
+       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.62.jar"/>
+       <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.62.jar"/>
        <classpathentry kind="lib" path="ooxml-testlib/reflections.jar"/>
        <classpathentry kind="lib" path="ooxml-testlib/guava.jar"/>
        <classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/>

diff --git a/build.gradle b/build.gradle
index 2c8b15ff6524ed260665117d81b98ca777217bd1..dd5c360b2fd833e24f98f52a42ecc245791863c6 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -235,7 +235,7 @@ project('ooxml') {
         compile 'org.apache.commons:commons-math3:3.6.1'
         compile 'org.apache.commons:commons-compress:1.18'
         compile 'org.apache.santuario:xmlsec:2.1.2'
-        compile 'org.bouncycastle:bcpkix-jdk15on:1.61'
+        compile 'org.bouncycastle:bcpkix-jdk15on:1.62'
         compile 'com.github.virtuald:curvesapi:1.06'
 
         // compile only, don't add it to our dist as it blows up the size
@@ -252,7 +252,7 @@ project('ooxml') {
         compile files('../../ooxml-lib/ooxml-security-1.1.jar')
 
         testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:2.23.4'
+        testCompile 'org.mockito:mockito-core:3.0.0'
         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 8604752e5a5042be90e221b5cb271b1ed9a9295a..cf3265475ebce04aad3e49f10461fa754ab8094e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -222,10 +222,10 @@ under the License.
     <!-- xml signature libs -->
     <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.2.jar"/>
     <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.2/xmlsec-2.1.2.jar"/>
-    <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.61.jar"/>
-    <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.61/bcprov-ext-jdk15on-1.61.jar"/>
-    <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.61.jar"/>
-    <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.61/bcpkix-jdk15on-1.61.jar"/>
+    <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/>
+    <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/>
+    <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.62.jar"/>
+    <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.62/bcpkix-jdk15on-1.62.jar"/>
     <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.26.jar"/>
     <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
 
@@ -322,10 +322,10 @@ under the License.
     <property name="halt.on.test.failure" value="true"/>
 
     <!-- helper jars for pgp signing, building and nexus staging -->
-    <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.61.jar"/>
-    <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.61/bcprov-ext-jdk15on-1.61.jar"/>
-    <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.61.jar"/>
-    <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.61/bcpg-jdk15on-1.61.jar"/>
+    <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/>
+    <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/>
+    <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.62.jar"/>
+    <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.62/bcpg-jdk15on-1.62.jar"/>
     <property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/>
     <property name="dist.commons-openpgp.url" value="https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20190121.221905-12.jar"/>
     <property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
@@ -707,6 +707,7 @@ under the License.
                 <include name="xmlsec-2.1.0.jar"/>
                 <include name="bc*jdk15on-1.5*.jar"/>
                 <include name="bc*jdk15on-1.60*.jar"/>
+                <include name="bc*jdk15on-1.61*.jar"/>
                 <include name="batik-all-1.10.jar"/>
                 <include name="slf4j-api-1.7.7.jar"/>
                 <include name="slf4j-api-1.7.12.jar"/>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index f7e5e0c0edaefc3fa5c1d69f1581a9ea500a1820..4737fd05accddd303c97cad4b8473c5d48493593 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.61</version>
+            <version>1.62</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.61</version>
+            <version>1.62</version>
         </dependency>
         <dependency>
             <groupId>org.apache.santuario</groupId>

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 32dc8db2e4ef5335c2c53a6824afea6a8d300575..7fbed2459d1ce4b8f55fc4e38b64f7bb0a2bafff 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -149,7 +149,7 @@ import org.w3c.dom.events.EventTarget;
  * <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
  * in the classpath:</p>
  * <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.61)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.62)</li>
  * <li>Apache Santuario "xmlsec" (tested against 2.1.2)</li>
  * <li>and slf4j-api (tested against 1.7.26)</li>
  * </ul>