From f36729d461f81b378ca458cafa3ae782fc4d6562 Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Fri, 29 Mar 2024 11:00:03 +0100
Subject: [PATCH] ACS-7033 Bump Guava to 33.1.0-jre (#1983)

---
 pom.xml                                               |  2 +-
 search-services/packaging/pom.xml                     |  2 +-
 .../packaging/src/main/resources/licenses/notice.txt  | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4cd847868..1e4c95ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 
       <dependency.jackson.version>2.15.2</dependency.jackson.version>
 
-      <dependency.google.guava.version>32.1.1-jre</dependency.google.guava.version>
+      <dependency.google.guava.version>33.1.0-jre</dependency.google.guava.version>
       <dependency.apache-commons-compress.version>1.23.0</dependency.apache-commons-compress.version>
       <dependency.apache-commons-lang3.version>3.12.0</dependency.apache-commons-lang3.version>
       <dependency.apache-commons-lang.version>2.6</dependency.apache-commons-lang.version>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 56a985a53..48afdd989 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -182,7 +182,7 @@
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.3.0.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.3.0.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.4.1.jar" />
-                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/guava-14.0.1.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/guava-31.1-jre.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-3.6.1.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/libs/jquery-2.1.3.min.js" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/js/lib/jquery-1.7.2.min.js" />
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 701b76fdc..6fb620556 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -27,11 +27,11 @@ xpp3-1.1.4c.jar http://www.extreme.indiana.edu/dist/java-repository/xpp3/license
 json-20231013.jar https://github.com/stleary/JSON-java
 
 === Apache 2.0 ===
-error_prone_annotations-2.18.0.jar https://github.com/google/error-prone
+error_prone_annotations-2.26.1.jar https://github.com/google/error-prone
 jsr305-3.0.2.jar https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/1.3.9
 geronimo-jta_1.1_spec-1.1.1.jar https://mvnrepository.com/artifact/org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
 proj4j-1.1.5.jar https://github.com/locationtech/proj4j
-j2objc-annotations-2.8.jar https://github.com/google/j2objc
+j2objc-annotations-3.0.0.jar https://github.com/google/j2objc
 json-path-2.8.0.jar https://github.com/json-path/JsonPath
 json-simple-1.1.1.jar https://github.com/fangyidong/json-simple
 apiguardian-api-1.1.2.jar https://github.com/apiguardian-team/apiguardian
@@ -56,7 +56,7 @@ cxf-rt-ws-policy-3.4.8.jar https://cxf.apache.org/
 cxf-rt-wsdl-3.4.8.jar https://cxf.apache.org/
 chemistry-opencmis-server-support-1.0.0.jar     http://chemistry.apache.org/
 chemistry-opencmis-server-bindings-1.0.0.jar    http://chemistry.apache.org/
-failureaccess-1.0.1.jar https://mvnrepository.com/artifact/com.google.guava/failureaccess/1.0.1
+failureaccess-1.0.2.jar https://mvnrepository.com/artifact/com.google.guava/failureaccess/1.0.2
 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar https://mvnrepository.com/artifact/com.google.guava/listenablefuture
 quartz-2.3.2.jar http://quartz-scheduler.org/
 jackson-core-2.15.2.jar https://github.com/FasterXML/jackson
@@ -129,7 +129,7 @@ jibx-run-1.3.3.jar http://jibx.sourceforge.net/
 dom4j-2.1.3.jar https://github.com/dom4j/dom4j/blob/master/LICENSE
 
 === MIT ===
-checker-qual-3.33.0.jar https://checkerframework.org/
+checker-qual-3.42.0.jar https://checkerframework.org/
 
 === Part of Apache Solr (Licenses listed separately) ===
 antlr4-runtime-4.5.1-1.jar
@@ -165,8 +165,7 @@ janino-3.1.10.jar
 curvesapi-1.04.jar
 eigenbase-properties-1.1.5.jar
 gmetric4j-1.0.7.jar
-guava-32.1.1-jre.jar
-guava-31.1-jre.jar
+guava-33.1.0-jre.jar
 hppc-0.7.1.jar
 htrace-core-3.2.0-incubating.jar
 httpclient-4.5.14.jar