From 6072972fcc104d1c9217f7a6dc288e81617915ed Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 19 Sep 2018 21:49:55 +0000 Subject: [PATCH] [bug-62747] bouncycastle 1.60 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1841394 13f79535-47bb-0310-9956-ffa450edef68 --- .classpath | 4 ++-- build.gradle | 2 +- build.xml | 21 ++++++++----------- sonar/ooxml/pom.xml | 4 ++-- .../poi/poifs/crypt/dsig/SignatureInfo.java | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.classpath b/.classpath index e689084f27..fc3394904a 100644 --- a/.classpath +++ b/.classpath @@ -28,8 +28,8 @@ - - + + diff --git a/build.gradle b/build.gradle index 771c7cdb5f..53044f830a 100644 --- a/build.gradle +++ b/build.gradle @@ -232,7 +232,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.0' - compile 'org.bouncycastle:bcpkix-jdk15on:1.59' + compile 'org.bouncycastle:bcpkix-jdk15on:1.60' compile 'com.github.virtuald:curvesapi:1.05' // for ooxml-lite, should we move this somewhere else? diff --git a/build.xml b/build.xml index 59a82b7414..abe465528d 100644 --- a/build.xml +++ b/build.xml @@ -202,10 +202,10 @@ under the License. - - - - + + + + @@ -294,10 +294,10 @@ under the License. - - - - + + + + @@ -676,10 +676,7 @@ under the License. - - - - + diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 72c5229322..c61f42ecde 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -137,12 +137,12 @@ org.bouncycastle bcpkix-jdk15on - 1.59 + 1.60 org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 org.apache.santuario 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 86fcb58a4e..20c347d4d7 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -150,7 +150,7 @@ import org.w3c.dom.events.EventTarget; *

To use SignatureInfo and its sibling classes, you'll need to have the following libs * in the classpath:

*
    - *
  • BouncyCastle bcpkix and bcprov (tested against 1.59)
  • + *
  • BouncyCastle bcpkix and bcprov (tested against 1.60)
  • *
  • Apache Santuario "xmlsec" (tested against 2.1.0)
  • *
  • and slf4j-api (tested against 1.7.25)
  • *
-- 2.39.5