This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
commit 2bf66072f336911a9af05ff18e1e78ec7103a41c Author: Richard Zowalla <[email protected]> AuthorDate: Wed Nov 13 20:52:11 2024 +0100 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 c2e4e60fb..4a6d8e0a4 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 86af4a46a..2294f08c2 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 399649035..a7b32a257 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 b810152df..bd60d862a 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,7 @@ <snappy.version>1.1.10.7</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>
