You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2026/04/22 14:45:04 UTC
(solr) branch branch_9x updated: Update dependency com.google.guava:guava to v33.6.0-jre (branch_9x) (#3540)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5fc24d721a9 Update dependency com.google.guava:guava to v33.6.0-jre (branch_9x) (#3540)
5fc24d721a9 is described below
commit 5fc24d721a9086b5fbe340faef7005e0f3ed86f1
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Wed Apr 22 16:44:58 2026 +0200
Update dependency com.google.guava:guava to v33.6.0-jre (branch_9x) (#3540)
Co-authored-by: Jan Høydahl <ja...@cominvent.com>
---
changelog/unreleased/PR#3540-update-com-google-guava-guava.yml | 7 +++++++
solr/licenses/guava-33.5.0-jre.jar.sha1 | 1 -
solr/licenses/guava-33.6.0-jre.jar.sha1 | 1 +
versions.lock | 4 ++--
versions.props | 2 +-
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changelog/unreleased/PR#3540-update-com-google-guava-guava.yml b/changelog/unreleased/PR#3540-update-com-google-guava-guava.yml
new file mode 100644
index 00000000000..338331de24e
--- /dev/null
+++ b/changelog/unreleased/PR#3540-update-com-google-guava-guava.yml
@@ -0,0 +1,7 @@
+title: Update com.google.guava:guava to v33.6.0-jre
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3540
+ url: https://github.com/apache/solr/pull/3540
diff --git a/solr/licenses/guava-33.5.0-jre.jar.sha1 b/solr/licenses/guava-33.5.0-jre.jar.sha1
deleted file mode 100644
index bab2178d101..00000000000
--- a/solr/licenses/guava-33.5.0-jre.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8699de25f2f979108d6c1b804a7ba38cda1116bc
diff --git a/solr/licenses/guava-33.6.0-jre.jar.sha1 b/solr/licenses/guava-33.6.0-jre.jar.sha1
new file mode 100644
index 00000000000..198ff9d3ddd
--- /dev/null
+++ b/solr/licenses/guava-33.6.0-jre.jar.sha1
@@ -0,0 +1 @@
+c376b13067cc99a5774403530953f7b05a91e218
diff --git a/versions.lock b/versions.lock
index 19f6ba6635b..5537a00a3dd 100644
--- a/versions.lock
+++ b/versions.lock
@@ -41,9 +41,9 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626)
com.google.code.gson:gson:2.12.1 (7 constraints: f6622515)
-com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 81cf65c8)
+com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 87cf47ce)
com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037)
-com.google.guava:guava:33.5.0-android (24 constraints: 4a65fc75)
+com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
com.google.http-client:google-http-client:1.44.2 (11 constraints: 45bf29b8)
com.google.http-client:google-http-client-apache-v2:1.44.2 (2 constraints: b9201d76)
diff --git a/versions.props b/versions.props
index cb097101aa8..d7820a6d142 100644
--- a/versions.props
+++ b/versions.props
@@ -12,7 +12,7 @@ com.github.spotbugs:*=4.8.6
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.guava:guava=33.6.0-jre
com.google.protobuf:*=4.34.1
com.google.re2j:re2j=1.8
com.j256.simplemagic:simplemagic=1.17