Merge pull request #201 from hazendaz/master

Migrate from dbcp to dbcp2 fixes #196

pom.xml

@@ -111,10 +111,16 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.11.0</version>
       <scope>provided</scope>
+      <exclusions>
+          <exclusion>
+              <groupId>commons-logging</groupId>
+              <artifactId>commons-logging</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>jakarta.transaction</groupId>

src/main/java/com/ibatis/common/jdbc/DbcpConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,13 @@
 import com.ibatis.common.beans.Probe;
 import com.ibatis.common.beans.ProbeFactory;
 
+import java.time.Duration;
 import java.util.Iterator;
 import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 /**
  * Wrapper class to simplify use of DBCP.
@@ -151,15 +152,15 @@ private BasicDataSource legacyDbcpConfiguration(Map map) {
       }
 
       if (notEmpty(maxActive)) {
-        basicDataSource.setMaxActive(Integer.parseInt(maxActive));
+        basicDataSource.setMaxTotal(Integer.parseInt(maxActive));
       }
 
       if (notEmpty(maxIdle)) {
         basicDataSource.setMaxIdle(Integer.parseInt(maxIdle));
       }
 
       if (notEmpty(maxWait)) {
-        basicDataSource.setMaxWait(Integer.parseInt(maxWait));
+        basicDataSource.setMaxWait(Duration.ofMillis(Integer.parseInt(maxWait)));
       }
 
       Iterator props = map.keySet().iterator();