Change BouncyCastle version from jdk15on to jdk18on

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on. jdk18on contains fixed for: - CVE-2023-33201 - CVE-2022-45146
opensearch-project · Jun 24, 2023 · dfae7f4 · dfae7f4
1 parent 2407e46
commit dfae7f4
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 10 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -48,7 +48,7 @@ reactivestreams   = 1.0.4
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
 #  - distribution/tools/plugin-cli
-bouncycastle=1.70
+bouncycastle=1.75
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.13.2

diff --git a/plugins/identity-shiro/build.gradle b/plugins/identity-shiro/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 
   implementation 'org.passay:passay:1.6.3'
 
-  implementation "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
+  implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
 
   testImplementation project(path: ':modules:transport-netty4') // for http
   testImplementation project(path: ':plugins:transport-nio') // for http

diff --git a/plugins/identity-shiro/licenses/bcprov-jdk15on-1.70.jar.sha1 b/plugins/identity-shiro/licenses/bcprov-jdk15on-1.70.jar.sha1
diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
@@ -71,9 +71,9 @@ dependencies {
   api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
   api "org.apache.pdfbox:jempbox:1.8.17"
   api "commons-logging:commons-logging:${versions.commonslogging}"
-  api "org.bouncycastle:bcmail-jdk15on:${versions.bouncycastle}"
-  api "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
-  api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
+  api "org.bouncycastle:bcmail-jdk18on:${versions.bouncycastle}"
+  api "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
+  api "org.bouncycastle:bcpkix-jdk18on:${versions.bouncycastle}"
   // OpenOffice
   api "org.apache.poi:poi-ooxml:${versions.poi}"
   api "org.apache.poi:poi:${versions.poi}"

diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.70.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk18on-1.75.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk18on-1.75.jar.sha1
@@ -0,0 +1 @@
+37914b6a6ea3cad9a20ef8b37ea10de7260b8e92
diff --git a/...hment/licenses/bcmail-jdk15on-LICENSE.txt → ...hment/licenses/bcmail-jdk18on-LICENSE.txt b/...hment/licenses/bcmail-jdk15on-LICENSE.txt → ...hment/licenses/bcmail-jdk18on-LICENSE.txt
diff --git a/...chment/licenses/bcmail-jdk15on-NOTICE.txt → ...chment/licenses/bcmail-jdk18on-NOTICE.txt b/...chment/licenses/bcmail-jdk15on-NOTICE.txt → ...chment/licenses/bcmail-jdk18on-NOTICE.txt
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.70.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk18on-1.75.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk18on-1.75.jar.sha1
@@ -0,0 +1 @@
+5adfef8a71a0933454739264b56283cc73dd2383
diff --git a/...hment/licenses/bcpkix-jdk15on-LICENSE.txt → ...hment/licenses/bcpkix-jdk18on-LICENSE.txt b/...hment/licenses/bcpkix-jdk15on-LICENSE.txt → ...hment/licenses/bcpkix-jdk18on-LICENSE.txt
diff --git a/...chment/licenses/bcpkix-jdk15on-NOTICE.txt → ...chment/licenses/bcpkix-jdk18on-NOTICE.txt b/...chment/licenses/bcpkix-jdk15on-NOTICE.txt → ...chment/licenses/bcpkix-jdk18on-NOTICE.txt
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.70.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk18on-1.75.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk18on-1.75.jar.sha1
@@ -0,0 +1 @@
+fd9638f6468e934991c56242d0da2ae38890c2a4
diff --git a/...hment/licenses/bcprov-jdk15on-LICENSE.txt → ...hment/licenses/bcprov-jdk18on-LICENSE.txt b/...hment/licenses/bcprov-jdk15on-LICENSE.txt → ...hment/licenses/bcprov-jdk18on-LICENSE.txt
diff --git a/...chment/licenses/bcprov-jdk15on-NOTICE.txt → ...chment/licenses/bcprov-jdk18on-NOTICE.txt b/...chment/licenses/bcprov-jdk15on-NOTICE.txt → ...chment/licenses/bcprov-jdk18on-NOTICE.txt
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -51,7 +51,7 @@ dependencies {
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api "io.netty:netty-all:${versions.netty}"
   api 'com.google.code.gson:gson:2.10.1'
-  api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
+  api "org.bouncycastle:bcpkix-jdk18on:${versions.bouncycastle}"
   api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
   api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"