From 6884e21c93d85c3aa169dd7d09b6f3b000797431 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 20 Apr 2026 22:34:41 +0000 Subject: [PATCH 1/2] Update com.google.protobuf:* to v3.25.9 (branch_9x) --- solr/licenses/protobuf-java-3.25.8.jar.sha1 | 1 - solr/licenses/protobuf-java-3.25.9.jar.sha1 | 1 + solr/licenses/protobuf-java-util-3.25.8.jar.sha1 | 1 - solr/licenses/protobuf-java-util-3.25.9.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 solr/licenses/protobuf-java-3.25.8.jar.sha1 create mode 100644 solr/licenses/protobuf-java-3.25.9.jar.sha1 delete mode 100644 solr/licenses/protobuf-java-util-3.25.8.jar.sha1 create mode 100644 solr/licenses/protobuf-java-util-3.25.9.jar.sha1 diff --git a/solr/licenses/protobuf-java-3.25.8.jar.sha1 b/solr/licenses/protobuf-java-3.25.8.jar.sha1 deleted file mode 100644 index b7ea139f6152..000000000000 --- a/solr/licenses/protobuf-java-3.25.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ba593767658038775b2ea9724c3686609874470 diff --git a/solr/licenses/protobuf-java-3.25.9.jar.sha1 b/solr/licenses/protobuf-java-3.25.9.jar.sha1 new file mode 100644 index 000000000000..6761e1f5ba31 --- /dev/null +++ b/solr/licenses/protobuf-java-3.25.9.jar.sha1 @@ -0,0 +1 @@ +64cdd0aac23f3c05740b6e6a15b041353cf6ffaa diff --git a/solr/licenses/protobuf-java-util-3.25.8.jar.sha1 b/solr/licenses/protobuf-java-util-3.25.8.jar.sha1 deleted file mode 100644 index a54234b78deb..000000000000 --- a/solr/licenses/protobuf-java-util-3.25.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0be3cb8bef1415d3b87cf5bf4de0b9149f6a0990 diff --git a/solr/licenses/protobuf-java-util-3.25.9.jar.sha1 b/solr/licenses/protobuf-java-util-3.25.9.jar.sha1 new file mode 100644 index 000000000000..e988f219b696 --- /dev/null +++ b/solr/licenses/protobuf-java-util-3.25.9.jar.sha1 @@ -0,0 +1 @@ +62aaa6521bbc050dc44431a4456f3bf99a1231c4 diff --git a/versions.lock b/versions.lock index b99b5dd0c59d..a34b67763cef 100644 --- a/versions.lock +++ b/versions.lock @@ -51,8 +51,8 @@ com.google.http-client:google-http-client-gson:1.44.2 (7 constraints: 68702d4e) com.google.http-client:google-http-client-jackson2:1.44.2 (1 constraints: 1f1009a6) com.google.j2objc:j2objc-annotations:3.0.0 (4 constraints: 453c9e88) com.google.oauth-client:google-oauth-client:1.36.0 (2 constraints: b720ee75) -com.google.protobuf:protobuf-java:3.25.8 (9 constraints: 3e833c8f) -com.google.protobuf:protobuf-java-util:3.25.8 (4 constraints: 7f30200a) +com.google.protobuf:protobuf-java:3.25.9 (9 constraints: 3f838d8f) +com.google.protobuf:protobuf-java-util:3.25.9 (4 constraints: 8030a10a) com.google.re2j:re2j:1.8 (2 constraints: 3a140270) com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) diff --git a/versions.props b/versions.props index b95645350ce2..75b6420b69f4 100644 --- a/versions.props +++ b/versions.props @@ -13,7 +13,7 @@ com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0 com.google.errorprone:*=2.31.0 com.google.guava:guava=32.1.3-jre -com.google.protobuf:*=3.25.8 +com.google.protobuf:*=3.25.9 com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 com.jayway.jsonpath:json-path=2.9.0 From 81bcf087baaeb0aa8c897a45720edb2d79bf3537 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 20 Apr 2026 22:35:05 +0000 Subject: [PATCH 2/2] Update changelog entry --- ...294-update-com-google-protobuf-to-v3-25-9-branch-9x.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4294-update-com-google-protobuf-to-v3-25-9-branch-9x.yml diff --git a/changelog/unreleased/PR#4294-update-com-google-protobuf-to-v3-25-9-branch-9x.yml b/changelog/unreleased/PR#4294-update-com-google-protobuf-to-v3-25-9-branch-9x.yml new file mode 100644 index 000000000000..776155b7cd05 --- /dev/null +++ b/changelog/unreleased/PR#4294-update-com-google-protobuf-to-v3-25-9-branch-9x.yml @@ -0,0 +1,7 @@ +title: Update com.google.protobuf:* to v3.25.9 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4294 + url: https://github.com/apache/solr/pull/4294