From 90286eea729b620ae09f1b80d747f2e2009489f1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 21 Mar 2025 16:35:24 -0400 Subject: [PATCH 1/9] Set bouncycastle version inline Signed-off-by: Craig Perkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fae0ced0..ff7bff46 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0" implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" - implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}" + implementation "org.bouncycastle:bcprov-jdk18on:1.78" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 5495874fce624ec9f91739268a5e553ca61ea261 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 21 Mar 2025 16:41:35 -0400 Subject: [PATCH 2/9] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58e89fb1..3f55086b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Infrastructure ### Documentation ### Maintenance +- Set bouncycastle version inline ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087)) + ### Refactoring ## [Unreleased 2.x](https://github.com/opensearch-project/flow-framework/compare/2.18...2.x) From fb22312de71f26efb1a6adadeeb432cc43e38126 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 21 Mar 2025 17:13:12 -0400 Subject: [PATCH 3/9] Set to 1.80 Signed-off-by: Craig Perkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ff7bff46..7c92f3cc 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0" implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" - implementation "org.bouncycastle:bcprov-jdk18on:1.78" + implementation "org.bouncycastle:bcprov-jdk18on:1.80" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 8301834a5ae312596fafd6f2810fa651d55779cd Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 21 Mar 2025 17:18:35 -0400 Subject: [PATCH 4/9] Switch back to 1.78 Signed-off-by: Craig Perkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7c92f3cc..ff7bff46 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0" implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" - implementation "org.bouncycastle:bcprov-jdk18on:1.80" + implementation "org.bouncycastle:bcprov-jdk18on:1.78" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 4bec1e6083d59c196b844bc8af27eb617e9f1277 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Mar 2025 21:06:29 -0400 Subject: [PATCH 5/9] Remove unused bouncycastle dependency Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f55086b..02013be9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Infrastructure ### Documentation ### Maintenance -- Set bouncycastle version inline ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087)) +- Remove unused bouncycastle ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087)) ### Refactoring diff --git a/build.gradle b/build.gradle index ff7bff46..c2205f0a 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,6 @@ dependencies { implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0" implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" - implementation "org.bouncycastle:bcprov-jdk18on:1.78" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 68d30b7b34eb6b725663e9692c51206d188c07aa Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Mar 2025 21:23:21 -0400 Subject: [PATCH 6/9] Migrate from BC to BCFIPS libraries Signed-off-by: Craig Perkins --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index c2205f0a..6e0f0fdd 100644 --- a/build.gradle +++ b/build.gradle @@ -177,6 +177,8 @@ dependencies { implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0" implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" + // needed by aws-encryption-sdk-java + implementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 83f6b4e00e06b335c8642c5089a8c663640e5372 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Mar 2025 21:24:24 -0400 Subject: [PATCH 7/9] Update CHANGELOG entry Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02013be9..e332080d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Infrastructure ### Documentation ### Maintenance -- Remove unused bouncycastle ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087)) +- Migrate from BC to BCFIPS libraries ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087)) ### Refactoring From 20c7191bff0a617f19f188ffdf52653f634c12d9 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Mar 2025 21:36:17 -0400 Subject: [PATCH 8/9] Hardcode version Signed-off-by: Craig Perkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6e0f0fdd..bf0d5d2e 100644 --- a/build.gradle +++ b/build.gradle @@ -178,7 +178,7 @@ dependencies { implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" // needed by aws-encryption-sdk-java - implementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}" + implementation "org.bouncycastle:bc-fips:2.0.0" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1" From 5cc0cb4ee12996546eb2526111a34fc35b914dfc Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Mar 2025 21:45:32 -0400 Subject: [PATCH 9/9] Change qualifier to beta1 Signed-off-by: Craig Perkins --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bf0d5d2e..babf78e7 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ import java.nio.file.Paths buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") - buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-beta1-SNAPSHOT") + buildVersionQualifier = System.getProperty("build.version_qualifier", "beta1") isSnapshot = "true" == System.getProperty("build.snapshot", "true") version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' @@ -178,7 +178,7 @@ dependencies { implementation "org.dafny:DafnyRuntime:4.10.0" implementation "software.amazon.smithy.dafny:conversion:0.1.1" // needed by aws-encryption-sdk-java - implementation "org.bouncycastle:bc-fips:2.0.0" + implementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}" api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1" implementation "org.glassfish:jakarta.json:2.0.1"