Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert xmlsec upgrade 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894691 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-11-02 17:15:53 +00:00
parent c5b2b3b984
commit d9b6f799a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.xml
View File

@ -295,7 +295,7 @@ under the License.
<dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/> <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/>
<!-- xml signature libs - not part of the distribution --> <!-- xml signature libs - not part of the distribution -->
<dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:2.3.0" 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-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-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"/> <dependency prefix="dsig.bouncycastle-util" artifact="org.bouncycastle:bcutil-jdk15on:1.69" usage="ooxml-provided"/>
@ -694,7 +694,9 @@ under the License.
<include name="bc*-1.68.jar"/> <include name="bc*-1.68.jar"/>
<include name="batik*.jar"/> <include name="batik*.jar"/>
<include name="slf4j*-1.7.30.jar"/> <include name="slf4j*-1.7.30.jar"/>
<include name="xmlsec-2.2.*.jar"/> <include name="xmlsec-2.2.0.jar"/>
<include name="xmlsec-2.2.1.jar"/>
<include name="xmlsec-2.2.2.jar"/>
</fileset> </fileset>
<fileset dir="${basedir}/lib/ooxml-tests"> <fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/> <include name="guava-20.0.jar"/>

4
poi-ooxml/build.gradle
View File

@ -74,11 +74,11 @@ dependencies {
api "org.apache.logging.log4j:log4j-api:${log4jVersion}" api "org.apache.logging.log4j:log4j-api:${log4jVersion}"
api 'org.apache.commons:commons-collections4:4.4' api 'org.apache.commons:commons-collections4:4.4'
signingImplementation 'org.apache.santuario:xmlsec:2.3.0' signingImplementation 'org.apache.santuario:xmlsec:2.2.3'
signingImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" signingImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
signingImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" signingImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"
rendersignImplementation 'org.apache.santuario:xmlsec:2.3.0' rendersignImplementation 'org.apache.santuario:xmlsec:2.2.3'
rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"