From 9cedc9c2c70783aa44f0ed4b0f475ca45192bc86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:19:40 +0000
Subject: [PATCH 1/2] Bump com.google.guava:guava from 33.3.1-jre to 33.4.0-jre

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.1-jre to 33.4.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml                                         | 2 +-
 sql/storm-sql-external/storm-sql-hdfs/pom.xml   | 2 +-
 sql/storm-sql-external/storm-sql-kafka/pom.xml  | 2 +-
 sql/storm-sql-runtime/pom.xml                   | 2 +-
 storm-dist/binary/storm-sql-core-bin/pom.xml    | 2 +-
 storm-dist/binary/storm-sql-runtime-bin/pom.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a7a47aa922..ab7ce78be9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
         <httpclient.core.version>4.4.16</httpclient.core.version>
         <jctools.version>4.0.5</jctools.version>
         <jgrapht.version>0.9.0</jgrapht.version>
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
         <auto-service.version>1.1.1</auto-service.version>
         <netty-tcnative.version>2.0.69.Final</netty-tcnative.version>
         <netty.version>4.1.115.Final</netty.version>
diff --git a/sql/storm-sql-external/storm-sql-hdfs/pom.xml b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
index 7e195f712dc..d8123d822c4 100644
--- a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
+++ b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
@@ -39,7 +39,7 @@
         -->
         <storm-sql-hdfs.test.introspection.argLine>--add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED</storm-sql-hdfs.test.introspection.argLine>
         <!-- Required downgrade by calcite-core 1.16.0 https://mvnrepository.com/artifact/org.apache.calcite/calcite-core/1.16.0 -->
-        <guava.version.downgrade>33.3.1-jre</guava.version.downgrade>
+        <guava.version.downgrade>33.4.0-jre</guava.version.downgrade>
     </properties>
 
     <developers>
diff --git a/sql/storm-sql-external/storm-sql-kafka/pom.xml b/sql/storm-sql-external/storm-sql-kafka/pom.xml
index 7bbbfb777bd..5fccf481d41 100644
--- a/sql/storm-sql-external/storm-sql-kafka/pom.xml
+++ b/sql/storm-sql-external/storm-sql-kafka/pom.xml
@@ -29,7 +29,7 @@
     
     <properties>
         <!-- Required downgrade by calcite-core 1.15.0 -->
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
     </properties>
 
     <developers>
diff --git a/sql/storm-sql-runtime/pom.xml b/sql/storm-sql-runtime/pom.xml
index 50775031ff9..d80fd1671d7 100644
--- a/sql/storm-sql-runtime/pom.xml
+++ b/sql/storm-sql-runtime/pom.xml
@@ -29,7 +29,7 @@
     
     <properties>
         <!-- Required downgrade by calcite-core 1.15.0 -->
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
     </properties>
 
     <developers>
diff --git a/storm-dist/binary/storm-sql-core-bin/pom.xml b/storm-dist/binary/storm-sql-core-bin/pom.xml
index 9c45933efda..eb591851362 100644
--- a/storm-dist/binary/storm-sql-core-bin/pom.xml
+++ b/storm-dist/binary/storm-sql-core-bin/pom.xml
@@ -27,7 +27,7 @@
     
     <properties>
         <!-- Required downgrade by calcite-core 1.14.0 -->
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
     </properties>
     
     <dependencies>
diff --git a/storm-dist/binary/storm-sql-runtime-bin/pom.xml b/storm-dist/binary/storm-sql-runtime-bin/pom.xml
index b0f75430202..03d81b1bd5a 100644
--- a/storm-dist/binary/storm-sql-runtime-bin/pom.xml
+++ b/storm-dist/binary/storm-sql-runtime-bin/pom.xml
@@ -27,7 +27,7 @@
     
     <properties>
         <!-- Required downgrade by calcite-core 1.14.0 -->
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
     </properties>
     
     <dependencies>

From 5ce1f22ac353c16ceb7f686537c9895452c493de Mon Sep 17 00:00:00 2001
From: Richard Zowalla <rzo1@apache.org>
Date: Thu, 9 Jan 2025 14:51:03 +0100
Subject: [PATCH 2/2] license

---
 DEPENDENCY-LICENSES | 2 +-
 LICENSE-binary      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index adbf1055509..2956e502735 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -120,7 +120,7 @@ List of third-party dependencies grouped by their license type.
         * Google Guice - Core Library (com.google.inject:guice:4.2.1 - https://github.com/google/guice/guice)
         * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.29 - https://metrics.dropwizard.io/metrics-graphite)
         * Gson (com.google.code.gson:gson:2.11.0 - https://github.com/google/gson)
-        * Guava: Google Core Libraries for Java (com.google.guava:guava:33.3.1-jre - https://github.com/google/guava)
+        * Guava: Google Core Libraries for Java (com.google.guava:guava:33.4.0-jre - https://github.com/google/guava)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.2 - https://github.com/google/guava/failureaccess)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
         * hawtbuf (org.fusesource.hawtbuf:hawtbuf:1.11 - http://hawtbuf.fusesource.org/hawtbuf)
diff --git a/LICENSE-binary b/LICENSE-binary
index 9666cc9f4e5..aa0fc9b5070 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -749,7 +749,7 @@ The license texts of these dependencies can be found in the licenses directory.
         * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
         * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.29 - https://metrics.dropwizard.io/metrics-graphite)
         * Gson (com.google.code.gson:gson:2.11.0 - https://github.com/google/gson/gson)
-        * Guava: Google Core Libraries for Java (com.google.guava:guava:33.3.1-jre - https://github.com/google/guava)
+        * Guava: Google Core Libraries for Java (com.google.guava:guava:33.4.0-jre - https://github.com/google/guava)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.2 - https://github.com/google/guava/failureaccess)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
         * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:7.0.5.Final - http://hibernate.org/validator/hibernate-validator)
