Skip to content

Commit df952dc

Browse files
nicktindallnicktindall
committed
Bump to google-cloud-storage-bom 2.50.0 (to include bugfix). Minor tidyup.
1 parent 43123ac commit df952dc

File tree

4 files changed

+129
-22
lines changed

4 files changed

+129
-22
lines changed

‎gradle/verification-metadata.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,11 +504,21 @@
504504
<sha256 value="038eb1f3f80ca35d9b7648a7ea25a276125eac3e9448d02f4b3ec17b0ca32d24" origin="Generated by Gradle"/>
505505
</artifact>
506506
</component>
507+
<component group="com.google.api" name="api-common" version="2.46.1">
508+
<artifact name="api-common-2.46.1.jar">
509+
<sha256 value="8b11e1e1e42702cb80948e7ca62a9e06ddf82fe57a19cd68f9548eac80f39071" origin="Generated by Gradle"/>
510+
</artifact>
511+
</component>
507512
<component group="com.google.api" name="gax" version="2.61.0">
508513
<artifact name="gax-2.61.0.jar">
509514
<sha256 value="bed1f38d5490a021cb043f75e86212e29cb2a7e09cb5d15cf0a5611d02c1c128" origin="Generated by Gradle"/>
510515
</artifact>
511516
</component>
517+
<component group="com.google.api" name="gax" version="2.63.1">
518+
<artifact name="gax-2.63.1.jar">
519+
<sha256 value="26752413f76b8391dacefff40db867c1d33d0bf63d32954de3e9bb74cdcb8568" origin="Generated by Gradle"/>
520+
</artifact>
521+
</component>
512522
<component group="com.google.api" name="gax-httpjson" version="0.105.1">
513523
<artifact name="gax-httpjson-0.105.1.jar">
514524
<sha256 value="4b7e1135eb4a97bce9d9d8c56128c5c30594dc2bebf26c9851ac582d2b43b2db" origin="Generated by Gradle"/>
@@ -519,6 +529,11 @@
519529
<sha256 value="6fc28008cf4c4251098eb37f33899c0be20a5afa970c3038477a3f01ed61fa01" origin="Generated by Gradle"/>
520530
</artifact>
521531
</component>
532+
<component group="com.google.api" name="gax-httpjson" version="2.63.1">
533+
<artifact name="gax-httpjson-2.63.1.jar">
534+
<sha256 value="291e606f53ea021ff25b5747bc2e347b9f6e27285faa48239d6762fe2515b60d" origin="Generated by Gradle"/>
535+
</artifact>
536+
</component>
522537
<component group="com.google.api-client" name="google-api-client" version="1.33.1">
523538
<artifact name="google-api-client-1.33.1.jar">
524539
<sha256 value="d471ac82f1b285b3fde1e5b7ff265dad7ab9cd73a052bcb01ef35054f7d5db02" origin="Generated by Gradle"/>
@@ -549,11 +564,21 @@
549564
<sha256 value="51838cffa3419ac52b5946557e8a6012f97ad91de8e7a14a7175658cc1c00d8b" origin="Generated by Gradle"/>
550565
</artifact>
551566
</component>
567+
<component group="com.google.api.grpc" name="proto-google-cloud-storage-v2" version="2.50.0">
568+
<artifact name="proto-google-cloud-storage-v2-2.50.0.jar">
569+
<sha256 value="0b326af2e1828b582a973b026059da6bc1fc6cbb47254c2223873c9cd97cd6a8" origin="Generated by Gradle"/>
570+
</artifact>
571+
</component>
552572
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.52.0">
553573
<artifact name="proto-google-common-protos-2.52.0.jar">
554574
<sha256 value="425c5a015b661e583d8b28ebf4fc443eed160835bc93041b9aa97bcd947ab5c5" origin="Generated by Gradle"/>
555575
</artifact>
556576
</component>
577+
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.54.1">
578+
<artifact name="proto-google-common-protos-2.54.1.jar">
579+
<sha256 value="2fcff25fe8a90fcacb146a900222c497ba0a9a531271e6b135a76450d23b1ef2" origin="Generated by Gradle"/>
580+
</artifact>
581+
</component>
557582
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.9.6">
558583
<artifact name="proto-google-common-protos-2.9.6.jar">
559584
<sha256 value="84e715d92500fd0d44408f58713d5d70ae857d022de3d66d500fbf27fae88103" origin="Generated by Gradle"/>
@@ -564,6 +589,11 @@
564589
<sha256 value="f163132a07ba9a30e5d7cb2bb88ed829acbbdde2cfe6c8e4712a79567a881427" origin="Generated by Gradle"/>
565590
</artifact>
566591
</component>
592+
<component group="com.google.api.grpc" name="proto-google-iam-v1" version="1.49.1">
593+
<artifact name="proto-google-iam-v1-1.49.1.jar">
594+
<sha256 value="138efca2acdd71bca4133731a7f8e619c8fa6a8585901abf2e2a35700353ca74" origin="Generated by Gradle"/>
595+
</artifact>
596+
</component>
567597
<component group="com.google.api.grpc" name="proto-google-iam-v1" version="1.6.2">
568598
<artifact name="proto-google-iam-v1-1.6.2.jar">
569599
<sha256 value="4fce59633b8a9871614231d213992e60e9b50e12f822c33d7e82a79c90addf25" origin="Generated by Gradle"/>
@@ -584,6 +614,11 @@
584614
<sha256 value="551cd561d024c1711a9f43411988f68b73d653e47dbe4a66f551640dbb7e8977" origin="Generated by Gradle"/>
585615
</artifact>
586616
</component>
617+
<component group="com.google.apis" name="google-api-services-storage" version="v1-rev20250224-2.0.0">
618+
<artifact name="google-api-services-storage-v1-rev20250224-2.0.0.jar">
619+
<sha256 value="c63c5e3c5544998c080424edb3aa9d2ba101774dad7c19ebb44e939e728b0b3e" origin="Generated by Gradle"/>
620+
</artifact>
621+
</component>
587622
<component group="com.google.auth" name="google-auth-library-credentials" version="1.11.0">
588623
<artifact name="google-auth-library-credentials-1.11.0.jar">
589624
<sha256 value="2f47d7d2126576f13c22b7442e97593e9e6285adbd6d4c8dd779d87a8cbb8270" origin="Generated by Gradle"/>
@@ -594,6 +629,11 @@
594629
<sha256 value="e0e8884ac77a36bdc824180e0559d8b75dbead963edcb1d5cfa2b6796836bb01" origin="Generated by Gradle"/>
595630
</artifact>
596631
</component>
632+
<component group="com.google.auth" name="google-auth-library-credentials" version="1.33.1">
633+
<artifact name="google-auth-library-credentials-1.33.1.jar">
634+
<sha256 value="3367d627c5f4d1fa307a3c6ff95db56ad7b611ae4483fe21d72877fa037ff125" origin="Generated by Gradle"/>
635+
</artifact>
636+
</component>
597637
<component group="com.google.auth" name="google-auth-library-oauth2-http" version="1.11.0">
598638
<artifact name="google-auth-library-oauth2-http-1.11.0.jar">
599639
<sha256 value="9fc1548aacc781367b5ca8da8e053018929d71af7303f6752952ddcb6f9b50c4" origin="Generated by Gradle"/>
@@ -604,11 +644,21 @@
604644
<sha256 value="5c7cf64bead707029c44f58ed3a638443bd474f597bef09dd2b77a0990094970" origin="Generated by Gradle"/>
605645
</artifact>
606646
</component>
647+
<component group="com.google.auth" name="google-auth-library-oauth2-http" version="1.33.1">
648+
<artifact name="google-auth-library-oauth2-http-1.33.1.jar">
649+
<sha256 value="6a72ec2bb2350ca1970019e388d00808136e4da2e30296e9d8c346e3850b0eaa" origin="Generated by Gradle"/>
650+
</artifact>
651+
</component>
607652
<component group="com.google.cloud" name="google-cloud-core" version="2.51.0">
608653
<artifact name="google-cloud-core-2.51.0.jar">
609654
<sha256 value="e6b3cc080bd4c133471c6ec27fed515e9f8704bcfc5f17a9d971c8bbc1b30ff1" origin="Generated by Gradle"/>
610655
</artifact>
611656
</component>
657+
<component group="com.google.cloud" name="google-cloud-core" version="2.53.1">
658+
<artifact name="google-cloud-core-2.53.1.jar">
659+
<sha256 value="58e008f119a7aaf68d2d13f530e997db6797b7aaa70e08c563421627bed382b0" origin="Generated by Gradle"/>
660+
</artifact>
661+
</component>
612662
<component group="com.google.cloud" name="google-cloud-core" version="2.8.28">
613663
<artifact name="google-cloud-core-2.8.28.jar">
614664
<sha256 value="f775b5dc6b6478d07be13c64b3aa8ee0eded5e2571ff737e86ed05958cce4e92" origin="Generated by Gradle"/>
@@ -619,6 +669,11 @@
619669
<sha256 value="0a619e26c47e9cdd1fe77c492132dfe8a329a389651de9757be8bf9c3799d21d" origin="Generated by Gradle"/>
620670
</artifact>
621671
</component>
672+
<component group="com.google.cloud" name="google-cloud-core-http" version="2.53.1">
673+
<artifact name="google-cloud-core-http-2.53.1.jar">
674+
<sha256 value="c9ec3820b8f17ca5005e608b9f002c049467ccc888c86a54f44ddf1eb5ae9506" origin="Generated by Gradle"/>
675+
</artifact>
676+
</component>
622677
<component group="com.google.cloud" name="google-cloud-core-http" version="2.8.28">
623678
<artifact name="google-cloud-core-http-2.8.28.jar">
624679
<sha256 value="96cd89a23a40b64baa28cba92676fba67d16cfbb1a7085827a1852a71c2dce46" origin="Generated by Gradle"/>
@@ -634,6 +689,11 @@
634689
<sha256 value="9493bbbfb63a2c722c9251731a2226577d966a784c9363b6fba1e3bfa40be658" origin="Generated by Gradle"/>
635690
</artifact>
636691
</component>
692+
<component group="com.google.cloud" name="google-cloud-storage" version="2.50.0">
693+
<artifact name="google-cloud-storage-2.50.0.jar">
694+
<sha256 value="24b5289098fd7d3ffcb1f467339854855a2423d000d740dba7ba32521a533e31" origin="Generated by Gradle"/>
695+
</artifact>
696+
</component>
637697
<component group="com.google.code.findbugs" name="jsr305" version="3.0.0">
638698
<artifact name="jsr305-3.0.0.jar">
639699
<sha256 value="bec0b24dcb23f9670172724826584802b80ae6cbdaba03bdebdef9327b962f6a" origin="Generated by Gradle"/>
@@ -784,6 +844,11 @@
784844
<sha256 value="5efc5f08844c12f14b2fa4daa8af96ea8c4f8392dccceceeea1a83603e75edb2" origin="Generated by Gradle"/>
785845
</artifact>
786846
</component>
847+
<component group="com.google.http-client" name="google-http-client" version="1.46.3">
848+
<artifact name="google-http-client-1.46.3.jar">
849+
<sha256 value="2490a06e44b7f2adbcfe27e4099a576c0ee8d269437188d5391acd48c6d34310" origin="Generated by Gradle"/>
850+
</artifact>
851+
</component>
787852
<component group="com.google.http-client" name="google-http-client-appengine" version="1.42.3">
788853
<artifact name="google-http-client-appengine-1.42.3.jar">
789854
<sha256 value="3a876b1f704ac6d8500b8430b288dbce78c52dc18c43c008a587a7377bb81e2e" origin="Generated by Gradle"/>
@@ -794,6 +859,11 @@
794859
<sha256 value="e7c07f4cdcd93c20672450bab9b76714373c80336afea9ffb722ac15c65925f5" origin="Generated by Gradle"/>
795860
</artifact>
796861
</component>
862+
<component group="com.google.http-client" name="google-http-client-appengine" version="1.46.3">
863+
<artifact name="google-http-client-appengine-1.46.3.jar">
864+
<sha256 value="b0f48794b234439ad9e9b44f63874c78e8c553d03aa89f2864ca231e3c590b43" origin="Generated by Gradle"/>
865+
</artifact>
866+
</component>
797867
<component group="com.google.http-client" name="google-http-client-gson" version="1.41.1">
798868
<artifact name="google-http-client-gson-1.41.1.jar">
799869
<sha256 value="29deba06c722e00dd31fe7e3b526bdfec0577660b868a1efaceeddb5e04208a8" origin="Generated by Gradle"/>
@@ -809,6 +879,11 @@
809879
<sha256 value="b2d56455a29a720b3a432a2c22afd2f920f131a2f8a34458bc1fba360fddb89f" origin="Generated by Gradle"/>
810880
</artifact>
811881
</component>
882+
<component group="com.google.http-client" name="google-http-client-gson" version="1.46.3">
883+
<artifact name="google-http-client-gson-1.46.3.jar">
884+
<sha256 value="74eee65c563871659469eb85d703e5a7223427010ad545982fdc53d7db573266" origin="Generated by Gradle"/>
885+
</artifact>
886+
</component>
812887
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.41.1">
813888
<artifact name="google-http-client-jackson2-1.41.1.jar">
814889
<sha256 value="3b9add5859979519236f45cc9c9f53da975e0b5b88e0cdfd4bb009b112b4d435" origin="Generated by Gradle"/>
@@ -824,6 +899,11 @@
824899
<sha256 value="9d326f10582a3bf27d95c52031eb4ed74312079a8878e57979d19d9a454e4190" origin="Generated by Gradle"/>
825900
</artifact>
826901
</component>
902+
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.46.3">
903+
<artifact name="google-http-client-jackson2-1.46.3.jar">
904+
<sha256 value="06368f5e3704fbe1d983736f802ed172fbc7d957a4f76b381fd0d8c8e92830e4" origin="Generated by Gradle"/>
905+
</artifact>
906+
</component>
827907
<component group="com.google.inject" name="guice" version="3.0">
828908
<artifact name="guice-3.0.jar">
829909
<sha256 value="1a59d0421ffd355cc0b70b42df1c2e9af744c8a2d0c92da379f5fca2f07f1d22" origin="Generated by Gradle"/>
@@ -1479,6 +1559,11 @@
14791559
<sha256 value="ffa9af0f76fb08b4dbcade9dba9805af6b216980cafa0756b4d97b6029077506" origin="Generated by Gradle"/>
14801560
</artifact>
14811561
</component>
1562+
<component group="io.grpc" name="grpc-api" version="1.70.0">
1563+
<artifact name="grpc-api-1.70.0.jar">
1564+
<sha256 value="45faf2ac1bf2791e8fdabce53684a86b62c99b84cba26fb13a5ba3f4abf80d6c" origin="Generated by Gradle"/>
1565+
</artifact>
1566+
</component>
14821567
<component group="io.grpc" name="grpc-context" version="1.27.2">
14831568
<artifact name="grpc-context-1.27.2.jar">
14841569
<sha256 value="bcbf9055dff453fd6508bd7cca2a0aa2d5f059a9c94beed1f5fda1dc015607b8" origin="Generated by Gradle"/>

