Преглед изворни кода

revert xmlsec upgrade

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894691 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_5_2_0
PJ Fanning пре 2 година
родитељ
комит
d9b6f799a6
2 измењених фајлова са 6 додато и 4 уклоњено
  1. 4
    2
      build.xml
  2. 2
    2
      poi-ooxml/build.gradle

+ 4
- 2
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.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-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"/>
@@ -694,7 +694,9 @@ under the License.
<include name="bc*-1.68.jar"/>
<include name="batik*.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 dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/>

+ 2
- 2
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.3.0'
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.3.0'
rendersignImplementation 'org.apache.santuario:xmlsec:2.2.3'
rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"


Loading…
Откажи
Сачувај