Skip to content

Commit 3e8d5c6

Browse files
pxsalehipxsalehi
authored
Upgrade GCS SDK to 2.13.1 (#92327) (#92525)
Upgrade to the latest version of the SDK that doesn't have known CVEs and builds w/o complaining. Since 2.2.0 the automatic retry behaviour has changed and the old behaviour can still be used as LegacyStorageRetryStrategy. The default retry strategy would cause some test failures, and therefore we'd need to explicitly set a retry strategy. Relates #92474
1 parent 66e110b commit 3e8d5c6

File tree

6 files changed

+123
-71
lines changed

6 files changed

+123
-71
lines changed

‎docs/changelog/92327.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 92327
2+
summary: Upgrade GCS SDK to 2.13.1
3+
area: Snapshot/Restore
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 83 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -374,74 +374,79 @@
374374
<sha256 value="896280c8bd0a81a020272af6bfabd855810c4e4fd5ff5605e109f3bb3d2a30e3" origin="Generated by Gradle"/>
375375
</artifact>
376376
</component>
377-
<component group="com.google.api" name="api-common" version="2.2.1">
378-
<artifact name="api-common-2.2.1.jar">
379-
<sha256 value="197b23f2d22324a923e5d643d1c71c51442ae7b9b166fe6ecd5ad9b6916689b5" origin="Generated by Gradle"/>
377+
<component group="com.google.api" name="api-common" version="2.3.1">
378+
<artifact name="api-common-2.3.1.jar">
379+
<sha256 value="9a8c0f3a638eac791496709b7770c39bda9e56de50728f122237c813bb21f1ee" origin="Generated by Gradle"/>
380380
</artifact>
381381
</component>
382-
<component group="com.google.api" name="gax" version="2.0.0">
383-
<artifact name="gax-2.0.0.jar">
384-
<sha256 value="37974e31bf9ef5119b0411f83aaa209d4edb4fb10646eb6eaff68e7771a64e50" origin="Generated by Gradle"/>
382+
<component group="com.google.api" name="gax" version="2.20.1">
383+
<artifact name="gax-2.20.1.jar">
384+
<sha256 value="e6588fc1786557fda95024a040b32106d58ffe72fab0933200c4d3c6197a4fe1" origin="Generated by Gradle"/>
385385
</artifact>
386386
</component>
387-
<component group="com.google.api" name="gax-httpjson" version="0.85.0">
388-
<artifact name="gax-httpjson-0.85.0.jar">
389-
<sha256 value="e0b0411e42c859e0fab4b092a3429aea2a71b2c2ebbbc24d719b9e762be97c35" origin="Generated by Gradle"/>
387+
<component group="com.google.api" name="gax-httpjson" version="0.105.1">
388+
<artifact name="gax-httpjson-0.105.1.jar">
389+
<sha256 value="4b7e1135eb4a97bce9d9d8c56128c5c30594dc2bebf26c9851ac582d2b43b2db" origin="Generated by Gradle"/>
390390
</artifact>
391391
</component>
392392
<component group="com.google.api-client" name="google-api-client" version="1.33.1">
393393
<artifact name="google-api-client-1.33.1.jar">
394394
<sha256 value="d471ac82f1b285b3fde1e5b7ff265dad7ab9cd73a052bcb01ef35054f7d5db02" origin="Generated by Gradle"/>
395395
</artifact>
396396
</component>
397-
<component group="com.google.api-client" name="google-api-client" version="1.35.1">
398-
<artifact name="google-api-client-1.35.1.jar">
399-
<sha256 value="24714add0c0248730a0e705448bbc91a5c68dbc0dc9f7fa0c97366bc7b275e23" origin="Generated by Gradle"/>
397+
<component group="com.google.api-client" name="google-api-client" version="2.1.1">
398+
<artifact name="google-api-client-2.1.1.jar">
399+
<sha256 value="05d846e83a2924c2a6facbd72817228fee68bb522b818b9804b26a712f678bf3" origin="Generated by Gradle"/>
400400
</artifact>
401401
</component>
402-
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.3.2">
403-
<artifact name="proto-google-common-protos-2.3.2.jar">
404-
<sha256 value="99aa86a5e52dff58be410b5c30905b2ea9a2c995a87e237f160590953c661b6d" origin="Generated by Gradle"/>
402+
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.9.6">
403+
<artifact name="proto-google-common-protos-2.9.6.jar">
404+
<sha256 value="84e715d92500fd0d44408f58713d5d70ae857d022de3d66d500fbf27fae88103" origin="Generated by Gradle"/>
405405
</artifact>
406406
</component>
407-
<component group="com.google.api.grpc" name="proto-google-iam-v1" version="1.0.14">
408-
<artifact name="proto-google-iam-v1-1.0.14.jar">
409-
<sha256 value="e722e8d67172a87ad1b5bd3ba02c678484958190c49c059494453b07e7ea5dca" origin="Generated by Gradle"/>
407+
<component group="com.google.api.grpc" name="proto-google-iam-v1" version="1.6.2">
408+
<artifact name="proto-google-iam-v1-1.6.2.jar">
409+
<sha256 value="4fce59633b8a9871614231d213992e60e9b50e12f822c33d7e82a79c90addf25" origin="Generated by Gradle"/>
410410
</artifact>
411411
</component>
412412
<component group="com.google.apis" name="google-api-services-compute" version="v1-rev20220322-1.32.1">
413413
<artifact name="google-api-services-compute-v1-rev20220322-1.32.1.jar">
414414
<sha256 value="05d913bb9b2baa8e4dfd99a1aee4864240feebf6647986e37aea88f3020313fe" origin="Generated by Gradle"/>
415415
</artifact>
416416
</component>
417-
<component group="com.google.apis" name="google-api-services-storage" version="v1-rev20210127-1.32.1">
418-
<artifact name="google-api-services-storage-v1-rev20210127-1.32.1.jar">
419-
<sha256 value="c23beb05bb842abed14c8fd75a3e6b7a2f51b0d3ece1903a9c5fd3ab770ad93e" origin="Generated by Gradle"/>
417+
<component group="com.google.apis" name="google-api-services-storage" version="v1-rev20220705-2.0.0">
418+
<artifact name="google-api-services-storage-v1-rev20220705-2.0.0.jar">
419+
<sha256 value="c6027d6c58089402620ce338351ca2efd414f813007844bc252ceb5f47789f4f" origin="Generated by Gradle"/>
420420
</artifact>
421421
</component>
422-
<component group="com.google.auth" name="google-auth-library-credentials" version="1.0.0">
423-
<artifact name="google-auth-library-credentials-1.0.0.jar">
424-
<sha256 value="8b4e4bf2c89f72e9fdcbbd442c931e17cba01e84f058fd61e470bd19f8a92cc1" origin="Generated by Gradle"/>
422+
<component group="com.google.auth" name="google-auth-library-credentials" version="1.11.0">
423+
<artifact name="google-auth-library-credentials-1.11.0.jar">
424+
<sha256 value="2f47d7d2126576f13c22b7442e97593e9e6285adbd6d4c8dd779d87a8cbb8270" origin="Generated by Gradle"/>
425425
</artifact>
426426
</component>
427-
<component group="com.google.auth" name="google-auth-library-oauth2-http" version="1.0.0">
428-
<artifact name="google-auth-library-oauth2-http-1.0.0.jar">
429-
<sha256 value="7cae6c73368659ac7a6b46018070f3d7980acd5bfaaa91b840f2e869cef1f07e" origin="Generated by Gradle"/>
427+
<component group="com.google.auth" name="google-auth-library-oauth2-http" version="1.11.0">
428+
<artifact name="google-auth-library-oauth2-http-1.11.0.jar">
429+
<sha256 value="9fc1548aacc781367b5ca8da8e053018929d71af7303f6752952ddcb6f9b50c4" origin="Generated by Gradle"/>
430430
</artifact>
431431
</component>
432-
<component group="com.google.cloud" name="google-cloud-core" version="2.0.2">
433-
<artifact name="google-cloud-core-2.0.2.jar">
434-
<sha256 value="364be3e5617c973a4fa8ebe2a56aa8eaec9277f5dba7d033cc37b71b00025e45" origin="Generated by Gradle"/>
432+
<component group="com.google.cloud" name="google-cloud-core" version="2.8.28">
433+
<artifact name="google-cloud-core-2.8.28.jar">
434+
<sha256 value="f775b5dc6b6478d07be13c64b3aa8ee0eded5e2571ff737e86ed05958cce4e92" origin="Generated by Gradle"/>
435435
</artifact>
436436
</component>
437-
<component group="com.google.cloud" name="google-cloud-core-http" version="2.0.2">
438-
<artifact name="google-cloud-core-http-2.0.2.jar">
439-
<sha256 value="087f0bc4d8de1daed73acb631b68c254dcf7993379110c6edf7bc7438d0e52ca" origin="Generated by Gradle"/>
437+
<component group="com.google.cloud" name="google-cloud-core-http" version="2.8.28">
438+
<artifact name="google-cloud-core-http-2.8.28.jar">
439+
<sha256 value="96cd89a23a40b64baa28cba92676fba67d16cfbb1a7085827a1852a71c2dce46" origin="Generated by Gradle"/>
440440
</artifact>
441441
</component>
442-
<component group="com.google.cloud" name="google-cloud-storage" version="1.118.1">
443-
<artifact name="google-cloud-storage-1.118.1.jar">
444-
<sha256 value="21d675edc7caa02426290ed631b453004e7ece91bc811209855491263ac35f69" origin="Generated by Gradle"/>
442+
<component group="com.google.cloud" name="google-cloud-storage" version="2.13.1">
443+
<artifact name="google-cloud-storage-2.13.1.jar">
444+
<sha256 value="5fee796ca3c328aabe1b96adfbb264714e82b3ceee2971a83732c8cada12a9b6" origin="Generated by Gradle"/>
445+
</artifact>
446+
</component>
447+
<component group="com.google.cloud" name="google-cloud-storage" version="2.15.1">
448+
<artifact name="google-cloud-storage-2.15.1.jar">
449+
<sha256 value="467dd38d9d028e4645473e8f0271e7a8b2f1c3f3439e4849eb34479cc6f54e66" origin="Generated by Gradle"/>
445450
</artifact>
446451
</component>
447452
<component group="com.google.code.findbugs" name="jsr305" version="3.0.0">
@@ -454,6 +459,11 @@
454459
<sha256 value="766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" origin="Generated by Gradle"/>
455460
</artifact>
456461
</component>
462+
<component group="com.google.code.gson" name="gson" version="2.10">
463+
<artifact name="gson-2.10.jar">
464+
<sha256 value="0cdd163ce3598a20fc04eee71b140b24f6f2a3b35f0a499dbbdd9852e83fbfaf" origin="Generated by Gradle"/>
465+
</artifact>
466+
</component>
457467
<component group="com.google.code.gson" name="gson" version="2.2.4">
458468
<artifact name="gson-2.2.4.jar">
459469
<sha256 value="c0328cd07ca9e363a5acd00c1cf4afe8cf554bd6d373834981ba05cebec687fb" origin="Generated by Gradle"/>
@@ -559,9 +569,14 @@
559569
<sha256 value="93bf43e033c7441f66f163f2cb1244d89765c492b844031258ae92b7081dde6e" origin="Generated by Gradle"/>
560570
</artifact>
561571
</component>
562-
<component group="com.google.http-client" name="google-http-client-appengine" version="1.39.2">
563-
<artifact name="google-http-client-appengine-1.39.2.jar">
564-
<sha256 value="f6320dc0db035aff6eab2e28748560da718ab465fbc3481b653ea3f27aa5cac9" origin="Generated by Gradle"/>
572+
<component group="com.google.http-client" name="google-http-client" version="1.42.3">
573+
<artifact name="google-http-client-1.42.3.jar">
574+
<sha256 value="e395dd1765e3e6bceb0c610706bcf4128de84bd6e65cf1d4adbf998b4114161c" origin="Generated by Gradle"/>
575+
</artifact>
576+
</component>
577+
<component group="com.google.http-client" name="google-http-client-appengine" version="1.42.3">
578+
<artifact name="google-http-client-appengine-1.42.3.jar">
579+
<sha256 value="3a876b1f704ac6d8500b8430b288dbce78c52dc18c43c008a587a7377bb81e2e" origin="Generated by Gradle"/>
565580
</artifact>
566581
</component>
567582
<component group="com.google.http-client" name="google-http-client-gson" version="1.39.2">
@@ -574,6 +589,11 @@
574589
<sha256 value="29deba06c722e00dd31fe7e3b526bdfec0577660b868a1efaceeddb5e04208a8" origin="Generated by Gradle"/>
575590
</artifact>
576591
</component>
592+
<component group="com.google.http-client" name="google-http-client-gson" version="1.42.3">
593+
<artifact name="google-http-client-gson-1.42.3.jar">
594+
<sha256 value="8196efaa89c5f73b00b2b48edad02fcd78524259407c37ab1860737988545cee" origin="Generated by Gradle"/>
595+
</artifact>
596+
</component>
577597
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.39.2">
578598
<artifact name="google-http-client-jackson2-1.39.2.jar">
579599
<sha256 value="74a493a7ba25e1dfb3d3a4ddf713306d5a3786db00a3489d59061dc8cff321b1" origin="Generated by Gradle"/>
@@ -584,6 +604,11 @@
584604
<sha256 value="3b9add5859979519236f45cc9c9f53da975e0b5b88e0cdfd4bb009b112b4d435" origin="Generated by Gradle"/>
585605
</artifact>
586606
</component>
607+
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.42.3">
608+
<artifact name="google-http-client-jackson2-1.42.3.jar">
609+
<sha256 value="b03a79f38e924e2eeaee673acf314626825284cb39948d06c2948ad083b4d089" origin="Generated by Gradle"/>
610+
</artifact>
611+
</component>
587612
<component group="com.google.inject" name="guice" version="3.0">
588613
<artifact name="guice-3.0.jar">
589614
<sha256 value="1a59d0421ffd355cc0b70b42df1c2e9af744c8a2d0c92da379f5fca2f07f1d22" origin="Generated by Gradle"/>
@@ -639,9 +664,9 @@
639664
<sha256 value="6d3758b483e1ac7505649371a5b058a717260ef470100fefad7a1e2aba75e06f" origin="Generated by Gradle"/>
640665
</artifact>
641666
</component>
642-
<component group="com.google.protobuf" name="protobuf-java" version="3.21.1">
643-
<artifact name="protobuf-java-3.21.1.jar">
644-
<sha256 value="ad275e75ee79e6c6388198dcb9acf0db2edee64782e11b508f379c3a2a17d168" origin="Generated by Gradle"/>
667+
<component group="com.google.protobuf" name="protobuf-java" version="3.21.7">
668+
<artifact name="protobuf-java-3.21.7.jar">
669+
<sha256 value="a204ec68748a7b26351ae37a311e8de468f248d1916d5f8dbe812c1289d0a0ff" origin="Generated by Gradle"/>
645670
</artifact>
646671
</component>
647672
<component group="com.google.protobuf" name="protobuf-java" version="3.4.0">
@@ -1159,9 +1184,9 @@
11591184
<sha256 value="bcbf9055dff453fd6508bd7cca2a0aa2d5f059a9c94beed1f5fda1dc015607b8" origin="Generated by Gradle"/>
11601185
</artifact>
11611186
</component>
1162-
<component group="io.grpc" name="grpc-context" version="1.39.0">
1163-
<artifact name="grpc-context-1.39.0.jar">
1164-
<sha256 value="97fe70b4e7da86ed4fe3deb16d83fc89c7e5b764ebac8c9dd5d51dd4b5aa920c" origin="Generated by Gradle"/>
1187+
<component group="io.grpc" name="grpc-context" version="1.49.2">
1188+
<artifact name="grpc-context-1.49.2.jar">
1189+
<sha256 value="7aaf3ad732a281be51fe0895acd4538b96e1d7e3b527bce54b651770b8ded174" origin="Generated by Gradle"/>
11651190
</artifact>
11661191
</component>
11671192
<component group="io.netty" name="netty" version="3.10.6.Final">
@@ -1299,6 +1324,11 @@
12991324
<sha256 value="421cbc06d9fb56fcf07332553677ddea04a47079b30955567c8a80b34689ed32" origin="Generated by Gradle"/>
13001325
</artifact>
13011326
</component>
1327+
<component group="io.opencensus" name="opencensus-api" version="0.31.1">
1328+
<artifact name="opencensus-api-0.31.1.jar">
1329+
<sha256 value="f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382" origin="Generated by Gradle"/>
1330+
</artifact>
1331+
</component>
13021332
<component group="io.opencensus" name="opencensus-contrib-http-util" version="0.28.0">
13031333
<artifact name="opencensus-contrib-http-util-0.28.0.jar">
13041334
<sha256 value="49c3db2a29f1fdb2f73928cbea969bd1d40fab7cc5bb6273022babd96f7a789b" origin="Generated by Gradle"/>
@@ -1309,6 +1339,11 @@
13091339
<sha256 value="5432d2e9a1bdc8a0e835c6bce52b9d767fbf688cc8892432cff97c3389894b46" origin="Generated by Gradle"/>
13101340
</artifact>
13111341
</component>
1342+
<component group="io.opencensus" name="opencensus-contrib-http-util" version="0.31.1">
1343+
<artifact name="opencensus-contrib-http-util-0.31.1.jar">
1344+
<sha256 value="3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a" origin="Generated by Gradle"/>
1345+
</artifact>
1346+
</component>
13121347
<component group="io.opentelemetry" name="opentelemetry-api" version="1.17.0">
13131348
<artifact name="opentelemetry-api-1.17.0.jar">
13141349
<sha256 value="dce58a21caef0c6be082ce5ec86ad75f3017744a029a454e068871c110ae029c" origin="Generated by Gradle"/>
@@ -3749,9 +3784,9 @@
37493784
<sha256 value="5196a0da2c5a33d1a04e88fc7a9cc109501bc265b5bac8edd9984a1885070ad4" origin="Generated by Gradle"/>
37503785
</artifact>
37513786
</component>
3752-
<component group="org.threeten" name="threetenbp" version="1.5.1">
3753-
<artifact name="threetenbp-1.5.1.jar">
3754-
<sha256 value="4342ee04d87040f71b0aa9188ee960780ef2da734e32a8d43a522a580b5e0f3b" origin="Generated by Gradle"/>
3787+
<component group="org.threeten" name="threetenbp" version="1.6.5">
3788+
<artifact name="threetenbp-1.6.5.jar">
3789+
<sha256 value="b2551604c0d6516428e3065213b74461240378a07622201a37ad32638ecb417c" origin="Generated by Gradle"/>
37553790
</artifact>
37563791
</component>
37573792
<component group="org.tmatesoft.sqljet" name="sqljet" version="1.1.10">

‎modules/repository-gcs/build.gradle‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,36 @@ esplugin {
2626
}
2727

2828
dependencies {
29-
api 'com.google.cloud:google-cloud-storage:1.118.1'
30-
api 'com.google.cloud:google-cloud-core:2.0.2'
31-
api 'com.google.cloud:google-cloud-core-http:2.0.2'
32-
runtimeOnly 'com.google.guava:guava:30.1.1-jre'
29+
api 'com.google.cloud:google-cloud-storage:2.13.1'
30+
api 'com.google.cloud:google-cloud-core:2.8.28'
31+
api 'com.google.cloud:google-cloud-core-http:2.8.28'
32+
runtimeOnly 'com.google.guava:guava:31.1-jre'
3333
runtimeOnly 'com.google.guava:failureaccess:1.0.1'
3434
api "commons-logging:commons-logging:${versions.commonslogging}"
3535
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
3636
api "commons-codec:commons-codec:${versions.commonscodec}"
37-
api 'com.google.api:api-common:2.2.1'
38-
api 'com.google.api:gax:2.0.0'
39-
api 'org.threeten:threetenbp:1.5.1'
37+
api 'com.google.api:api-common:2.3.1'
38+
api 'com.google.api:gax:2.20.1'
39+
api 'org.threeten:threetenbp:1.6.5'
4040
api 'com.google.protobuf:protobuf-java-util:3.17.3'
41-
api 'com.google.protobuf:protobuf-java:3.21.1'
42-
api 'com.google.code.gson:gson:2.8.9'
43-
api 'com.google.api.grpc:proto-google-common-protos:2.3.2'
44-
api 'com.google.api.grpc:proto-google-iam-v1:1.0.14'
45-
api 'com.google.auth:google-auth-library-credentials:1.0.0'
46-
api 'com.google.auth:google-auth-library-oauth2-http:1.0.0'
41+
api 'com.google.protobuf:protobuf-java:3.21.7'
42+
api 'com.google.code.gson:gson:2.10'
43+
api 'com.google.api.grpc:proto-google-common-protos:2.9.6'
44+
api 'com.google.api.grpc:proto-google-iam-v1:1.6.2'
45+
api 'com.google.auth:google-auth-library-credentials:1.11.0'
46+
api 'com.google.auth:google-auth-library-oauth2-http:1.11.0'
4747
api 'com.google.oauth-client:google-oauth-client:1.34.1'
48-
api 'com.google.api-client:google-api-client:1.35.1'
49-
api 'com.google.http-client:google-http-client:1.39.2'
50-
api 'com.google.http-client:google-http-client-gson:1.39.2'
51-
api 'com.google.http-client:google-http-client-appengine:1.39.2'
52-
api 'com.google.http-client:google-http-client-jackson2:1.39.2'
48+
api 'com.google.api-client:google-api-client:2.1.1'
49+
api 'com.google.http-client:google-http-client:1.42.3'
50+
api 'com.google.http-client:google-http-client-gson:1.42.3'
51+
api 'com.google.http-client:google-http-client-appengine:1.42.3'
52+
api 'com.google.http-client:google-http-client-jackson2:1.42.3'
5353
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
54-
api 'com.google.api:gax-httpjson:0.85.0'
55-
api 'io.grpc:grpc-context:1.39.0'
56-
api 'io.opencensus:opencensus-api:0.28.0'
57-
api 'io.opencensus:opencensus-contrib-http-util:0.28.0'
58-
api 'com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1'
54+
api 'com.google.api:gax-httpjson:0.105.1'
55+
api 'io.grpc:grpc-context:1.49.2'
56+
api 'io.opencensus:opencensus-api:0.31.1'
57+
api 'io.opencensus:opencensus-contrib-http-util:0.31.1'
58+
api 'com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0'
5959

6060
testImplementation project(':test:fixtures:gcs-fixture')
6161
}
@@ -180,6 +180,12 @@ tasks.named("thirdPartyAudit").configure {
180180
'org.apache.http.protocol.HttpContext',
181181
'org.apache.http.protocol.HttpProcessor',
182182
'org.apache.http.protocol.HttpRequestExecutor',
183+
// com.google.api.gax optional dependencies
184+
'org.graalvm.nativeimage.hosted.Feature',
185+
'org.graalvm.nativeimage.hosted.Feature$BeforeAnalysisAccess',
186+
'org.graalvm.nativeimage.hosted.Feature$DuringAnalysisAccess',
187+
'org.graalvm.nativeimage.hosted.Feature$FeatureAccess',
188+
'org.graalvm.nativeimage.hosted.RuntimeReflection',
183189
// commons-logging provided dependencies
184190
'javax.servlet.ServletContextEvent',
185191
'javax.servlet.ServletContextListener'

0 commit comments

Comments
 (0)