diff options
| author | PJ Fanning <fanningpj@apache.org> | 2021-06-28 19:52:52 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2021-06-28 19:52:52 +0000 |
| commit | 17ff1ae0dba3ebfa279e36bba0ce603bd85d25fb (patch) | |
| tree | 816389844fbbbdec27de560ca42f1c7ad40c9604 /build.xml | |
| parent | 132dbf936dde46e729e1e44cb8a783ef868b78f4 (diff) | |
| download | poi-17ff1ae0dba3ebfa279e36bba0ce603bd85d25fb.tar.gz poi-17ff1ae0dba3ebfa279e36bba0ce603bd85d25fb.zip | |
upgrade bouncycastle
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891116 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -296,10 +296,11 @@ under the License. <!-- 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.bouncycastle-prov" artifact="org.bouncycastle:bcprov-jdk15on:1.68" usage="ooxml-provided"/> - <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk15on:1.68" 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"/> <!-- only used for signing the release - not used with the ooxml signatures --> - <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk15on:1.68" usage="util"/> + <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk15on:1.69" usage="util"/> <!-- svg/batik/pdf libs - not part of the distribution - move batik to its own directory because of JPMS module-path issues --> <dependency prefix="svg.xml-apis-ext" artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-batik"/> @@ -468,6 +469,7 @@ under the License. <pathelement location="${dsig.xmlsec.jar}"/> <pathelement location="${dsig.bouncycastle-prov.jar}"/> <pathelement location="${dsig.bouncycastle-pkix.jar}"/> + <pathelement location="${dsig.bouncycastle-util.jar}"/> </path> <path id="ooxml.base.classpath"> @@ -691,6 +693,7 @@ under the License. <fileset dir="${basedir}/lib/ooxml-provided"> <include name="bc*-1.65.jar"/> <include name="bc*-1.66.jar"/> + <include name="bc*-1.68.jar"/> <include name="batik*.jar"/> <include name="slf4j*-1.7.30.jar"/> <include name="xmlsec*-2.2.1.jar"/> @@ -742,6 +745,7 @@ under the License. <available file="${forbidden.jar}"/> <available file="${dsig.bouncycastle-prov.jar}"/> <available file="${dsig.bouncycastle-pkix.jar}"/> + <available file="${dsig.bouncycastle-util.jar}"/> <available file="${dsig.xmlsec.jar}"/> <available file="${main.commons-collections4.jar}"/> <available file="${main.commons-math3.jar}"/> @@ -799,6 +803,7 @@ under the License. <downloadfile src="${forbidden.url}" dest="${forbidden.jar}"/> <downloadfile src="${dsig.bouncycastle-prov.url}" dest="${dsig.bouncycastle-prov.jar}"/> <downloadfile src="${dsig.bouncycastle-pkix.url}" dest="${dsig.bouncycastle-pkix.jar}"/> + <downloadfile src="${dsig.bouncycastle-util.url}" dest="${dsig.bouncycastle-util.jar}"/> <downloadfile src="${dsig.xmlsec.url}" dest="${dsig.xmlsec.jar}"/> </target> @@ -2696,6 +2701,7 @@ under the License. </fileset> <auxClasspath path="${dsig.bouncycastle-pkix.jar}" /> <auxClasspath path="${dsig.bouncycastle-prov.jar}" /> + <auxClasspath path="${dsig.bouncycastle-util.jar}" /> <auxClasspath path="${dsig.xmlsec.jar}" /> <auxClasspath path="${ooxml.xsds.jar}" /> <auxClasspath path="${ooxml.curvesapi.jar}" /> |