Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update google.cloud.core to v2.60.1 (#3231)

Solr Botb76342aa18f1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca6c05adfa8..c8bfe219f23 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -96,7 +96,7 @@ google-auth = "1.19.0"
# @keep for version alignment
google-autovalue = "1.10.4"
google-cloud-bom = "0.224.0"
-google-cloud-core = "2.23.0"
+google-cloud-core = "2.60.1"
google-cloud-nio = "0.127.3"
google-cloud-storage = "2.27.0"
google-errorprone = "2.31.0"
diff --git a/solr/licenses/api-common-2.53.0.jar.sha1 b/solr/licenses/api-common-2.53.0.jar.sha1
deleted file mode 100644
index d212ea83756..00000000000
--- a/solr/licenses/api-common-2.53.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96e6ff53548b176c5d046049dc8fb1c64546a96a
diff --git a/solr/licenses/api-common-2.53.1.jar.sha1 b/solr/licenses/api-common-2.53.1.jar.sha1
new file mode 100644
index 00000000000..b2e9529eb51
--- /dev/null
+++ b/solr/licenses/api-common-2.53.1.jar.sha1
@@ -0,0 +1 @@
+1f107d65a50aaaab23a469c2ec7bd29ca1bdcc06
diff --git a/solr/licenses/gax-2.70.0.jar.sha1 b/solr/licenses/gax-2.70.0.jar.sha1
deleted file mode 100644
index fe354c1ffcb..00000000000
--- a/solr/licenses/gax-2.70.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6fb01d2c856a6f5a46b8390efa160891c25041f8
diff --git a/solr/licenses/gax-2.70.1.jar.sha1 b/solr/licenses/gax-2.70.1.jar.sha1
new file mode 100644
index 00000000000..3ff5f748e56
--- /dev/null
+++ b/solr/licenses/gax-2.70.1.jar.sha1
@@ -0,0 +1 @@
+6e8b55ea6700a5b9cfc3908d230590956b15c58a
diff --git a/solr/licenses/gax-httpjson-2.50.0.jar.sha1 b/solr/licenses/gax-httpjson-2.50.0.jar.sha1
deleted file mode 100644
index 2126fbd80e2..00000000000
--- a/solr/licenses/gax-httpjson-2.50.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c0a42ce6b3363b2a569b0cadd9a9d5859841f3d
diff --git a/solr/licenses/gax-httpjson-2.70.1.jar.sha1 b/solr/licenses/gax-httpjson-2.70.1.jar.sha1
new file mode 100644
index 00000000000..47c32e4bac3
--- /dev/null
+++ b/solr/licenses/gax-httpjson-2.70.1.jar.sha1
@@ -0,0 +1 @@
+2ed35417c8d6549c89103dcaa2418f4ddaab4fcc
diff --git a/solr/licenses/google-api-client-2.6.0.jar.sha1 b/solr/licenses/google-api-client-2.6.0.jar.sha1
deleted file mode 100644
index d2a9431dc75..00000000000
--- a/solr/licenses/google-api-client-2.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b602d71e2491bbb66cfcd27a21db6ffea3764cdd
diff --git a/solr/licenses/google-api-client-2.7.2.jar.sha1 b/solr/licenses/google-api-client-2.7.2.jar.sha1
new file mode 100644
index 00000000000..0c7ef7d5f40
--- /dev/null
+++ b/solr/licenses/google-api-client-2.7.2.jar.sha1
@@ -0,0 +1 @@
+495d58d6e31c2c5e24a707a50d6355ba92dd3d0c
diff --git a/solr/licenses/google-auth-library-credentials-1.37.1.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.37.1.jar.sha1
deleted file mode 100644
index 6fafbbbb54d..00000000000
--- a/solr/licenses/google-auth-library-credentials-1.37.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-894c1cd371380e254290ac7c7df04372bf547a8f
diff --git a/solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1
new file mode 100644
index 00000000000..bc88c22d926
--- /dev/null
+++ b/solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1
@@ -0,0 +1 @@
+f112a60fe51099a0cba7469caef911487a6f5844
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.37.1.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.37.1.jar.sha1
deleted file mode 100644
index a4cca3fa9a6..00000000000
--- a/solr/licenses/google-auth-library-oauth2-http-1.37.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-86a3c90a6b80128fccac09dead6158fe7cc5e7bd
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1
new file mode 100644
index 00000000000..102ca72156e
--- /dev/null
+++ b/solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1
@@ -0,0 +1 @@
+9d7d3d3ae9de7cced318fb0a5a1b8317a7b0e2c7
diff --git a/solr/licenses/google-cloud-core-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-2.40.0.jar.sha1
deleted file mode 100644
index c642ef36572..00000000000
--- a/solr/licenses/google-cloud-core-2.40.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-035214007270128474de01a84c6795df0083b4bc
diff --git a/solr/licenses/google-cloud-core-2.60.1.jar.sha1 b/solr/licenses/google-cloud-core-2.60.1.jar.sha1
new file mode 100644
index 00000000000..2f394175b7e
--- /dev/null
+++ b/solr/licenses/google-cloud-core-2.60.1.jar.sha1
@@ -0,0 +1 @@
+4ec3044c35c20ba950a644850ed862401ec7cd85
diff --git a/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1
deleted file mode 100644
index 7fa9d3ee815..00000000000
--- a/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7d82b9e9499c6d8d7cee9583f44f3d540a69f31
diff --git a/solr/licenses/google-cloud-core-http-2.60.1.jar.sha1 b/solr/licenses/google-cloud-core-http-2.60.1.jar.sha1
new file mode 100644
index 00000000000..65eeb86817e
--- /dev/null
+++ b/solr/licenses/google-cloud-core-http-2.60.1.jar.sha1
@@ -0,0 +1 @@
+f2b36991cadb7d8c37b384db85af38b8c8dfa202
diff --git a/solr/licenses/google-http-client-1.47.0.jar.sha1 b/solr/licenses/google-http-client-1.47.0.jar.sha1
deleted file mode 100644
index e343c08dac3..00000000000
--- a/solr/licenses/google-http-client-1.47.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a43d6d7e4def9947bd1df60c2009483aac7e30f0
diff --git a/solr/licenses/google-http-client-1.47.1.jar.sha1 b/solr/licenses/google-http-client-1.47.1.jar.sha1
new file mode 100644
index 00000000000..40510e6d1f8
--- /dev/null
+++ b/solr/licenses/google-http-client-1.47.1.jar.sha1
@@ -0,0 +1 @@
+eabad78d440226732a453d6a300663a9770f5b7e
diff --git a/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1
deleted file mode 100644
index aefcf791c96..00000000000
--- a/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed3a506172c1cbf7ee514fc103f539979891f7b0
diff --git a/solr/licenses/google-http-client-apache-v2-1.45.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.45.2.jar.sha1
new file mode 100644
index 00000000000..9bfa4c571f2
--- /dev/null
+++ b/solr/licenses/google-http-client-apache-v2-1.45.2.jar.sha1
@@ -0,0 +1 @@
+0709e720ca21bf6e201dd244137d38281548172e
diff --git a/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 b/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1
deleted file mode 100644
index 144d5ab8b2e..00000000000
--- a/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-890b842ea0de630308c459bbe1185532cf486d62
diff --git a/solr/licenses/google-http-client-appengine-1.47.1.jar.sha1 b/solr/licenses/google-http-client-appengine-1.47.1.jar.sha1
new file mode 100644
index 00000000000..f6bdc9df9e1
--- /dev/null
+++ b/solr/licenses/google-http-client-appengine-1.47.1.jar.sha1
@@ -0,0 +1 @@
+487e80e93247912e7f9e33dcd1f5cb6aa2fce107
diff --git a/solr/licenses/google-http-client-gson-1.47.0.jar.sha1 b/solr/licenses/google-http-client-gson-1.47.0.jar.sha1
deleted file mode 100644
index 6736d4f416d..00000000000
--- a/solr/licenses/google-http-client-gson-1.47.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0155e79b3ac90f0a8f7f872a6c0246c04babdc57
diff --git a/solr/licenses/google-http-client-gson-1.47.1.jar.sha1 b/solr/licenses/google-http-client-gson-1.47.1.jar.sha1
new file mode 100644
index 00000000000..74b94a5a39e
--- /dev/null
+++ b/solr/licenses/google-http-client-gson-1.47.1.jar.sha1
@@ -0,0 +1 @@
+04331c43544544d60df28055c295949e22ba60a4
diff --git a/solr/licenses/proto-google-common-protos-2.61.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.61.0.jar.sha1
deleted file mode 100644
index 55b3cedc1b7..00000000000
--- a/solr/licenses/proto-google-common-protos-2.61.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e9550b97769810f105cfee4a6ab8e63873e3c21
diff --git a/solr/licenses/proto-google-common-protos-2.61.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.61.1.jar.sha1
new file mode 100644
index 00000000000..cdc87478058
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.61.1.jar.sha1
@@ -0,0 +1 @@
+ff95d540fab274675a49cd51306e07969561a821
diff --git a/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1
deleted file mode 100644
index d2b1f509a28..00000000000
--- a/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af2c8bdad5a6ea0c1ba9aebff08d675fdee26476
diff --git a/solr/licenses/proto-google-iam-v1-1.56.1.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.56.1.jar.sha1
new file mode 100644
index 00000000000..9b60b598a49
--- /dev/null
+++ b/solr/licenses/proto-google-iam-v1-1.56.1.jar.sha1
@@ -0,0 +1 @@
+5bfe3a2c555803bc5bcb0e61c82899ca99b8974e
diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile
index 780e09f705c..1d3bf159100 100644
--- a/solr/modules/gcs-repository/gradle.lockfile
+++ b/solr/modules/gcs-repository/gradle.lockfile
@@ -14,27 +14,27 @@ com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClassp
com.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.api-client:google-api-client:2.6.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client:2.7.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.61.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.61.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.56.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.53.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.api:gax-grpc:2.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.70.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.70.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.70.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-credentials:1.37.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-oauth2-http:1.37.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-credentials:1.39.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-oauth2-http:1.39.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorprone,testAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
com.google.cloud:google-cloud-bom:0.224.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.cloud:google-cloud-core-grpc:2.40.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-http:2.40.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.40.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.60.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.60.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.cloud:google-cloud-nio:0.127.20=jarValidation,testCompileClasspath,testRuntimeClasspath
com.google.cloud:google-cloud-storage:2.40.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor
@@ -49,11 +49,11 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp
com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,errorprone,solrPlatformLibs,testAnnotationProcessor
com.google.guava:guava:33.4.0-jre=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-gson:1.47.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-apache-v2:1.45.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-appengine:1.47.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-gson:1.47.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.http-client:google-http-client-jackson2:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client:1.47.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client:1.47.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
com.google.protobuf:protobuf-java-util:3.25.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath