Skip to content

[TEST] Fix elasticsearch-security-cli JUnit runner #77800

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

Closed
justincr-elastic wants to merge 6 commits into from
Closed

[TEST] Fix elasticsearch-security-cli JUnit runner #77800

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0649440
[TEST] Fix elasticsearch-security-cli JUnit runner
justincr-elastic Sep 15, 2021
daf3994
Merge branch 'master' into gradlejunit
elasticmachine Sep 15, 2021
dbef411
Merge branch 'elastic:master' into gradlejunit
justincr-elastic Sep 15, 2021
b175a7f
[TEST] Remove bcpg-fips exclusion
justincr-elastic Sep 16, 2021
7acb1ab
Merge remote-tracking branch 'origin/gradlejunit' into gradlejunit
justincr-elastic Sep 16, 2021
8a2ab9b
Merge branch 'master' into gradlejunit
elasticmachine Sep 16, 2021
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
8 changes: 7 additions & 1 deletion x-pack/plugin/security/cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ dependencies {
}
testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"
testImplementation project(":test:framework")
testImplementation(testArtifact(project(xpackModule('core'))))}
testImplementation(testArtifact(project(xpackModule('core')))) {
// BC and BC-FIPS together causes "Jar Hell" failures in JUnit
exclude group: 'org.bouncycastle', module: 'bc-fips'
exclude group: 'org.bouncycastle', module: 'bcpg-fips'
}
}


tasks.named("dependencyLicenses").configure {
mapping from: /bc.*/, to: 'bouncycastle'
Expand Down