GH-287 update bouncy castle to jdk18 - 1.76.

pcorless · Aug 1, 2023 · 8306555 · 8306555
1 parent 4902d06
commit 8306555
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/core/core-awt/build.gradle b/core/core-awt/build.gradle
@@ -10,8 +10,8 @@ repositories {
 
 dependencies {
     // signature validation.
-    implementation 'org.bouncycastle:bcprov-ext-jdk15on:' + "${BOUNCY_VERSION}"
-    implementation 'org.bouncycastle:bcpkix-jdk15on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcprov-ext-jdk18on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcpkix-jdk18on:' + "${BOUNCY_VERSION}"
     // tiff, jpeg2000 and jbig decoding
     implementation 'com.twelvemonkeys.imageio:imageio-tiff:' + "${MONKEY_VERSION}"
     implementation 'org.apache.pdfbox:jbig2-imageio:' + "${JBIG2_VERSION}"

diff --git a/core/core-awt/pom.xml b/core/core-awt/pom.xml
@@ -41,12 +41,12 @@
         <!-- Bouncy castle is need for building the core bundles as well as digital signature support -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
+            <artifactId>bcprov-ext-jdk18on</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
 
         <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -23,13 +23,13 @@
             <!-- Bouncy castle is need for building the core bundles as well as digital signature support -->
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-ext-jdk15on</artifactId>
+                <artifactId>bcprov-ext-jdk18on</artifactId>
                 <version>${bouncy.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
+                <artifactId>bcpkix-jdk18on</artifactId>
                 <version>${bouncy.version}</version>
             </dependency>
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ PRODUCT=ICEpdf
 VERSION=7.2.0-SNAPSHOT
 RELEASE_TYPE=
 # dependencies versions
-BOUNCY_VERSION=1.70
+BOUNCY_VERSION=1.76
 JAI_VERSION=1.4.0
 MONKEY_VERSION=3.9.4
 JBIG2_VERSION=3.0.4

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <bouncy.version>1.70</bouncy.version>
+        <bouncy.version>1.76</bouncy.version>
         <twelve-monkey.version>3.9.4</twelve-monkey.version>
         <jai-imageio.version>1.4.0</jai-imageio.version>
         <jbig2.version>3.0.4</jbig2.version>

diff --git a/qa/viewer-jfx/build.gradle b/qa/viewer-jfx/build.gradle
@@ -59,9 +59,8 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
     implementation group: 'junit', name: 'junit', version: '4.13.1'
     // signature validation.
-    implementation 'org.bouncycastle:bcprov-jdk15on:' + "${BOUNCY_VERSION}"
-    implementation 'org.bouncycastle:bcprov-ext-jdk15on:' + "${BOUNCY_VERSION}"
-    implementation 'org.bouncycastle:bcpkix-jdk15on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcprov-ext-jdk18on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcpkix-jdk18on:' + "${BOUNCY_VERSION}"
     // tiff, jpeg2000 and jbig decoding
     implementation 'com.twelvemonkeys.imageio:imageio-tiff:'  + "${MONKEY_VERSION}"
     implementation 'com.github.jai-imageio:jai-imageio-jpeg2000:' + "${JAI_VERSION}"

diff --git a/viewer/viewer-awt/build.gradle b/viewer/viewer-awt/build.gradle
@@ -19,9 +19,8 @@ repositories {
 dependencies {
     implementation project(':core:core-awt')
     // signature validation.
-    implementation 'org.bouncycastle:bcprov-jdk15on:' + "${BOUNCY_VERSION}"
-    implementation 'org.bouncycastle:bcprov-ext-jdk15on:' + "${BOUNCY_VERSION}"
-    implementation 'org.bouncycastle:bcpkix-jdk15on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcprov-ext-jdk18on:' + "${BOUNCY_VERSION}"
+    implementation 'org.bouncycastle:bcpkix-jdk18on:' + "${BOUNCY_VERSION}"
 }
 
 // generatePomFileForViewerJarPublication