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' diff --git a/build.xml b/build.xml index e709ae0b22..bacf083d18 100644 --- a/build.xml +++ b/build.xml @@ -296,10 +296,11 @@ under the License. - - + + + - + @@ -468,6 +469,7 @@ under the License. + @@ -691,6 +693,7 @@ under the License. + @@ -742,6 +745,7 @@ under the License. + @@ -799,6 +803,7 @@ under the License. + @@ -2696,6 +2701,7 @@ under the License. + 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 @@ org.bouncycastle bcpkix-jdk15on - 1.68 + 1.69 org.bouncycastle bcprov-jdk15on - 1.68 + 1.69 + + + org.bouncycastle + bcutil-jdk15on + 1.69 org.apache.santuario 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 @@ org.bouncycastle bcpkix-jdk15on - 1.68 + 1.69 org.bouncycastle bcprov-jdk15on - 1.68 + 1.69 + + + org.bouncycastle + bcutil-jdk15on + 1.69 org.apache.santuario