From 55b682567bce04c5e2129e73ce9ac66ee1951475 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:55:02 +0000 Subject: [PATCH 1/2] Update dependency com.google.api:gax to v2.79.0 --- gradle/libs.versions.toml | 2 +- solr/licenses/api-common-2.53.1.jar.sha1 | 1 - solr/licenses/api-common-2.62.0.jar.sha1 | 1 + .../error_prone_annotations-2.45.0.jar.sha1 | 1 + solr/licenses/gax-2.70.1.jar.sha1 | 1 - solr/licenses/gax-2.79.0.jar.sha1 | 1 + ...e-auth-library-credentials-1.39.0.jar.sha1 | 1 - ...e-auth-library-credentials-1.46.0.jar.sha1 | 1 + ...e-auth-library-oauth2-http-1.39.0.jar.sha1 | 1 - ...e-auth-library-oauth2-http-1.46.0.jar.sha1 | 1 + .../google-http-client-1.47.1.jar.sha1 | 1 - .../google-http-client-2.1.0.jar.sha1 | 1 + .../google-http-client-gson-1.47.1.jar.sha1 | 1 - .../google-http-client-gson-2.1.0.jar.sha1 | 1 + ...proto-google-common-protos-2.70.0.jar.sha1 | 1 + solr/licenses/protobuf-java-4.33.2.jar.sha1 | 1 + .../protobuf-java-util-4.33.2.jar.sha1 | 1 + solr/modules/gcs-repository/gradle.lockfile | 22 ++++++++++--------- 18 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 solr/licenses/api-common-2.53.1.jar.sha1 create mode 100644 solr/licenses/api-common-2.62.0.jar.sha1 create mode 100644 solr/licenses/error_prone_annotations-2.45.0.jar.sha1 delete mode 100644 solr/licenses/gax-2.70.1.jar.sha1 create mode 100644 solr/licenses/gax-2.79.0.jar.sha1 delete mode 100644 solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1 create mode 100644 solr/licenses/google-auth-library-credentials-1.46.0.jar.sha1 delete mode 100644 solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1 create mode 100644 solr/licenses/google-auth-library-oauth2-http-1.46.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-1.47.1.jar.sha1 create mode 100644 solr/licenses/google-http-client-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-gson-1.47.1.jar.sha1 create mode 100644 solr/licenses/google-http-client-gson-2.1.0.jar.sha1 create mode 100644 solr/licenses/proto-google-common-protos-2.70.0.jar.sha1 create mode 100644 solr/licenses/protobuf-java-4.33.2.jar.sha1 create mode 100644 solr/licenses/protobuf-java-util-4.33.2.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31e..2188ef127d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -92,7 +92,7 @@ fasterxml = "2.21.2" fasterxml-woodstox = "7.0.0" # @keep Flexmark used in classpath flexmark = "0.64.8" -google-api-gax = "2.70.0" +google-api-gax = "2.79.0" # @keep for version alignment google-api-grpc-proto = "2.61.1" google-auth = "1.19.0" diff --git a/solr/licenses/api-common-2.53.1.jar.sha1 b/solr/licenses/api-common-2.53.1.jar.sha1 deleted file mode 100644 index b2e9529eb51..00000000000 --- a/solr/licenses/api-common-2.53.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f107d65a50aaaab23a469c2ec7bd29ca1bdcc06 diff --git a/solr/licenses/api-common-2.62.0.jar.sha1 b/solr/licenses/api-common-2.62.0.jar.sha1 new file mode 100644 index 00000000000..78cf735ceac --- /dev/null +++ b/solr/licenses/api-common-2.62.0.jar.sha1 @@ -0,0 +1 @@ +8ffc3453842043f101a66a33b5f73260a040a8e5 diff --git a/solr/licenses/error_prone_annotations-2.45.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.45.0.jar.sha1 new file mode 100644 index 00000000000..b8bc207b342 --- /dev/null +++ b/solr/licenses/error_prone_annotations-2.45.0.jar.sha1 @@ -0,0 +1 @@ +e4b613b411b934eee185aad72bee4c6148fb8dc3 diff --git a/solr/licenses/gax-2.70.1.jar.sha1 b/solr/licenses/gax-2.70.1.jar.sha1 deleted file mode 100644 index 3ff5f748e56..00000000000 --- a/solr/licenses/gax-2.70.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e8b55ea6700a5b9cfc3908d230590956b15c58a diff --git a/solr/licenses/gax-2.79.0.jar.sha1 b/solr/licenses/gax-2.79.0.jar.sha1 new file mode 100644 index 00000000000..0c03b64f353 --- /dev/null +++ b/solr/licenses/gax-2.79.0.jar.sha1 @@ -0,0 +1 @@ +ae533be5c421a718e73fa5a7f04909f8036ac729 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 deleted file mode 100644 index bc88c22d926..00000000000 --- a/solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f112a60fe51099a0cba7469caef911487a6f5844 diff --git a/solr/licenses/google-auth-library-credentials-1.46.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.46.0.jar.sha1 new file mode 100644 index 00000000000..d3d1128e111 --- /dev/null +++ b/solr/licenses/google-auth-library-credentials-1.46.0.jar.sha1 @@ -0,0 +1 @@ +b4a034dd289c23fd37fa337f40e2617fc902669b 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 deleted file mode 100644 index 102ca72156e..00000000000 --- a/solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9d7d3d3ae9de7cced318fb0a5a1b8317a7b0e2c7 diff --git a/solr/licenses/google-auth-library-oauth2-http-1.46.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.46.0.jar.sha1 new file mode 100644 index 00000000000..9a984337cbd --- /dev/null +++ b/solr/licenses/google-auth-library-oauth2-http-1.46.0.jar.sha1 @@ -0,0 +1 @@ +afaa62d0ad2c6ba82c0dae4f2b791b0d43e2db51 diff --git a/solr/licenses/google-http-client-1.47.1.jar.sha1 b/solr/licenses/google-http-client-1.47.1.jar.sha1 deleted file mode 100644 index 40510e6d1f8..00000000000 --- a/solr/licenses/google-http-client-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eabad78d440226732a453d6a300663a9770f5b7e diff --git a/solr/licenses/google-http-client-2.1.0.jar.sha1 b/solr/licenses/google-http-client-2.1.0.jar.sha1 new file mode 100644 index 00000000000..a58c9a8c44f --- /dev/null +++ b/solr/licenses/google-http-client-2.1.0.jar.sha1 @@ -0,0 +1 @@ +f4c08fa160a5199af19f81080fbaa921ae2193c7 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 deleted file mode 100644 index 74b94a5a39e..00000000000 --- a/solr/licenses/google-http-client-gson-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04331c43544544d60df28055c295949e22ba60a4 diff --git a/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 b/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 new file mode 100644 index 00000000000..93b97013bdb --- /dev/null +++ b/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 @@ -0,0 +1 @@ +e65ea98fe4e8d3a512559698a0d8664908fd36f3 diff --git a/solr/licenses/proto-google-common-protos-2.70.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.70.0.jar.sha1 new file mode 100644 index 00000000000..dd22f65e738 --- /dev/null +++ b/solr/licenses/proto-google-common-protos-2.70.0.jar.sha1 @@ -0,0 +1 @@ +2c7c018541be96f9efd876c3aa441e1a1d0afcd4 diff --git a/solr/licenses/protobuf-java-4.33.2.jar.sha1 b/solr/licenses/protobuf-java-4.33.2.jar.sha1 new file mode 100644 index 00000000000..497b3ed4269 --- /dev/null +++ b/solr/licenses/protobuf-java-4.33.2.jar.sha1 @@ -0,0 +1 @@ +c85bf5de1ad10453792675f6515401f7b8eb6860 diff --git a/solr/licenses/protobuf-java-util-4.33.2.jar.sha1 b/solr/licenses/protobuf-java-util-4.33.2.jar.sha1 new file mode 100644 index 00000000000..f584935a6fb --- /dev/null +++ b/solr/licenses/protobuf-java-util-4.33.2.jar.sha1 @@ -0,0 +1 @@ +3c40e96546f9152b213b128798a7e5df7568b66b diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index fcdce63db23..af17fdf5be5 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -18,15 +18,15 @@ com.google.api-client:google-api-client:2.7.2=compileClasspath,jarValidation,run 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.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.70.0=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:api-common:2.62.0=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.70.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.70.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.79.0=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.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.auth:google-auth-library-credentials:1.46.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.46.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.11.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -38,8 +38,9 @@ com.google.cloud:google-cloud-nio:0.127.20=jarValidation,testCompileClasspath,te com.google.cloud:google-cloud-storage:2.40.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.41.0=apiHelper com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -48,13 +49,14 @@ com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath 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.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-gson:2.1.0=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.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,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 -com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath From aa70a7cc2a02410a7198c30a2dc1794fd4852361 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:55:20 +0000 Subject: [PATCH 2/2] Update changelog entry --- changelog/unreleased/PR#3641-update-com-google-api-gax.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#3641-update-com-google-api-gax.yml diff --git a/changelog/unreleased/PR#3641-update-com-google-api-gax.yml b/changelog/unreleased/PR#3641-update-com-google-api-gax.yml new file mode 100644 index 00000000000..0cbc97f3241 --- /dev/null +++ b/changelog/unreleased/PR#3641-update-com-google-api-gax.yml @@ -0,0 +1,7 @@ +title: Update com.google.api:gax to v2.79.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3641 + url: https://github.com/apache/solr/pull/3641