upgrade bouncycastle

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891108 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index 819bf6c430295a7a65d09d2c80ba6aefb53c6c75..ec4519cceab6e4edba541d2a6eb5c1c44e04f751 100644 (file)
--- 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 e709ae0b2291911ae1439f29783a1b15e2517197..40e54165beba230749000fd2e9f8507bacd10fdc 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -296,10 +296,10 @@ 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"/>
     <!-- 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"/>

diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index f9b32c20dece1682894c0ea8dde100a60f1a03ee..593459dce0fb8b1e9e51ae93d14e51b0054e0a1f 100644 (file)
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -79,12 +79,12 @@
         <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.apache.santuario</groupId>

diff --git a/osgi/README.md b/osgi/README.md
index f241dc973b0e50e90482c2ab4b66b0c9fc82de1f..d573448d1443880c34963a893877b61cac69c9c3 100644 (file)
--- 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/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 41f152335102f2dcd9f69044fdeb371ac12a6eb6..fdf297b3e8b2f3ff8674078c17e301cf68f09809 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -129,12 +129,12 @@
         <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.apache.santuario</groupId>