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

Use bc-fips to avoid jar hell with core. #5198

Closed
wants to merge 2 commits into from
+4 −1
Closed

Use bc-fips to avoid jar hell with core. #5198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b838c
Use bc-fips to avoid jar hell with core.
finnegancarroll Mar 21, 2025
5bd4898
Add bcprov-jdk18on to test/ITimplementations.
finnegancarroll Mar 21, 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
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ buildscript {
jaxb_version = '2.3.9'
spring_version = '6.2.4'
bouncycastle_version = '1.78'
bc_fips = '2.0.0'

if (buildVersionQualifier) {
opensearch_build += "-${buildVersionQualifier}"
Expand Down Expand Up @@ -585,7 +586,7 @@ dependencies {
implementation "com.google.guava:guava:${guava_version}"
implementation 'org.greenrobot:eventbus-java:3.3.1'
implementation 'commons-cli:commons-cli:1.9.0'
implementation "org.bouncycastle:bcprov-jdk18on:${bouncycastle_version}"
implementation "org.bouncycastle:bc-fips:${bc_fips}"
implementation 'org.ldaptive:ldaptive:1.2.3'
implementation 'com.nimbusds:nimbus-jose-jwt:9.48'
implementation 'com.rfksystems:blake2b:2.0.0'
Expand Down Expand Up @@ -703,6 +704,7 @@ dependencies {
}
testImplementation "org.bouncycastle:bcpkix-jdk18on:${bouncycastle_version}"
testImplementation "org.bouncycastle:bcutil-jdk18on:${bouncycastle_version}"
testImplementation "org.bouncycastle:bcprov-jdk18on:${bouncycastle_version}"

// Only osx-x86_64, osx-aarch_64, linux-x86_64, linux-aarch_64, windows-x86_64 are available
if (osdetector.classifier in ["osx-x86_64", "osx-aarch_64", "linux-x86_64", "linux-aarch_64", "windows-x86_64"]) {
Expand Down Expand Up @@ -744,6 +746,7 @@ dependencies {
integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
integrationTestImplementation "org.bouncycastle:bcpkix-jdk18on:${bouncycastle_version}"
integrationTestImplementation "org.bouncycastle:bcutil-jdk18on:${bouncycastle_version}"
integrationTestImplementation "org.bouncycastle:bcprov-jdk18on:${bouncycastle_version}"
integrationTestImplementation('org.awaitility:awaitility:4.3.0') {
exclude(group: 'org.hamcrest', module: 'hamcrest')
}
Expand Down
Loading