Skip to content

Commit d4a9dfa

Browse files
authored
Minor clean up of guava dependencies (#99593) (#99632)
This commit bumps up the version of jimfs and jimfs_gauva and guava that is used for security and idp plugins.
1 parent d96e85b commit d4a9dfa

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

build-tools-internal/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jmh = 1.26
4848

4949
# test dependencies
5050
# when updating this version, also update :qa:evil-tests
51-
jimfs = 1.2
52-
jimfs_guava = 30.1-jre
51+
jimfs = 1.3.0
52+
jimfs_guava = 32.1.1-jre
5353

5454
# test framework
5555
networknt_json_schema_validator = 1.0.48

gradle/verification-metadata.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,11 @@
481481
<sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
482482
</artifact>
483483
</component>
484+
<component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
485+
<artifact name="error_prone_annotations-2.18.0.jar">
486+
<sha256 value="9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" origin="Generated by Gradle"/>
487+
</artifact>
488+
</component>
484489
<component group="com.google.errorprone" name="error_prone_annotations" version="2.2.0">
485490
<artifact name="error_prone_annotations-2.2.0.jar">
486491
<sha256 value="6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a" origin="Generated by Gradle"/>
@@ -521,11 +526,6 @@
521526
<sha256 value="fc3aa363ad87223d1fbea584eee015a862150f6d34c71f24dc74088a635f08ef" origin="Generated by Gradle"/>
522527
</artifact>
523528
</component>
524-
<component group="com.google.guava" name="guava" version="30.1-jre">
525-
<artifact name="guava-30.1-jre.jar">
526-
<sha256 value="e6dd072f9d3fe02a4600688380bd422bdac184caf6fe2418cfdd0934f09432aa" origin="Generated by Gradle"/>
527-
</artifact>
528-
</component>
529529
<component group="com.google.guava" name="guava" version="31.1-jre">
530530
<artifact name="guava-31.1-jre.jar">
531531
<sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
@@ -536,6 +536,11 @@
536536
<sha256 value="bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5" origin="Generated by Gradle"/>
537537
</artifact>
538538
</component>
539+
<component group="com.google.guava" name="guava" version="32.1.1-jre">
540+
<artifact name="guava-32.1.1-jre.jar">
541+
<sha256 value="91fbba37f1c8b251cf9ea9e7d3a369eb79eb1e6a5df1d4bbf483dd0380740281" origin="Generated by Gradle"/>
542+
</artifact>
543+
</component>
539544
<component group="com.google.guava" name="listenablefuture" version="9999.0-empty-to-avoid-conflict-with-guava">
540545
<artifact name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
541546
<sha256 value="b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" origin="Generated by Gradle"/>
@@ -606,9 +611,9 @@
606611
<sha256 value="21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" origin="Generated by Gradle"/>
607612
</artifact>
608613
</component>
609-
<component group="com.google.jimfs" name="jimfs" version="1.2">
610-
<artifact name="jimfs-1.2.jar">
611-
<sha256 value="de16d5c8489729a8512f1a02fbd81f58f89249b72066987da4cc5c87ecb9f72d" origin="Generated by Gradle"/>
614+
<component group="com.google.jimfs" name="jimfs" version="1.3.0">
615+
<artifact name="jimfs-1.3.0.jar">
616+
<sha256 value="82494408bb513f5512652e7b7f63d6f31f01eff57ce35c878644ffc2d25aee4f" origin="Generated by Gradle"/>
612617
</artifact>
613618
</component>
614619
<component group="com.google.oauth-client" name="google-oauth-client" version="1.34.1">
@@ -2876,6 +2881,11 @@
28762881
<sha256 value="ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" origin="Generated by Gradle"/>
28772882
</artifact>
28782883
</component>
2884+
<component group="org.checkerframework" name="checker-qual" version="3.33.0">
2885+
<artifact name="checker-qual-3.33.0.jar">
2886+
<sha256 value="e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1" origin="Generated by Gradle"/>
2887+
</artifact>
2888+
</component>
28792889
<component group="org.checkerframework" name="checker-qual" version="3.5.0">
28802890
<artifact name="checker-qual-3.5.0.jar">
28812891
<sha256 value="729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4" origin="Generated by Gradle"/>

qa/evil-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apply plugin: 'elasticsearch.internal-testclusters'
1616
apply plugin: 'elasticsearch.standalone-test'
1717

1818
dependencies {
19-
testImplementation "com.google.jimfs:jimfs:1.2"
19+
testImplementation "com.google.jimfs:jimfs:1.3.0"
2020
testImplementation "com.google.guava:guava:${versions.jimfs_guava}"
2121
testImplementation project(":test:framework")
2222
testImplementation project(':distribution:tools:plugin-cli')

x-pack/plugin/identity-provider/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
4949
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
5050
api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
51-
runtimeOnly 'com.google.guava:guava:31.1-jre'
51+
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
5252
runtimeOnly 'com.google.guava:failureaccess:1.0.1'
5353
runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}"
5454

@@ -256,7 +256,6 @@ tasks.named("thirdPartyAudit").configure {
256256
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
257257
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
258258
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
259-
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
260259
'com.google.common.hash.Striped64',
261260
'com.google.common.hash.Striped64$1',
262261
'com.google.common.hash.Striped64$Cell',

x-pack/plugin/security/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
7070
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
7171
api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
72-
runtimeOnly 'com.google.guava:guava:31.1-jre'
72+
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
7373
runtimeOnly 'com.google.guava:failureaccess:1.0.1'
7474
runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}"
7575
runtimeOnly "joda-time:joda-time:2.10.10"
@@ -376,7 +376,6 @@ tasks.named("thirdPartyAudit").configure {
376376
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
377377
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
378378
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
379-
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
380379
'com.google.common.hash.Striped64',
381380
'com.google.common.hash.Striped64$1',
382381
'com.google.common.hash.Striped64$Cell',

0 commit comments

Comments
 (0)