Skip to content

Commit 06a75ac

Browse files
authored
Migrate from BC to BCFIPS libraries (#1087)
* Set bouncycastle version inline Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * Set to 1.80 Signed-off-by: Craig Perkins <[email protected]> * Switch back to 1.78 Signed-off-by: Craig Perkins <[email protected]> * Remove unused bouncycastle dependency Signed-off-by: Craig Perkins <[email protected]> * Migrate from BC to BCFIPS libraries Signed-off-by: Craig Perkins <[email protected]> * Update CHANGELOG entry Signed-off-by: Craig Perkins <[email protected]> * Hardcode version Signed-off-by: Craig Perkins <[email protected]> * Change qualifier to beta1 Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]>
1 parent e49812b commit 06a75ac

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
1414
### Infrastructure
1515
### Documentation
1616
### Maintenance
17+
- Migrate from BC to BCFIPS libraries ([#1087](https://github.com/opensearch-project/flow-framework/pull/1087))
18+
1719
### Refactoring
1820

1921
## [Unreleased 2.x](https://github.com/opensearch-project/flow-framework/compare/2.18...2.x)

build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import java.nio.file.Paths
88

99
buildscript {
1010
ext {
11-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
12-
buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
11+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-beta1-SNAPSHOT")
12+
buildVersionQualifier = System.getProperty("build.version_qualifier", "beta1")
1313
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1414
version_tokens = opensearch_version.tokenize('-')
1515
opensearch_build = version_tokens[0] + '.0'
@@ -177,7 +177,8 @@ dependencies {
177177
implementation "software.amazon.cryptography:aws-cryptographic-material-providers:1.9.0"
178178
implementation "org.dafny:DafnyRuntime:4.10.0"
179179
implementation "software.amazon.smithy.dafny:conversion:0.1.1"
180-
implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
180+
// needed by aws-encryption-sdk-java
181+
implementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
181182
api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}"
182183
implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.1"
183184
implementation "org.glassfish:jakarta.json:2.0.1"

0 commit comments

Comments
 (0)