ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update dependency

Browse Source
This commit is contained in:
Looly 2021-08-07 19:11:55 +08:00
parent f6b93ef2d5
commit 5154799ee8
8 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,10 +3,11 @@
-------------------------------------------------------------------------------------------------------------
# 5.7.8 (2021-08-06)
# 5.7.8 (2021-08-07)
### 🐣新特性
* 【core 】 MapProxy支持return this的setter方法（pr#392@Gitee）
* 【core 】 BeeDSFactory移除sqlite事务修复代码，新版本BeeCP已修复
### 🐞Bug修复

2
hutool-aop/pom.xml
View File

@ -19,7 +19,7 @@
<properties>
<!-- versions -->
<cglib.version>3.3.0</cglib.version>
<spring.version>5.3.8</spring.version>
<spring.version>5.3.9</spring.version>
</properties>
<dependencies>

16
hutool-db/pom.xml
View File

@ -19,14 +19,14 @@
<properties>
<!-- versions -->
<c3p0.version>0.9.5.5</c3p0.version>
<dbcp2.version>2.8.0</dbcp2.version>
<dbcp2.version>2.9.0</dbcp2.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
<druid.version>1.2.6</druid.version>
<hikariCP.version>2.4.13</hikariCP.version>
<mongo.version>3.12.8</mongo.version>
<sqlite.version>3.34.0</sqlite.version>
<hsqldb.version>2.5.2</hsqldb.version>
<jedis.version>3.6.1</jedis.version>
<mongo.version>3.12.10</mongo.version>
<sqlite.version>3.36.0.1</sqlite.version>
<hsqldb.version>2.6.0</hsqldb.version>
<jedis.version>3.6.3</jedis.version>
</properties>
<dependencies>
@ -80,7 +80,7 @@
<dependency>
<groupId>com.github.chris2018998</groupId>
<artifactId>beecp</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@ -142,13 +142,13 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.25</version>
<version>8.0.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.20.jre7</version>
<version>42.2.23.jre7</version>
<scope>test</scope>
</dependency>
<dependency>

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

@ -2,13 +2,11 @@ package cn.hutool.db.ds.bee;
import cn.beecp.BeeDataSource;
import cn.beecp.BeeDataSourceConfig;
import cn.beecp.TransactionIsolationLevel;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
import javax.sql.DataSource;
import java.sql.Connection;
/**
* BeeCP数据源工厂类
@ -44,17 +42,6 @@ public class BeeDSFactory extends AbstractDSFactory {
}
}
// since BeepCP 3.2.1 bug，Sqlite下默认Transaction Isolation不支持，在此判断修正
if(StrUtil.containsIgnoreCase(jdbcUrl, "sqlite")){
final int isolationCode = beeConfig.getDefaultTransactionIsolationCode();
if(Connection.TRANSACTION_READ_UNCOMMITTED != isolationCode
&& Connection.TRANSACTION_SERIALIZABLE != isolationCode){
// SQLite只支持这两种事务
beeConfig.setDefaultTransactionIsolation(TransactionIsolationLevel.LEVEL_READ_UNCOMMITTED);
beeConfig.setDefaultTransactionIsolationCode(Connection.TRANSACTION_READ_UNCOMMITTED);
}
}
return new BeeDataSource(beeConfig);
}
}

14
hutool-extra/pom.xml
View File

@ -19,10 +19,10 @@
<properties>
<!-- versions -->
<velocity.version>2.3</velocity.version>
<beetl.version>3.3.2.RELEASE</beetl.version>
<beetl.version>3.5.0.RELEASE</beetl.version>
<rythm.version>1.4.1</rythm.version>
<freemarker.version>2.3.31</freemarker.version>
<enjoy.version>4.9.10</enjoy.version>
<enjoy.version>4.9.15</enjoy.version>
<thymeleaf.version>3.0.12.RELEASE</thymeleaf.version>
<mail.version>1.6.2</mail.version>
<jsch.version>0.1.55</jsch.version>
@ -30,7 +30,7 @@
<net.version>3.7.2</net.version>
<emoji-java.version>5.1.1</emoji-java.version>
<servlet-api.version>4.0.1</servlet-api.version>
<spring-boot.version>2.5.1</spring-boot.version>
<spring-boot.version>2.5.3</spring-boot.version>
<cglib.version>3.3.0</cglib.version>
</properties>
@ -397,7 +397,7 @@
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>5.2.5</version>
<version>5.2.7</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
<version>3.2</version>
<version>3.2.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -432,7 +432,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>5.3.8</version>
<version>5.3.9</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -447,7 +447,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.20</version>
<version>1.21</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>

2
hutool-jwt/pom.xml
View File

@ -18,7 +18,7 @@
<properties>
<!-- versions -->
<bouncycastle.version>1.68</bouncycastle.version>
<bouncycastle.version>1.69</bouncycastle.version>
</properties>
<dependencies>

2
hutool-poi/pom.xml
View File

@ -45,7 +45,7 @@
<dependency>
<groupId>org.ofdrw</groupId>
<artifactId>ofdrw-full</artifactId>
<version>1.12.1</version>
<version>1.13.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>

2
hutool-system/pom.xml
View File

@ -26,7 +26,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>5.7.5</version>
<version>5.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>