diff options
| -rw-r--r-- | .classpath | 4 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | build.xml | 18 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 4 | ||||
| -rw-r--r-- | src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/.classpath b/.classpath index 839c8ec9cf..7da16a871d 100644 --- 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.30.jar"/> - <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.64.jar"/> - <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.64.jar"/> + <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.65.jar"/> + <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.65.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 dfdd63d87f..150b43f58b 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ subprojects { version = '4.1.3-SNAPSHOT' ext { - bouncyCastleVersion = '1.64' + bouncyCastleVersion = '1.65' commonsCodecVersion = '1.14' commonsCompressVersion = '1.20' commonsMathVersion = '3.6.1' @@ -225,10 +225,10 @@ under the License. <!-- xml signature libs --> <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.5.jar"/> <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.5/xmlsec-2.1.5.jar"/> - <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.64.jar"/> - <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/> - <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.64.jar"/> - <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar"/> + <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.65.jar"/> + <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.65/bcprov-ext-jdk15on-1.65.jar"/> + <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.65.jar"/> + <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65.jar"/> <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.30.jar"/> <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> @@ -325,10 +325,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.64.jar"/> - <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/> - <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.64.jar"/> - <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.64/bcpg-jdk15on-1.64.jar"/> + <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.65.jar"/> + <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.65/bcprov-ext-jdk15on-1.65.jar"/> + <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.65.jar"/> + <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.65/bcpg-jdk15on-1.65.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"/> @@ -723,6 +723,8 @@ under the License. <include name="bc*jdk15on-1.60*.jar"/> <include name="bc*jdk15on-1.61*.jar"/> <include name="bc*jdk15on-1.62*.jar"/> + <include name="bc*jdk15on-1.63*.jar"/> + <include name="bc*jdk15on-1.64*.jar"/> <include name="batik-all-1.10.jar"/> <include name="batik-all-1.11.jar"/> <include name="slf4j-api-1.7.7.jar"/> diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 28308494bb..8954afdd86 100644 --- 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.64</version> + <version>1.65</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.64</version> + <version>1.65</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 7be687a48e..d6ce28b759 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 @@ -152,7 +152,7 @@ import org.w3c.dom.events.MutationEvent; * <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.64)</li> + * <li>BouncyCastle bcpkix and bcprov (tested against 1.65)</li> * <li>Apache Santuario "xmlsec" (tested against 2.1.5)</li> * <li>and slf4j-api (tested against 1.7.30)</li> * </ul> |