Author: fanningpj
Date: Fri Feb 10 20:34:01 2023
New Revision: 1907568
URL: http://svn.apache.org/viewvc?rev=1907568&view=rev
Log:
upgrade bouncycastle
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/osgi/README.md
poi/trunk/poi-ooxml/build.gradle
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1907568&r1=1907567&r2=1907568&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Feb 10 20:34:01 2023
@@ -115,7 +115,7 @@ subprojects {
apply plugin: 'org.cyclonedx.bom'
ext {
- bouncyCastleVersion = '1.70'
+ bouncyCastleVersion = '1.72'
commonsCodecVersion = '1.15'
commonsCompressVersion = '1.22'
commonsIoVersion = '2.11.0'
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1907568&r1=1907567&r2=1907568&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Feb 10 20:34:01 2023
@@ -296,11 +296,11 @@ under the License.
<!-- xml signature libs - not part of the distribution -->
<dependency prefix="dsig.xmlsec"
artifact="org.apache.santuario:xmlsec:3.0.1" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-prov"
artifact="org.bouncycastle:bcprov-jdk15on:1.70" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-pkix"
artifact="org.bouncycastle:bcpkix-jdk15on:1.70" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-util"
artifact="org.bouncycastle:bcutil-jdk15on:1.70" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-prov"
artifact="org.bouncycastle:bcprov-jdk18on:1.72" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-pkix"
artifact="org.bouncycastle:bcpkix-jdk18on:1.72" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-util"
artifact="org.bouncycastle:bcutil-jdk18on:1.72" 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.70" usage="util"/>
+ <dependency prefix="dsig.bouncycastle-bcpg"
artifact="org.bouncycastle:bcpg-jdk18on:1.72.2" usage="util"/>
<dependency prefix="ooxml.test.stax2"
artifact="org.codehaus.woodstox:stax2-api:4.2.1" usage="ooxml-provided"/>
<!-- svg/batik/pdf libs - not part of the distribution - move batik to its
own directory because of JPMS module-path issues -->
Modified: poi/trunk/osgi/README.md
URL:
http://svn.apache.org/viewvc/poi/trunk/osgi/README.md?rev=1907568&r1=1907567&r2=1907568&view=diff
==============================================================================
--- poi/trunk/osgi/README.md (original)
+++ poi/trunk/osgi/README.md Fri Feb 10 20:34:01 2023
@@ -25,11 +25,11 @@ Available in Maven Central (but version
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.0 (use
v2.3.0 with POI v5.2.2)
+ - 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)
- XML Commons Resolver:
https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi
- - Bouncy Castle:
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.70,
https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.70
+ - Bouncy Castle:
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk18on/1.72,
https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on/1.72
4. PDFBox and PDFBox Graphics2D
Required to render to PDF documents.
The required jars can be downloaded from:
Modified: poi/trunk/poi-ooxml/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1907568&r1=1907567&r2=1907568&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Fri Feb 10 20:34:01 2023
@@ -67,12 +67,12 @@ dependencies {
api 'org.apache.commons:commons-collections4:4.4'
signingImplementation 'org.apache.santuario:xmlsec:3.0.1'
- signingImplementation
"org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
- signingImplementation
"org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"
+ signingImplementation
"org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}"
+ signingImplementation
"org.bouncycastle:bcutil-jdk18on:${bouncyCastleVersion}"
rendersignImplementation 'org.apache.santuario:xmlsec:3.0.1'
- rendersignImplementation
"org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
- rendersignImplementation
"org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"
+ rendersignImplementation
"org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}"
+ rendersignImplementation
"org.bouncycastle:bcutil-jdk18on:${bouncyCastleVersion}"
renderImplementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}"
renderImplementation "de.rototor.pdfbox:graphics2d:${graphics2dVersion}"
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1907568&r1=1907567&r2=1907568&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
Fri Feb 10 20:34:01 2023
@@ -153,9 +153,9 @@ import org.w3c.dom.events.MutationEvent;
* <p>To use SignatureInfo and its sibling classes, you'll need to have the
following libs
* in the classpath:</p>
* <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.70)</li>
- * <li>Apache Santuario "xmlsec" (tested against 2.3.0)</li>
- * <li>and log4j-api (tested against 2.17.x)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.72)</li>
+ * <li>Apache Santuario "xmlsec" (tested against 3.0.1)</li>
+ * <li>and log4j-api (tested against 2.19.x)</li>
* </ul>
*/
public class SignatureInfo {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
