From 2626514c4b19b9d0a345523171ff7c058d8d77a9 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 1 Feb 2026 21:05:13 +0800 Subject: [PATCH] update dependency --- hutool-cron/pom.xml | 3 +- hutool-db/pom.xml | 31 ++++++++++++------- .../cn/hutool/v7/db/ds/bee/BeeDSFactory.java | 2 +- hutool-extra/pom.xml | 20 ++++++------ .../engine/pebble/PebbleTemplateEngine.java | 10 +++--- hutool-http/pom.xml | 12 +++---- hutool-jmh/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-poi/pom.xml | 4 +-- hutool-swing/pom.xml | 4 +-- pom.xml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 25ba831d25..db680c7289 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -50,8 +50,7 @@ org.quartz-scheduler quartz - - 2.4.0 + 2.5.2 test diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index a80d680d66..e0f219ea78 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -36,13 +36,22 @@ cn.hutool.v7.db 0.11.2 - 2.13.0 - 11.0.12 + 2.14.0 + 11.0.18 1.2.27 7.0.2 - 3.50.3.0 + 5.2.0 + + + 3.51.1.0 2.7.4 - 42.7.8 + 42.7.9 + 2.27.7 + 23.26.0.0.0 + 2.4.16 + 8.1.3.140 + 9.6.0 + 2.4.240 @@ -90,7 +99,7 @@ com.github.chris2018998 beecp - 5.0.0 + ${beecp.version} slf4j-api @@ -122,37 +131,37 @@ com.mysql mysql-connector-j - 9.4.0 + ${mysql.version} test com.h2database h2 - 2.4.240 + ${h2.version} test com.dameng DmJdbcDriver18 - 8.1.3.140 + ${DmJdbcDriver18.version} test com.oracle.database.jdbc ojdbc8 - 23.9.0.25.07 + ${ojdbc8.version} test com.oceanbase oceanbase-client - 2.4.15 + ${oceanbase.version} test com.sap.cloud.db.jdbc ngdbc - 2.26.6 + ${ngdbc.version} test diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java index 9855415688..a8888a0c6f 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java @@ -54,7 +54,7 @@ public class BeeDSFactory extends AbstractDSFactory { // 连接配置 final Properties connProps = config.getConnProps(); if(MapUtil.isNotEmpty(connProps)){ - connProps.forEach((key, value)->beeConfig.addConnectProperty(key.toString(), value)); + connProps.forEach((key, value)->beeConfig.addConnectionFactoryProperty(key.toString(), value)); } return new BeeDataSource(beeConfig); diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index f8afa6e7a2..196fe5a22f 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -37,15 +37,15 @@ 2.4.1 - 3.19.2.RELEASE + 3.20.1.RELEASE 1.4.2 2.3.34 5.2.5 3.1.3.RELEASE - 3.2.1 + 3.2.2 2.1.10 - 3.2.4 + 4.1.0 2.6.0 @@ -53,23 +53,23 @@ 2.0.5 - 2.27.3 + 2.27.7 0.40.0 - 2.16.0 + 2.17.1 262 - 3.11.1 + 3.12.0 5.1.1 - 4.0.1 - 6.9.0 - 1.17.8 + 4.0.2 + 6.9.3 + 1.18.4 1.28.0 8.11.4 4.0.6 4.1.1 - 5.26.0 + 5.28.0 5.4.0 6.2.0 2.5.11 diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java index 4484d70fc9..83b92d455d 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java @@ -27,7 +27,7 @@ import io.pebbletemplates.pebble.PebbleEngine; import io.pebbletemplates.pebble.loader.*; /** - * Pebble(https://pebbletemplates.io/) 模板引擎 + * Pebble(pebbletemplates) 模板引擎 * * @author zooooooooy * @since 7.0.0 @@ -86,12 +86,10 @@ public class PebbleTemplateEngine implements TemplateEngine { loader.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), StrUtil.SLASH)); break; case FILE: - loader = new FileLoader(); - loader.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), StrUtil.SLASH)); + loader = new FileLoader(StrUtil.addSuffixIfNot(config.getPath(), StrUtil.SLASH)); break; case WEB_ROOT: - loader = new FileLoader(); - loader.setPrefix(StrUtil.addSuffixIfNot( + loader = new FileLoader(StrUtil.addSuffixIfNot( FileUtil.getAbsolutePath(FileUtil.file(FileUtil.getWebRoot(), config.getPath())), StrUtil.SLASH)); break; case STRING: @@ -100,7 +98,7 @@ public class PebbleTemplateEngine implements TemplateEngine { case COMPOSITE: loader = new DelegatingLoader(ListUtil.of( new ClasspathLoader(), - new FileLoader(), + new FileLoader(StrUtil.addSuffixIfNot(config.getPath(), StrUtil.SLASH)), new StringLoader() )); default: diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 5de3ee5331..a8bfc3d1a8 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -34,17 +34,17 @@ cn.hutool.v7.http - 5.5.1 + 5.6 4.5.14 - 5.2.1 - 2.3.18.Final - 12.1.2 - 11.0.12 + 5.3.2 + 2.3.22.Final + 12.1.6 + 11.0.18 1.4.3 6.1.0 3.0.2 3.0.4 - 2.0.9 + 2.0.17 diff --git a/hutool-jmh/pom.xml b/hutool-jmh/pom.xml index 8a21cdd269..89f785b9f7 100644 --- a/hutool-jmh/pom.xml +++ b/hutool-jmh/pom.xml @@ -38,7 +38,7 @@ true 1.37 - 2.20.1 + 2.21.0 2.0.60 2.13.2 1.15.2 diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 3348adf7f5..33917b9bda 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -36,7 +36,7 @@ cn.hutool.v7.json 0.13.0 - 2.20.1 + 2.21.0 2.0.60 2.13.2 1.15.2 diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index f4877034c3..22cb18e522 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -35,7 +35,7 @@ cn.hutool.v7.poi - 5.4.1 + 5.5.1 @@ -57,7 +57,7 @@ org.ofdrw ofdrw-full - 2.3.7 + 2.3.8 compile diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml index a53c527fdc..ffedbab1f8 100755 --- a/hutool-swing/pom.xml +++ b/hutool-swing/pom.xml @@ -36,7 +36,7 @@ cn.hutool.v7.swing 1.4 2.19.0 - 3.5.3 + 3.5.4 @@ -70,7 +70,7 @@ com.formdev flatlaf - 3.5.4 + 3.7 test diff --git a/pom.xml b/pom.xml index fd07fac2fa..47ed44b158 100755 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 17 - 6.0.1 + 6.0.2 1.18.42 2.3.0 1.83