‎modules/repository-gcs/build.gradle‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,40 @@ esplugin {
2222
}
2323

2424
dependencies {
25-
//api platform('com.google.cloud:libraries-bom:26.55.0')
26-
implementation 'com.google.cloud:google-cloud-storage:2.48.2'
27-
implementation 'com.google.cloud:google-cloud-core:2.51.0'
28-
implementation 'com.google.cloud:google-cloud-core-http:2.51.0'
25+
// dependencies consistent with 'com.google.cloud:google-cloud-storage-bom:2.50.0'
26+
implementation 'com.google.cloud:google-cloud-storage:2.50.0'
27+
implementation 'com.google.cloud:google-cloud-core:2.53.1'
28+
implementation 'com.google.cloud:google-cloud-core-http:2.53.1'
2929
runtimeOnly 'com.google.guava:guava:33.4.0-jre'
3030
runtimeOnly 'com.google.guava:failureaccess:1.0.2'
31-
implementation "commons-codec:commons-codec:${versions.commonscodec}" // should be 1.18.0
32-
implementation 'com.google.api:api-common:2.44.0'
33-
implementation 'com.google.api:gax:2.61.0'
31+
runtimeOnly "org.slf4j:slf4j-api:${versions.slf4j}" // 2.0.16 in bom
32+
implementation "commons-codec:commons-codec:${versions.commonscodec}" // 1.18.0 in bom
33+
implementation 'com.google.api:api-common:2.46.1'
34+
implementation 'com.google.api:gax:2.63.1'
3435
implementation 'org.threeten:threetenbp:1.7.0'
35-
implementation "com.google.protobuf:protobuf-java-util:${versions.protobuf}" // should be 4.29
36+
implementation "com.google.protobuf:protobuf-java-util:${versions.protobuf}" // 3.25.5 in bom
3637
implementation "com.google.protobuf:protobuf-java:${versions.protobuf}"
3738
implementation 'com.google.code.gson:gson:2.12.1'
38-
implementation 'com.google.api.grpc:proto-google-common-protos:2.52.0'
39-
implementation 'com.google.api.grpc:proto-google-iam-v1:1.47.0'
40-
implementation 'com.google.auth:google-auth-library-credentials:1.32.1'
41-
implementation 'com.google.auth:google-auth-library-oauth2-http:1.32.1'
42-
implementation "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}" // should be 1.37.0
39+
implementation 'com.google.api.grpc:proto-google-common-protos:2.54.1'
40+
implementation 'com.google.api.grpc:proto-google-iam-v1:1.49.1'
41+
implementation 'com.google.auth:google-auth-library-credentials:1.33.1'
42+
implementation 'com.google.auth:google-auth-library-oauth2-http:1.33.1'
43+
implementation "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}" // 1.37.0 in bom
4344
implementation 'com.google.api-client:google-api-client:2.7.2'
44-
implementation 'com.google.http-client:google-http-client:1.46.1'
45-
implementation 'com.google.http-client:google-http-client-gson:1.46.1'
46-
implementation 'com.google.http-client:google-http-client-appengine:1.46.1'
47-
implementation 'com.google.http-client:google-http-client-jackson2:1.46.1'
48-
implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" // should be 2.18.2
49-
implementation 'com.google.api:gax-httpjson:2.61.0'
45+
implementation 'com.google.http-client:google-http-client:1.46.3'
46+
implementation 'com.google.http-client:google-http-client-gson:1.46.3'
47+
implementation 'com.google.http-client:google-http-client-appengine:1.46.3'
48+
implementation 'com.google.http-client:google-http-client-jackson2:1.46.3'
49+
implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" // 2.18.2 in bom
50+
implementation 'com.google.api:gax-httpjson:2.63.1'
5051
implementation 'io.opencensus:opencensus-api:0.31.1'
5152
implementation 'io.opencensus:opencensus-contrib-http-util:0.31.1'
52-
implementation 'com.google.apis:google-api-services-storage:v1-rev20241206-2.0.0'
53+
implementation 'com.google.apis:google-api-services-storage:v1-rev20250224-2.0.0'
5354
implementation 'org.checkerframework:checker-qual:3.49.0'
5455
implementation 'io.opentelemetry:opentelemetry-api:1.47.0'
5556
implementation 'io.opentelemetry:opentelemetry-context:1.47.0'
56-
implementation 'com.google.api.grpc:proto-google-cloud-storage-v2:2.48.2'
57-
implementation 'io.grpc:grpc-api:1.69.0'
57+
implementation 'com.google.api.grpc:proto-google-cloud-storage-v2:2.50.0'
58+
implementation 'io.grpc:grpc-api:1.70.0'
5859

5960
testImplementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
6061
testImplementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"

‎modules/repository-gcs/licenses/slf4j-api-LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright (c) 2004-2014 QOS.ch
2+
All rights reserved.
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎modules/repository-gcs/licenses/slf4j-api-NOTICE.txt‎

Whitespace-only changes.

0 commit comments

Comments
 (0)