From 4564cbda33a7c536cdb88d4b948da4b1ee30d7e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 19:28:24 +0000
Subject: [PATCH 1/2] Bump com.zaxxer:HikariCP from 5.1.0 to 6.1.0

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 5.1.0 to 6.1.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-5.1.0...HikariCP-6.1.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 external/storm-jdbc/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index da9b82e68a6..399649035f8 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -36,7 +36,7 @@
     </developers>
 
     <properties>
-        <hikari.version>5.1.0</hikari.version>
+        <hikari.version>6.1.0</hikari.version>
     </properties>
 
     <dependencies>

From 40787359ff4b342ef0fd4a4fd389792f17132406 Mon Sep 17 00:00:00 2001
From: Richard Zowalla <rzo1@apache.org>
Date: Wed, 13 Nov 2024 20:52:11 +0100
Subject: [PATCH 2/2] HikariCP 6.1.0

---
 DEPENDENCY-LICENSES         | 3 +--
 LICENSE-binary              | 2 +-
 external/storm-jdbc/pom.xml | 6 ------
 pom.xml                     | 6 ++++++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index c9b968cc46f..5c5851b1f69 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -175,8 +175,7 @@ List of third-party dependencies grouped by their license type.
         * Hadoop Metrics2 Reporter for Dropwizard Metrics (com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - https://github.com/joshelser/dropwizard-hadoop-metrics2)
         * hawtbuf (org.fusesource.hawtbuf:hawtbuf:1.11 - http://hawtbuf.fusesource.org/hawtbuf)
         * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:7.0.5.Final - http://hibernate.org/validator/hibernate-validator)
-        * HikariCP (com.zaxxer:HikariCP:2.6.1 - https://github.com/brettwooldridge/HikariCP)
-        * HikariCP (com.zaxxer:HikariCP:5.1.0 - https://github.com/brettwooldridge/HikariCP)
+        * HikariCP (com.zaxxer:HikariCP:6.1.0 - https://github.com/brettwooldridge/HikariCP)
         * Hive Classifications (org.apache.hive:hive-classification:3.1.3 - https://hive.apache.org/hive-classification)
         * Hive Common (org.apache.hive:hive-common:3.1.3 - https://hive.apache.org/hive-common)
         * Hive HCatalog Core (org.apache.hive.hcatalog:hive-hcatalog-core:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-core)
diff --git a/LICENSE-binary b/LICENSE-binary
index e7c2d04f30a..12805d0afee 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -806,7 +806,7 @@ The license texts of these dependencies can be found in the licenses directory.
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
         * Hadoop Metrics2 Reporter for Dropwizard Metrics (com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - https://github.com/joshelser/dropwizard-hadoop-metrics2)
         * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:7.0.5.Final - http://hibernate.org/validator/hibernate-validator)
-        * HikariCP (com.zaxxer:HikariCP:2.6.1 - https://github.com/brettwooldridge/HikariCP)
+        * HikariCP (com.zaxxer:HikariCP:6.1.0 - https://github.com/brettwooldridge/HikariCP)
         * Hive Classifications (org.apache.hive:hive-classification:3.1.3 - https://hive.apache.org/hive-classification)
         * Hive Common (org.apache.hive:hive-common:3.1.3 - https://hive.apache.org/hive-common)
         * Hive HCatalog Core (org.apache.hive.hcatalog:hive-hcatalog-core:3.1.3 - https://hive.apache.org/hive-hcatalog/hive-hcatalog-core)
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index 399649035f8..a7b32a257a8 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -35,10 +35,6 @@
         </developer>
     </developers>
 
-    <properties>
-        <hikari.version>6.1.0</hikari.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -57,8 +53,6 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>${hikari.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
diff --git a/pom.xml b/pom.xml
index 468976b5fb0..4196a3cdf93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,7 @@
         <snappy.version>1.1.10.4</snappy.version>
         <jline.version>2.14.6</jline.version>
         <hive.version>3.1.3</hive.version>
+        <hikari.version>6.1.0</hikari.version>
         <hadoop.version>3.4.1</hadoop.version>
         <hdfs.version>${hadoop.version}</hdfs.version>
         <hbase.version>2.6.1-hadoop3</hbase.version>
@@ -825,6 +826,11 @@
                 <artifactId>jul-to-slf4j</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP</artifactId>
+                <version>${hikari.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>