Apache Solr open-source search software
Update dependency com.google.guava:guava to v32 (#1686)
Solr Bot6170534924ff
diff --git a/solr/licenses/guava-31.1-jre.jar.sha1 b/solr/licenses/guava-31.1-jre.jar.sha1deleted file mode 100644index fd390406170..00000000000--- a/solr/licenses/guava-31.1-jre.jar.sha1+++ /dev/null@@ -1 +0,0 @@-60458f877d055d0c9114d9e1a2efb737b4bc282cdiff --git a/solr/licenses/guava-32.0.1-jre.jar.sha1 b/solr/licenses/guava-32.0.1-jre.jar.sha1new file mode 100644index 00000000000..f9a5b552c4e--- /dev/null+++ b/solr/licenses/guava-32.0.1-jre.jar.sha1@@ -0,0 +1 @@+6e5d51a72d142f2d40a57dfb897188b36a95b489diff --git a/solr/licenses/j2objc-annotations-1.3.jar.sha1 b/solr/licenses/j2objc-annotations-1.3.jar.sha1deleted file mode 100644index fca92a1c957..00000000000--- a/solr/licenses/j2objc-annotations-1.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ba035118bc8bac37d7eff77700720999acd9986ddiff --git a/solr/licenses/j2objc-annotations-2.8.jar.sha1 b/solr/licenses/j2objc-annotations-2.8.jar.sha1new file mode 100644index 00000000000..c64c1a888cf--- /dev/null+++ b/solr/licenses/j2objc-annotations-2.8.jar.sha1@@ -0,0 +1 @@+c85270e307e7b822f1086b93689124b89768e273diff --git a/versions.lock b/versions.lockindex de15f4df4a9..011819ef466 100644--- a/versions.lock+++ b/versions.lock@@ -43,16 +43,16 @@ com.google.cloud:google-cloud-core-grpc:2.13.0 (1 constraints: 1a10fea5)com.google.cloud:google-cloud-core-http:2.13.0 (1 constraints: 1a10fea5)com.google.cloud:google-cloud-storage:2.20.2 (2 constraints: cd1c8d26)com.google.code.gson:gson:2.10.1 (6 constraints: 9057326c)-com.google.errorprone:error_prone_annotations:2.18.0 (12 constraints: d5955446)+com.google.errorprone:error_prone_annotations:2.18.0 (12 constraints: dc95e14b)com.google.guava:failureaccess:1.0.1 (4 constraints: 18392d69)-com.google.guava:guava:31.1-jre (23 constraints: bc4e63f8)+com.google.guava:guava:32.0.1-jre (23 constraints: 1b4f0267)com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (4 constraints: bc6f5d57)com.google.http-client:google-http-client:1.43.1 (9 constraints: 649d6249)com.google.http-client:google-http-client-apache-v2:1.43.1 (3 constraints: 7331c77e)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: d474022b)com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)-com.google.j2objc:j2objc-annotations:1.3 (5 constraints: b948811c)+com.google.j2objc:j2objc-annotations:2.8 (5 constraints: bf48a91d)com.google.oauth-client:google-oauth-client:1.34.1 (3 constraints: 7231657e)com.google.protobuf:protobuf-java:3.21.12 (9 constraints: 337a302f)com.google.protobuf:protobuf-java-util:3.21.12 (3 constraints: 3a30bff8)@@ -269,7 +269,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 (7 constraints: df65a2ee)+org.checkerframework:checker-qual:3.33.0 (7 constraints: e265a9ef)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.propsindex 4c7b9719f8b..d8c27a27208 100644--- a/versions.props+++ b/versions.props@@ -11,7 +11,7 @@ com.github.spotbugs:*=4.7.3com.github.stephenc.jcip:jcip-annotations=1.0-1com.google.cloud:google-cloud-bom=0.192.0com.google.errorprone:*=2.18.0-com.google.guava:guava=31.1-jre+com.google.guava:guava=32.0.1-jrecom.google.re2j:re2j=1.7com.jayway.jsonpath:json-path=2.8.0com.lmax:disruptor=3.4.4