Backporting BouncyCastle upgrades from 1.75 to 1.78

Cleaning up changes after cherry-picking multiple BC bumps.
opensearch-project · May 1, 2024 · 4ab9346 · 4ab9346
1 parent 6115adc
commit 4ab9346
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,12 +7,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Added
 ### Dependencies
 - OpenJDK Update (April 2024 Patch releases), update to Eclipse Temurin 11.0.23+9 ([#13406](https://github.com/opensearch-project/OpenSearch/pull/13406))
-- [Backport] Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))
-- [Backport] Bump `org.bouncycastle:bcprov-jdk15to18` to `org.bouncycastle:bcprov-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
-- [Backport] Bump `org.bouncycastle:bcmail-jdk15to18` to `org.bouncycastle:bcmail-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
-- [Backport] Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
-- [Backport] Bump bouncycastle from 1.77 to 1.78 ([#13243](https://github.com/opensearch-project/OpenSearch/pull/13243))
-
 ### Changed
 ### Deprecated
 ### Removed

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -113,6 +113,18 @@ dependencies {
     module("org.bouncycastle:bcutil-jdk15on") {
       replacedBy("org.bouncycastle:bcutil-jdk15to18", "the jdk15on artifacts are not supported anymore")
     }
+    module("org.bouncycastle:bcprov-jdk15to18") {
+      replacedBy("org.bouncycastle:bcprov-jdk18on", "the jdk15to18 artifacts are not supported anymore")
+    }
+    module("org.bouncycastle:bcpkix-jdk15to18") {
+      replacedBy("org.bouncycastle:bcpkix-jdk18on", "the jdk15to18 artifacts are not supported anymore")
+    }
+    module("org.bouncycastle:bcpg-jdk15to18") {
+      replacedBy("org.bouncycastle:bcpg-jdk18on", "the jdk15to18 artifacts are not supported anymore")
+    }
+    module("org.bouncycastle:bcutil-jdk15to18") {
+      replacedBy("org.bouncycastle:bcutil-jdk18on", "the jdk15to18 artifacts are not supported anymore")
+    }
   }
   api localGroovy()
 
@@ -135,10 +147,10 @@ dependencies {
   api 'org.apache.maven:maven-model:3.6.2'
   api 'com.networknt:json-schema-validator:1.0.36'
   api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
-  api "org.bouncycastle:bcprov-jdk15to18:${props.getProperty('bouncycastle')}"
-  api "org.bouncycastle:bcpkix-jdk15to18:${props.getProperty('bouncycastle')}"
-  api "org.bouncycastle:bcpg-jdk15to18:${props.getProperty('bouncycastle')}"
-  api "org.bouncycastle:bcutil-jdk15to18:${props.getProperty('bouncycastle')}"
+  api "org.bouncycastle:bcprov-jdk18on:${props.getProperty('bouncycastle')}"
+  api "org.bouncycastle:bcpkix-jdk18on:${props.getProperty('bouncycastle')}"
+  api "org.bouncycastle:bcpg-jdk18on:${props.getProperty('bouncycastle')}"
+  api "org.bouncycastle:bcutil-jdk18on:${props.getProperty('bouncycastle')}"
 
   testFixturesApi "junit:junit:${props.getProperty('junit')}"
   testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"

diff --git a/client/rest/licenses/bcprov-jdk18on-1.78.jar.sha1 b/client/rest/licenses/bcprov-jdk18on-1.78.jar.sha1
diff --git a/client/rest/licenses/bcprov-jdk18on-LICENSE.txt b/client/rest/licenses/bcprov-jdk18on-LICENSE.txt
diff --git a/client/rest/licenses/bcprov-jdk18on-NOTICE.txt b/client/rest/licenses/bcprov-jdk18on-NOTICE.txt
diff --git a/release-notes/opensearch.release-notes-1.3.12.md b/release-notes/opensearch.release-notes-1.3.12.md
@@ -6,3 +6,8 @@
 - Upgrade `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247))
 - Upgrade `netty` from 4.1.94.Final to 4.1.96.Final ([#9030](https://github.com/opensearch-project/OpenSearch/pull/9030))
 - Upgrade bundled OpenJDK (July 2023 Patch releases) ([#8872](https://github.com/opensearch-project/OpenSearch/pull/8872))
+- Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))
+- Bump `org.bouncycastle:bcprov-jdk15to18` to `org.bouncycastle:bcprov-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
+- Bump `org.bouncycastle:bcmail-jdk15to18` to `org.bouncycastle:bcmail-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
+- Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
+- Bump bouncycastle from 1.77 to 1.78 ([#13243](https://github.com/opensearch-project/OpenSearch/pull/13243))