Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from BC to BCFIPS libraries #1087

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Migrate from BC to BCFIPS libraries #1087

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cd7eb8
Set bouncycastle version inline
cwperks Mar 21, 2025
15c54b5
Add to CHANGELOG
cwperks Mar 21, 2025
58cdb46
Set to 1.80
cwperks Mar 21, 2025
dda331a
Switch back to 1.78
cwperks Mar 21, 2025
e494942
Remove unused bouncycastle dependency
cwperks Mar 23, 2025
4d263bf
Migrate from BC to BCFIPS libraries
cwperks Mar 23, 2025
323ede9
Update CHANGELOG entry
cwperks Mar 23, 2025
0383797
Hardcode version
cwperks Mar 23, 2025
f8d601b
Change qualifier to beta1
cwperks Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
### Infrastructure
### Documentation
### Maintenance
- Migrate from BC to BCFIPS libraries ([#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)
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +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"
implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
// needed by aws-encryption-sdk-java
implementation "org.bouncycastle:bc-fips:2.0.0"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switch this to implementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}" when FF updates to beta1 qualifier.

This is added in the version catalog after the cut to beta1 and is not available in the alpha1 artifacts.

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"
Expand Down
Loading