Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Revert "Revert "SOLR-15912 Update Guava to 31.0.1 (#520)""

Kevin Risden0ea8a03a38a0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 66489752d3b..4fd4563a50c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -553,6 +553,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 script
to 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.gradle
index 11ada699b1c..aa6b05e4734 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -153,7 +153,6 @@ dependencies {
// SQL Parser via Calcite
implementation ('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 sync
exclude 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/guava-27.0.1-jre.jar.sha1 b/solr/licenses/guava-27.0.1-jre.jar.sha1
deleted file mode 100644
index d3d307d4423..00000000000
--- a/solr/licenses/guava-27.0.1-jre.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd41a290787b5301e63929676d792c507bbc00ae
diff --git a/solr/licenses/guava-31.0.1-jre.jar.sha1 b/solr/licenses/guava-31.0.1-jre.jar.sha1
new file mode 100644
index 00000000000..e8bf52b09d7
--- /dev/null
+++ b/solr/licenses/guava-31.0.1-jre.jar.sha1
@@ -0,0 +1 @@
+119ea2b2bc205b138974d351777b20f02b92704b
diff --git a/versions.lock b/versions.lock
index e8ae3c1d736..213695ccf83 100644
--- a/versions.lock
+++ b/versions.lock
@@ -30,16 +30,16 @@ com.google.cloud:google-cloud-core:1.94.3 (3 constraints: da2307c0)
com.google.cloud:google-cloud-core-http:1.94.3 (2 constraints: 651543d8)
com.google.cloud:google-cloud-storage:1.113.14 (2 constraints: 10143aa3)
com.google.code.gson:gson:2.8.6 (5 constraints: 1545748b)
-com.google.errorprone:error_prone_annotations:2.10.0 (5 constraints: 1648ef8c)
+com.google.errorprone:error_prone_annotations:2.10.0 (5 constraints: 1c48098f)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:27.0.1-jre (2 constraints: 75163311)
+com.google.guava:guava:31.0.1-jre (4 constraints: bd34f656)
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)
@@ -185,7 +185,7 @@ 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.19.0 (5 constraints: 413b9562)
+org.checkerframework:checker-qual:3.19.0 (5 constraints: 6e3b0591)
org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719)
org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
diff --git a/versions.props b/versions.props
index e266a4c3487..d34654e3345 100644
--- a/versions.props
+++ b/versions.props
@@ -27,7 +27,7 @@ com.google.cloud:google-cloud-nio=0.122.11
com.google.cloud:google-cloud-storage=1.77.0
com.google.code.gson:gson=2.7
com.google.errorprone:*=2.10.0
-com.google.guava:guava=25.1-jre
+com.google.guava:guava=31.0.1-jre
com.google.http-client:google-http-client-appengine=1.32.1
com.google.http-client:google-http-client-jackson2=1.32.1
com.google.http-client:google-http-client=1.32.1