From: PJ Fanning Date: Tue, 4 Apr 2023 19:04:46 +0000 (+0000) Subject: xmlsec 3.0.2 X-Git-Tag: REL_5_2_4~176 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2bf82a487f0dd3779b4a044c27976be4ad838faf;p=poi.git xmlsec 3.0.2 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1908966 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build.xml b/build.xml index 6a3d9e7020..748e1eaf98 100644 --- a/build.xml +++ b/build.xml @@ -295,7 +295,7 @@ under the License. - + diff --git a/osgi/README.md b/osgi/README.md index 1a9b7bef51..415fd921d2 100644 --- a/osgi/README.md +++ b/osgi/README.md @@ -25,7 +25,7 @@ Available in Maven Central (but version might be too old): https://mvnrepository 3. Apache XML Security for Java, Bouncy Castle and XML Commons Resolver These are required to sign or validate signed Office documents. The OSGi bundles are available in Maven Central: - - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/3.0.1 (use v2.3.0 with POI v5.2.2) + - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/3.0.2 (use v2.3.0 with POI v5.2.2) - XML Commons Resolver: https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index cb05e4ffa1..454a84821e 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -66,11 +66,11 @@ dependencies { api "org.apache.logging.log4j:log4j-api:${log4jVersion}" api 'org.apache.commons:commons-collections4:4.4' - signingImplementation 'org.apache.santuario:xmlsec:3.0.1' + signingImplementation 'org.apache.santuario:xmlsec:3.0.2' signingImplementation "org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}" signingImplementation "org.bouncycastle:bcutil-jdk18on:${bouncyCastleVersion}" - rendersignImplementation 'org.apache.santuario:xmlsec:3.0.1' + rendersignImplementation 'org.apache.santuario:xmlsec:3.0.2' rendersignImplementation "org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}" rendersignImplementation "org.bouncycastle:bcutil-jdk18on:${bouncyCastleVersion}" diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java index cfb9c6c83d..6c742523f0 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -154,8 +154,8 @@ import org.w3c.dom.events.MutationEvent; * in the classpath:

*
    *
  • BouncyCastle bcpkix and bcprov (tested against 1.72)
  • - *
  • Apache Santuario "xmlsec" (tested against 3.0.1)
  • - *
  • and log4j-api (tested against 2.19.x)
  • + *
  • Apache Santuario "xmlsec" (tested against 3.0.2)
  • + *
  • and log4j-api (tested against 2.20.x)
  • *
*/ public class SignatureInfo {