You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by za...@apache.org on 2022/12/09 12:03:54 UTC

[hive] 02/02: HIVE-26813: Upgrade HikariCP from 2.6.1 to 4.0.3 (Chris Nauroth reviewed by yigress, Wechar Yu, Stamatis Zampetakis)

This is an automated email from the ASF dual-hosted git repository.

zabetak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git

commit 4ef12d3b9e9ab0b0c00355759e340504a05fa941
Author: Chris Nauroth <cn...@apache.org>
AuthorDate: Tue Dec 6 22:54:34 2022 +0000

    HIVE-26813: Upgrade HikariCP from 2.6.1 to 4.0.3 (Chris Nauroth reviewed by yigress, Wechar Yu, Stamatis Zampetakis)
    
    Closes #3839
---
 beeline/pom.xml              | 6 ++++++
 jdbc/pom.xml                 | 6 ++++++
 pom.xml                      | 2 +-
 ql/pom.xml                   | 6 ++++++
 standalone-metastore/pom.xml | 2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/beeline/pom.xml b/beeline/pom.xml
index bba1ef69ec2..d14affb5382 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -267,6 +267,12 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>com.zaxxer:HikariCP</artifact>
+                  <excludes>
+                    <exclude>META-INF/versions/11/module-info.class</exclude>
+                  </excludes>
+                </filter>
               </filters>
             </configuration>
           </execution>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index c2534b658fa..47c285d024e 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -212,6 +212,12 @@
                         <exclude>static/</exclude>
                       </excludes>
                     </filter>
+                    <filter>
+                      <artifact>com.zaxxer:HikariCP</artifact>
+                      <excludes>
+                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                      </excludes>
+                    </filter>
                   </filters>
                   <artifactSet>
                     <excludes>
diff --git a/pom.xml b/pom.xml
index e5b4004e90c..5772c9e1b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
     <hppc.version>0.7.2</hppc.version>
     <!-- required for logging test to avoid including hbase which pulls disruptor transitively -->
     <disruptor.version>3.3.7</disruptor.version>
-    <hikaricp.version>2.6.1</hikaricp.version>
+    <hikaricp.version>4.0.3</hikaricp.version>
     <!-- httpcomponents are not always in version sync -->
     <httpcomponents.client.version>4.5.13</httpcomponents.client.version>
     <httpcomponents.core.version>4.4.13</httpcomponents.core.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index d5f3569a5d7..7b4c1d2751d 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -1113,6 +1113,12 @@
                     <exclude>META-INF/licenses/slf4j*/**</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>com.zaxxer:HikariCP</artifact>
+                  <excludes>
+                    <exclude>META-INF/versions/11/module-info.class</exclude>
+                  </excludes>
+                </filter>
               </filters>
               <relocations>
                 <relocation>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 073ae644462..80afc7218d4 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -76,7 +76,7 @@
     <dropwizard.version>3.1.0</dropwizard.version>
     <guava.version>19.0</guava.version>
     <hadoop.version>3.3.1</hadoop.version>
-    <hikaricp.version>2.6.1</hikaricp.version>
+    <hikaricp.version>4.0.3</hikaricp.version>
     <jackson.version>2.12.7</jackson.version>
     <javolution.version>5.5.1</javolution.version>
     <junit.version>4.13.2</junit.version>