[Backport][1.3] Update BouncyCastle dependencies from jdk15to18 to jd…

…k18on (opensearch-project#12317) Signed-off-by: Milly Wilson <[email protected]>
mwilso3 · May 1, 2024 · 12bc91d · 12bc91d
1 parent 62fb37a
commit 12bc91d
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,11 @@ 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))
-- Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
--
+- [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))
+
 ### Changed
 ### Deprecated
 ### Removed

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -35,7 +35,7 @@ jetty             = 9.4.53.v20231009
 # 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.76
+bouncycastle=1.77
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.13.2

diff --git a/client/rest/licenses/bcprov-jdk15to18-1.76.jar.sha1 b/client/rest/licenses/bcprov-jdk15to18-1.76.jar.sha1
diff --git a/client/rest/licenses/bcprov-jdk18on-1.77.jar.sha1 b/client/rest/licenses/bcprov-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+2cc971b6c20949c1ff98d1a4bc741ee848a09523
diff --git a/client/rest/licenses/bcprov-jdk18on-LICENSE.txt b/client/rest/licenses/bcprov-jdk18on-LICENSE.txt
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc.
+                          (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/...ment/licenses/bcmail-jdk15to18-NOTICE.txt → ...t/rest/licenses/bcprov-jdk18on-NOTICE.txt b/...ment/licenses/bcmail-jdk15to18-NOTICE.txt → ...t/rest/licenses/bcprov-jdk18on-NOTICE.txt
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.16"
   api "commons-logging:commons-logging:${versions.commonslogging}"
-  api "org.bouncycastle:bcmail-jdk15to18:${versions.bouncycastle}"
-  api "org.bouncycastle:bcprov-jdk15to18:${versions.bouncycastle}"
-  api "org.bouncycastle:bcpkix-jdk15to18:${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-jdk15to18-1.76.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk15to18-1.76.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk18on-1.77.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+f2bb8aa55dc901ee8b8aae7d1007c03592d65e03
diff --git a/...ent/licenses/bcmail-jdk15to18-LICENSE.txt → ...hment/licenses/bcmail-jdk18on-LICENSE.txt b/...ent/licenses/bcmail-jdk15to18-LICENSE.txt → ...hment/licenses/bcmail-jdk18on-LICENSE.txt
diff --git a/...ment/licenses/bcpkix-jdk15to18-NOTICE.txt → ...chment/licenses/bcmail-jdk18on-NOTICE.txt b/...ment/licenses/bcpkix-jdk15to18-NOTICE.txt → ...chment/licenses/bcmail-jdk18on-NOTICE.txt
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15to18-1.76.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk15to18-1.76.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk18on-1.77.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+ed953791ba0229747dd0fd9911e3d76a462acfd3
diff --git a/...ent/licenses/bcpkix-jdk15to18-LICENSE.txt → ...hment/licenses/bcpkix-jdk18on-LICENSE.txt b/...ent/licenses/bcpkix-jdk15to18-LICENSE.txt → ...hment/licenses/bcpkix-jdk18on-LICENSE.txt
diff --git a/...ment/licenses/bcprov-jdk15to18-NOTICE.txt → ...chment/licenses/bcpkix-jdk18on-NOTICE.txt b/...ment/licenses/bcprov-jdk15to18-NOTICE.txt → ...chment/licenses/bcpkix-jdk18on-NOTICE.txt
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15to18-1.76.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk15to18-1.76.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk18on-1.77.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+2cc971b6c20949c1ff98d1a4bc741ee848a09523
diff --git a/...ent/licenses/bcprov-jdk15to18-LICENSE.txt → ...hment/licenses/bcprov-jdk18on-LICENSE.txt b/...ent/licenses/bcprov-jdk15to18-LICENSE.txt → ...hment/licenses/bcprov-jdk18on-LICENSE.txt
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk18on-NOTICE.txt b/plugins/ingest-attachment/licenses/bcprov-jdk18on-NOTICE.txt