diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | build.xml | 12 | ||||
| -rw-r--r-- | maven/poi-ooxml.pom | 9 | ||||
| -rw-r--r-- | osgi/README.md | 2 | ||||
| -rw-r--r-- | poi-ooxml/build.gradle | 1 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 9 |
6 files changed, 26 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle index 819bf6c430..ec4519ccea 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ subprojects { version = '5.0.1-SNAPSHOT' ext { - bouncyCastleVersion = '1.68' + bouncyCastleVersion = '1.69' commonsCodecVersion = '1.15' commonsCompressVersion = '1.20' commonsIoVersion = '2.10.0' @@ -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}" /> diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom index f9b32c20de..a11cdf5a28 100644 --- a/maven/poi-ooxml.pom +++ b/maven/poi-ooxml.pom @@ -79,12 +79,17 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.68</version> + <version>1.69</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.68</version> + <version>1.69</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk15on</artifactId> + <version>1.69</version> </dependency> <dependency> <groupId>org.apache.santuario</groupId> diff --git a/osgi/README.md b/osgi/README.md index f241dc973b..d573448d14 100644 --- a/osgi/README.md +++ b/osgi/README.md @@ -29,7 +29,7 @@ These are required to sign or validate signed Office documents. The OSGi bundles - 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.68, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.68 + - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.69, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.69 4. PDFBox and PDFBox Graphics2D Required to render to PDF documents. The required jars can be downloaded from: diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 0c6668afd8..8800b475e6 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -52,6 +52,7 @@ dependencies { api "org.apache.commons:commons-compress:${commonsCompressVersion}" api 'org.apache.santuario:xmlsec:2.2.2' api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" + api "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" api 'com.github.virtuald:curvesapi:1.06' implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 41f1523351..0157ce5e97 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -129,12 +129,17 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.68</version> + <version>1.69</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.68</version> + <version>1.69</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk15on</artifactId> + <version>1.69</version> </dependency> <dependency> <groupId>org.apache.santuario</groupId> |