aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2021-09-23 16:38:21 +0000
committerPJ Fanning <fanningpj@apache.org>2021-09-23 16:38:21 +0000
commita1783b6ce702aae3b97fda1dbba955b77fb37915 (patch)
tree2b2630dd1cad0a0f5743d26670695bf8c0a050c5
parent8e9a6c736d67aaa7f7d0bdd226958c563a9ef0f1 (diff)
downloadpoi-a1783b6ce702aae3b97fda1dbba955b77fb37915.tar.gz
poi-a1783b6ce702aae3b97fda1dbba955b77fb37915.zip
xmlsec 2.2.3
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1893567 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.xml3
-rw-r--r--osgi/README.md2
-rw-r--r--poi-ooxml/build.gradle4
3 files changed, 5 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index 9b878063c2..7dca2e679c 100644
--- a/build.xml
+++ b/build.xml
@@ -295,7 +295,7 @@ under the License.
<dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/>
<!-- xml signature libs - not part of the distribution -->
- <dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:2.2.2" usage="ooxml-provided"/>
+ <dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:2.2.3" usage="ooxml-provided"/>
<dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-jdk15on:1.69" usage="ooxml-provided"/>
<dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk15on:1.69" usage="ooxml-provided"/>
<dependency prefix="dsig.bouncycastle-util" artifact="org.bouncycastle:bcutil-jdk15on:1.69" usage="ooxml-provided"/>
@@ -698,6 +698,7 @@ under the License.
<include name="batik*.jar"/>
<include name="slf4j*-1.7.30.jar"/>
<include name="xmlsec*-2.2.1.jar"/>
+ <include name="xmlsec*-2.2.2.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/>
diff --git a/osgi/README.md b/osgi/README.md
index d573448d14..d5f6791205 100644
--- a/osgi/README.md
+++ b/osgi/README.md
@@ -25,7 +25,7 @@ Available in Maven Central: https://mvnrepository.com/artifact/net.sf.saxon/saxo
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/2.2.1
+ - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/2.2.3
- 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 d6ac1c2149..45c16f38d5 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -74,11 +74,11 @@ dependencies {
api "org.apache.logging.log4j:log4j-api:${log4jVersion}"
api 'org.apache.commons:commons-collections4:4.4'
- signingImplementation 'org.apache.santuario:xmlsec:2.2.2'
+ signingImplementation 'org.apache.santuario:xmlsec:2.2.3'
signingImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
signingImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"
- rendersignImplementation 'org.apache.santuario:xmlsec:2.2.2'
+ rendersignImplementation 'org.apache.santuario:xmlsec:2.2.3'
rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"