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 da9b82e68a6..a7b32a257a8 100644 --- a/external/storm-jdbc/pom.xml +++ b/external/storm-jdbc/pom.xml @@ -35,10 +35,6 @@ - - 5.1.0 - - org.apache.storm @@ -57,8 +53,6 @@ com.zaxxer HikariCP - ${hikari.version} - compile org.hsqldb diff --git a/pom.xml b/pom.xml index 468976b5fb0..4196a3cdf93 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,7 @@ 1.1.10.4 2.14.6 3.1.3 + 6.1.0 3.4.1 ${hadoop.version} 2.6.1-hadoop3 @@ -825,6 +826,11 @@ jul-to-slf4j ${slf4j.version} + + com.zaxxer + HikariCP + ${hikari.version} + io.netty netty-bom