File tree Expand file tree Collapse file tree 4 files changed +27
-7
lines changed
distribution/tools/plugin-cli Expand file tree Collapse file tree 4 files changed +27
-7
lines changed Original file line number Diff line number Diff line change @@ -15,13 +15,21 @@ base {
15
15
dependencies {
16
16
compileOnly project(" :server" )
17
17
compileOnly project(" :libs:elasticsearch-cli" )
18
- api " org.bouncycastle:bcpg-fips:1.0.4 "
19
- api " org.bouncycastle:bc-fips:1.0.2"
18
+ api " org.bouncycastle:bcpg-fips:1.0.7.1 "
19
+ api " org.bouncycastle:bc-fips:1.0.2.4 "
20
20
testImplementation project(" :test:framework" )
21
21
testImplementation " com.google.jimfs:jimfs:${ versions.jimfs} "
22
22
testRuntimeOnly " com.google.guava:guava:${ versions.jimfs_guava} "
23
23
}
24
24
25
+ configurations. configureEach {
26
+ resolutionStrategy. eachDependency { DependencyResolveDetails details ->
27
+ if (details. requested. group == ' org.bouncycastle' && details. requested. name == ' bc-fips' ) {
28
+ details. useVersion ' 1.0.2.4' // to avoid jar hell
29
+ }
30
+ }
31
+ }
32
+
25
33
tasks. named(" dependencyLicenses" ). configure {
26
34
mapping from : / bc.*/ , to : ' bouncycastle'
27
35
}
Original file line number Diff line number Diff line change
1
+ pr : 103801
2
+ summary : Upgrade Bouncy Castle jars for plugin cli
3
+ area : " Security"
4
+ type : upgrade
5
+ issues : []
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" UTF-8" ?>
2
- <verification-metadata xmlns =" https://schema.gradle.org/dependency-verification" xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance" xsi : schemaLocation =" https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.2 .xsd" >
2
+ <verification-metadata xmlns =" https://schema.gradle.org/dependency-verification" xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance" xsi : schemaLocation =" https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.3 .xsd" >
3
3
<configuration >
4
4
<verify-metadata >false</verify-metadata >
5
5
<verify-signatures >false</verify-signatures >
3160
3160
<sha256 value =" b4340d7a9cc0d3664d6c560e2fcee9c7da6e6ae314855923c758fa32fff5b94e" origin =" Generated by Gradle" />
3161
3161
</artifact >
3162
3162
</component >
3163
+ <component group =" org.bouncycastle" name =" bc-fips" version =" 1.0.2.4" >
3164
+ <artifact name =" bc-fips-1.0.2.4.jar" >
3165
+ <sha256 value =" 703ecd8a3a619800269bc8cd442f2ebf469bd2fe70478364f58ddc6460c35f9f" origin =" Generated by Gradle" />
3166
+ </artifact >
3167
+ </component >
3163
3168
<component group =" org.bouncycastle" name =" bcmail-jdk15on" version =" 1.64" >
3164
3169
<artifact name =" bcmail-jdk15on-1.64.jar" >
3165
3170
<sha256 value =" 9b88abe9e981d17113a081a4b4261f4082ccdf9144a8a8373fc460c586f6b13a" origin =" Generated by Gradle" />
3166
3171
</artifact >
3167
3172
</component >
3168
- <component group =" org.bouncycastle" name =" bcpg-fips" version =" 1.0.4 " >
3169
- <artifact name =" bcpg-fips-1.0.4 .jar" >
3170
- <sha256 value =" b73c80be1099c4756c088cb457a82040509b787519af5c72c9c3d1bff357565e " origin =" Generated by Gradle" />
3173
+ <component group =" org.bouncycastle" name =" bcpg-fips" version =" 1.0.7.1 " >
3174
+ <artifact name =" bcpg-fips-1.0.7.1 .jar" >
3175
+ <sha256 value =" fea1a096c098395eb67d48700c349d5f75321ef0c7c6af9198bc38f4cc836622 " origin =" Generated by Gradle" />
3171
3176
</artifact >
3172
3177
</component >
3173
3178
<component group =" org.bouncycastle" name =" bcpg-jdk15on" version =" 1.69" >
Original file line number Diff line number Diff line change @@ -18,7 +18,9 @@ apply plugin: 'elasticsearch.standalone-test'
18
18
dependencies {
19
19
testImplementation " com.google.jimfs:jimfs:1.2"
20
20
testImplementation project(" :test:framework" )
21
- testImplementation project(' :distribution:tools:plugin-cli' )
21
+ testImplementation(project(' :distribution:tools:plugin-cli' )) {
22
+ exclude group : ' org.bouncycastle' , module : ' bc-fips' // to avoid jar hell
23
+ }
22
24
}
23
25
24
26
// TODO: give each evil test its own fresh JVM for more isolation.
You can’t perform that action at this time.
0 commit comments