update dependency

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

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>

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 bugSqlite下默认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);
}
}