lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update dependency

Browse Source
This commit is contained in:
Looly
2026-02-01 21:05:13 +08:00
parent 79311c0806
commit 2626514c4b
11 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-cron/pom.xml
View File

@@ -50,8 +50,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<!-- 2.5.0有bug，只能使用2.4.0，见：https://github.com/quartz-scheduler/quartz/issues/1298 -->
<version>2.4.0</version>
<version>2.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>

31
hutool-db/pom.xml
View File

@@ -36,13 +36,22 @@
<Automatic-Module-Name>cn.hutool.v7.db</Automatic-Module-Name>
<!-- versions -->
<c3p0.version>0.11.2</c3p0.version>
<dbcp2.version>2.13.0</dbcp2.version>
<tomcat-jdbc.version>11.0.12</tomcat-jdbc.version>
<dbcp2.version>2.14.0</dbcp2.version>
<tomcat-jdbc.version>11.0.18</tomcat-jdbc.version>
<druid.version>1.2.27</druid.version>
<hikariCP.version>7.0.2</hikariCP.version>
<sqlite.version>3.50.3.0</sqlite.version>
<beecp.version>5.2.0</beecp.version>
<!-- driver versions -->
<sqlite.version>3.51.1.0</sqlite.version>
<hsqldb.version>2.7.4</hsqldb.version>
<postgresql.version>42.7.8</postgresql.version>
<postgresql.version>42.7.9</postgresql.version>
<ngdbc.version>2.27.7</ngdbc.version>
<ojdbc8.version>23.26.0.0.0</ojdbc8.version>
<oceanbase.version>2.4.16</oceanbase.version>
<DmJdbcDriver18.version>8.1.3.140</DmJdbcDriver18.version>
<mysql.version>9.6.0</mysql.version>
<h2.version>2.4.240</h2.version>
</properties>
<dependencies>
@@ -90,7 +99,7 @@
<dependency>
<groupId>com.github.chris2018998</groupId>
<artifactId>beecp</artifactId>
<version>5.0.0</version>
<version>${beecp.version}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@@ -122,37 +131,37 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.4.0</version>
<version>${mysql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.4.240</version>
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.3.140</version>
<version>${DmJdbcDriver18.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>23.9.0.25.07</version>
<version>${ojdbc8.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oceanbase</groupId>
<artifactId>oceanbase-client</artifactId>
<version>2.4.15</version>
<version>${oceanbase.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sap.cloud.db.jdbc</groupId>
<artifactId>ngdbc</artifactId>
<version>2.26.6</version>
<version>${ngdbc.version}</version>
<scope>test</scope>
</dependency>
<dependency>

2
hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java
View File

@@ -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);

20
hutool-extra/pom.xml
View File

@@ -37,15 +37,15 @@
<!-- template versions -->
<velocity.version>2.4.1</velocity.version>
<beetl.version>3.19.2.RELEASE</beetl.version>
<beetl.version>3.20.1.RELEASE</beetl.version>
<rythm.version>1.4.2</rythm.version>
<freemarker.version>2.3.34</freemarker.version>
<enjoy.version>5.2.5</enjoy.version>
<thymeleaf.version>3.1.3.RELEASE</thymeleaf.version>
<jte.version>3.2.1</jte.version>
<jte.version>3.2.2</jte.version>
<!-- 保持2.1.10，关联的antlr4与Beetl有兼容问题 -->
<jetbrick-template.version>2.1.10</jetbrick-template.version>
<pebble.version>3.2.4</pebble.version>
<pebble.version>4.1.0</pebble.version>
<wit-core.version>2.6.0</wit-core.version>
<!-- mail versions -->
@@ -53,23 +53,23 @@
<jakarta.mail.version>2.0.5</jakarta.mail.version>
<!-- ssh versions -->
<jsch.version>2.27.3</jsch.version>
<jsch.version>2.27.7</jsch.version>
<sshj.version>0.40.0</sshj.version>
<sshd.version>2.16.0</sshd.version>
<sshd.version>2.17.1</sshd.version>
<ganymed-ssh2.version>262</ganymed-ssh2.version>
<net.version>3.11.1</net.version>
<net.version>3.12.0</net.version>
<emoji-java.version>5.1.1</emoji-java.version>
<spring-boot.version>4.0.1</spring-boot.version>
<oshi.version>6.9.0</oshi.version>
<byte-buddy.version>1.17.8</byte-buddy.version>
<spring-boot.version>4.0.2</spring-boot.version>
<oshi.version>6.9.3</oshi.version>
<byte-buddy.version>1.18.4</byte-buddy.version>
<commons-compress.version>1.28.0</commons-compress.version>
<smartcn.version>8.11.4</smartcn.version>
<jaxb-runtime.version>4.0.6</jaxb-runtime.version>
<!-- mq client versions -->
<kafka.version>4.1.1</kafka.version>
<rabbitmq.version>5.26.0</rabbitmq.version>
<rabbitmq.version>5.28.0</rabbitmq.version>
<rocketmq.version>5.4.0</rocketmq.version>
<activemq.version>6.2.0</activemq.version>
<mica.version>2.5.11</mica.version>

10
hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java
View File

@@ -27,7 +27,7 @@ import io.pebbletemplates.pebble.PebbleEngine;
import io.pebbletemplates.pebble.loader.*;
/**
* Pebble(https://pebbletemplates.io/) 模板引擎
* Pebble(<a href="https://pebbletemplates.io/">pebbletemplates</a>) 模板引擎
*
* @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:

12
hutool-http/pom.xml
View File

@@ -34,17 +34,17 @@
<properties>
<Automatic-Module-Name>cn.hutool.v7.http</Automatic-Module-Name>
<httpclient5.version>5.5.1</httpclient5.version>
<httpclient5.version>5.6</httpclient5.version>
<httpclient4.version>4.5.14</httpclient4.version>
<okhttp.version>5.2.1</okhttp.version>
<undertow.version>2.3.18.Final</undertow.version>
<jetty.version>12.1.2</jetty.version>
<tomcat.version>11.0.12</tomcat.version>
<okhttp.version>5.3.2</okhttp.version>
<undertow.version>2.3.22.Final</undertow.version>
<jetty.version>12.1.6</jetty.version>
<tomcat.version>11.0.18</tomcat.version>
<smartboot.version>1.4.3</smartboot.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<jakarta.xml.soap-api.version>3.0.2</jakarta.xml.soap-api.version>
<saaj-impl.version>3.0.4</saaj-impl.version>
<slf4j.version>2.0.9</slf4j.version>
<slf4j.version>2.0.17</slf4j.version>
</properties>
<dependencies>

2
hutool-jmh/pom.xml
View File

@@ -38,7 +38,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<jmh.version>1.37</jmh.version>
<jackson.version>2.20.1</jackson.version>
<jackson.version>2.21.0</jackson.version>
<fastjson2.version>2.0.60</fastjson2.version>
<gson.version>2.13.2</gson.version>
<moshi.version>1.15.2</moshi.version>

2
hutool-json/pom.xml
View File

@@ -36,7 +36,7 @@
<Automatic-Module-Name>cn.hutool.v7.json</Automatic-Module-Name>
<!-- versions -->
<jjwt.version>0.13.0</jjwt.version>
<jackson.version>2.20.1</jackson.version>
<jackson.version>2.21.0</jackson.version>
<fastjson2.version>2.0.60</fastjson2.version>
<gson.version>2.13.2</gson.version>
<moshi.version>1.15.2</moshi.version>

4
hutool-poi/pom.xml
View File

@@ -35,7 +35,7 @@
<properties>
<Automatic-Module-Name>cn.hutool.v7.poi</Automatic-Module-Name>
<!-- versions -->
<poi.version>5.4.1</poi.version>
<poi.version>5.5.1</poi.version>
</properties>
<dependencies>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.ofdrw</groupId>
<artifactId>ofdrw-full</artifactId>
<version>2.3.7</version>
<version>2.3.8</version>
<scope>compile</scope>
<exclusions>
<exclusion>

4
hutool-swing/pom.xml
View File

@@ -36,7 +36,7 @@
<Automatic-Module-Name>cn.hutool.v7.swing</Automatic-Module-Name>
<animated-gif-lib.version>1.4</animated-gif-lib.version>
<metadata-extractor.version>2.19.0</metadata-extractor.version>
<zxing.version>3.5.3</zxing.version>
<zxing.version>3.5.4</zxing.version>
</properties>
<dependencies>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.formdev</groupId>
<artifactId>flatlaf</artifactId>
<version>3.5.4</version>
<version>3.7</version>
<scope>test</scope>
</dependency>
</dependencies>

2
pom.xml
View File

@@ -61,7 +61,7 @@
<!-- versions -->
<compile.version>17</compile.version>
<junit.version>6.0.1</junit.version>
<junit.version>6.0.2</junit.version>
<lombok.version>1.18.42</lombok.version>
<kotlin-version>2.3.0</kotlin-version>
<bouncycastle.version>1.83</bouncycastle.version>