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 2023/09/15 06:49:42 UTC

[solr] branch main updated: Update dependency com.google.guava:guava to v32.1.2-jre (#1770)

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 443cd924507 Update dependency com.google.guava:guava to v32.1.2-jre (#1770)
443cd924507 is described below

commit 443cd92450703775af9399919ae5ee622619148d
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Sep 15 08:49:37 2023 +0200

    Update dependency com.google.guava:guava to v32.1.2-jre (#1770)
---
 solr/licenses/guava-32.0.1-jre.jar.sha1 | 1 -
 solr/licenses/guava-32.1.2-jre.jar.sha1 | 1 +
 versions.lock                           | 9 +++++----
 versions.props                          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/solr/licenses/guava-32.0.1-jre.jar.sha1 b/solr/licenses/guava-32.0.1-jre.jar.sha1
deleted file mode 100644
index f9a5b552c4e..00000000000
--- a/solr/licenses/guava-32.0.1-jre.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6e5d51a72d142f2d40a57dfb897188b36a95b489
diff --git a/solr/licenses/guava-32.1.2-jre.jar.sha1 b/solr/licenses/guava-32.1.2-jre.jar.sha1
new file mode 100644
index 00000000000..787d67061c2
--- /dev/null
+++ b/solr/licenses/guava-32.1.2-jre.jar.sha1
@@ -0,0 +1 @@
+5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318
diff --git a/versions.lock b/versions.lock
index 85ae2c21be2..6e49dd1122a 100644
--- a/versions.lock
+++ b/versions.lock
@@ -42,16 +42,17 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
 com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: 0487ebc0)
+com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: bb893df4)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.0.1-jre (25 constraints: 346ecb71)
+com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
+com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
 com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620e575)
 com.google.http-client:google-http-client-appengine:1.43.1 (2 constraints: da207181)
 com.google.http-client:google-http-client-gson:1.43.1 (7 constraints: 5a70c647)
 com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)
-com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 833aea56)
+com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 3a3da718)
 com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
 com.google.protobuf:protobuf-java:3.23.1 (11 constraints: d095caae)
 com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)
@@ -269,7 +270,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.33.0 (5 constraints: 57468bea)
+org.checkerframework:checker-qual:3.33.0 (5 constraints: 0e494d11)
 org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
 org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
diff --git a/versions.props b/versions.props
index 49792da4fa7..6ab64b6efba 100644
--- a/versions.props
+++ b/versions.props
@@ -11,7 +11,7 @@ com.github.spotbugs:*=4.7.3
 com.github.stephenc.jcip:jcip-annotations=1.0-1
 com.google.cloud:google-cloud-bom=0.197.0
 com.google.errorprone:*=2.18.0
-com.google.guava:guava=32.0.1-jre
+com.google.guava:guava=32.1.2-jre
 com.google.re2j:re2j=1.7
 com.jayway.jsonpath:json-path=2.8.0
 com.lmax:disruptor=3.4.4