From 9eaeb8319660a51e94e60605d65f54bc2e2d2fde Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:56:52 +0000 Subject: [PATCH 1/2] Update dependency com.google.api.grpc:proto-google-common-protos to v2.70.0 --- gradle/libs.versions.toml | 2 +- solr/cross-dc-manager/gradle.lockfile | 5 +++-- solr/licenses/proto-google-common-protos-2.61.1.jar.sha1 | 1 - solr/licenses/proto-google-common-protos-2.70.0.jar.sha1 | 1 + solr/licenses/protobuf-java-4.33.2.jar.sha1 | 1 + solr/modules/gcs-repository/gradle.lockfile | 5 +++-- solr/modules/opentelemetry/gradle.lockfile | 5 +++-- 7 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 solr/licenses/proto-google-common-protos-2.61.1.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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31e..81b58d9a81b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,7 +94,7 @@ fasterxml-woodstox = "7.0.0" flexmark = "0.64.8" google-api-gax = "2.70.0" # @keep for version alignment -google-api-grpc-proto = "2.61.1" +google-api-grpc-proto = "2.70.0" google-auth = "1.19.0" # @keep for version alignment google-autovalue = "1.11.0" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index a700b6be805..767b3116ff2 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -19,7 +19,7 @@ com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarV com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.61.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.70.0=jarValidation,runtimeClasspath,runtimeLibs,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,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -35,7 +35,8 @@ com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorpron com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.33.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath 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 deleted file mode 100644 index cdc87478058..00000000000 --- a/solr/licenses/proto-google-common-protos-2.61.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ff95d540fab274675a49cd51306e07969561a821 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/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index fcdce63db23..19da1332ef3 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -18,7 +18,7 @@ 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:gax-grpc:2.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,8 @@ com.google.http-client:google-http-client:1.47.1=compileClasspath,jarValidation, 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: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 diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index dab8526fa6f..0b41b83c5ec 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -14,7 +14,7 @@ com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtim com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,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.grpc:proto-google-common-protos:2.61.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.70.0=jarValidation,runtimeClasspath,runtimeLibs,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,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -29,7 +29,8 @@ com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.33.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=solrPlatformLibs From 90a68ed9b4fa7644816c1b00c157b824b01e3400 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:57:11 +0000 Subject: [PATCH 2/2] Update changelog entry --- ...3687-update-com-google-api-grpc-proto-google-common.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#3687-update-com-google-api-grpc-proto-google-common.yml diff --git a/changelog/unreleased/PR#3687-update-com-google-api-grpc-proto-google-common.yml b/changelog/unreleased/PR#3687-update-com-google-api-grpc-proto-google-common.yml new file mode 100644 index 00000000000..daca7b53ae5 --- /dev/null +++ b/changelog/unreleased/PR#3687-update-com-google-api-grpc-proto-google-common.yml @@ -0,0 +1,7 @@ +title: Update com.google.api.grpc:proto-google-common-protos to v2.70.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3687 + url: https://github.com/apache/solr/pull/3687