Apache Solr open-source search software
SOLR-15912 Update Guava to 31.0.1 (#520)
Jan Høydahle370a9ce801a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex aa36def5d47..3ada7ce8e73 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -477,6 +477,8 @@ Other Changes* SOLR-15845: Add a new SolrVersion class to manage Solr's version independently from the Lucene version we consume (janhoy)+* SOLR-15912: Upgrade guava to version 31.0.1-jre (janhoy)+* SOLR-14858: Add the server WEB-INF/lib directory to the classpath for the solr-exporter script. Will allow the scriptto work when the dist/solrj-lib jars are missing in the Docker image. (Houston Putman)diff --git a/solr/core/build.gradle b/solr/core/build.gradleindex a40b83df4fb..a0c7d6ad108 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -124,7 +124,6 @@ dependencies {// SQL Parser via Calciteimplementation ('org.apache.calcite:calcite-core', {exclude group: 'org.apache.calcite.avatica', module: 'avatica-metrics'- exclude group: 'com.google.guava', module: 'guava' // TODO remove this to keep versions in syncexclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml'exclude group: 'com.google.uzaygezen', module: 'uzaygezen-core'exclude group: 'com.yahoo.datasketches', module: 'sketches-core'diff --git a/solr/licenses/checker-qual-3.10.0.jar.sha1 b/solr/licenses/checker-qual-3.10.0.jar.sha1deleted file mode 100644index 30969364cbe..00000000000--- a/solr/licenses/checker-qual-3.10.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-710fd6abff4b26b40dc0917050dc4c67efcf60b6diff --git a/solr/licenses/checker-qual-3.12.0.jar.sha1 b/solr/licenses/checker-qual-3.12.0.jar.sha1new file mode 100644index 00000000000..f31218537fc--- /dev/null+++ b/solr/licenses/checker-qual-3.12.0.jar.sha1@@ -0,0 +1 @@+d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5diff --git a/solr/licenses/guava-25.1-jre.jar.sha1 b/solr/licenses/guava-25.1-jre.jar.sha1deleted file mode 100644index 8ee9ae964a8..00000000000--- a/solr/licenses/guava-25.1-jre.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4diff --git a/solr/licenses/guava-31.0.1-jre.jar.sha1 b/solr/licenses/guava-31.0.1-jre.jar.sha1new file mode 100644index 00000000000..e8bf52b09d7--- /dev/null+++ b/solr/licenses/guava-31.0.1-jre.jar.sha1@@ -0,0 +1 @@+119ea2b2bc205b138974d351777b20f02b92704bdiff --git a/versions.lock b/versions.lockindex 62980d77567..9d02330798d 100644--- a/versions.lock+++ b/versions.lock@@ -31,16 +31,16 @@ com.google.cloud:google-cloud-storage:1.113.14 (2 constraints: 10143aa3)com.google.code.findbugs:annotations:3.0.1 (1 constraints: 0605fb35)com.google.code.findbugs:jsr305:3.0.2 (9 constraints: 057f5545)com.google.code.gson:gson:2.8.6 (4 constraints: 94389e56)-com.google.errorprone:error_prone_annotations:2.10.0 (5 constraints: 243d8c14)-com.google.guava:failureaccess:1.0.1 (1 constraints: e60fd595)-com.google.guava:guava:25.1-jre (2 constraints: 0515c2b9)-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: 8f1d45cb)+com.google.errorprone:error_prone_annotations:2.10.0 (5 constraints: 283df815)+com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)+com.google.guava:guava:31.0.1-jre (4 constraints: 4d336586)+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)com.google.http-client:google-http-client:1.39.2 (9 constraints: 0792de64)com.google.http-client:google-http-client-apache-v2:1.39.2 (2 constraints: bf20ed76)com.google.http-client:google-http-client-appengine:1.39.0 (2 constraints: 5915a1d6)com.google.http-client:google-http-client-gson:1.39.2 (4 constraints: 564300a0)com.google.http-client:google-http-client-jackson2:1.39.0 (2 constraints: 5915a1d6)-com.google.j2objc:j2objc-annotations:1.3 (4 constraints: f52eb3b1)+com.google.j2objc:j2objc-annotations:1.3 (4 constraints: f72e15b2)com.google.oauth-client:google-oauth-client:1.32.1 (3 constraints: ee252fa6)com.google.protobuf:protobuf-java:3.15.5 (7 constraints: 4869ba4c)com.google.protobuf:protobuf-java-util:3.15.5 (3 constraints: 2b248ae3)@@ -186,10 +186,9 @@ org.carrot2:morfologik-polish:2.1.5 (1 constraints: cf12501e)org.carrot2:morfologik-stemming:2.1.5 (2 constraints: d01f1300)org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 0605f735)org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: f00fed95)-org.checkerframework:checker-qual:3.10.0 (4 constraints: 082ba36f)+org.checkerframework:checker-qual:3.12.0 (4 constraints: 3c2b3e90)org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719)org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a)-org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 (2 constraints: 5625951d)org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 (1 constraints: 82072e7d)diff --git a/versions.props b/versions.propsindex b6f117eab96..a000e2ccc15 100644--- a/versions.props+++ b/versions.props@@ -26,7 +26,7 @@ com.google.cloud:google-cloud-nio=0.122.11com.google.cloud:google-cloud-storage=1.77.0com.google.code.gson:gson=2.7com.google.errorprone:*=2.10.0-com.google.guava:guava=25.1-jre+com.google.guava:guava=31.0.1-jrecom.google.http-client:google-http-client-appengine=1.32.1com.google.http-client:google-http-client-jackson2=1.32.1com.google.http-client:google-http-client=1.32.1