From 7d72fac3938981edf0888cae040de0a9720faf36 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 4 Nov 2023 14:55:07 -0400
Subject: [PATCH 1/2] [migrate] Upgrade dbcp to dbcp2

---
 pom.xml                                                  | 6 +++---
 .../java/com/ibatis/common/jdbc/DbcpConfiguration.java   | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d586033..32c2972c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,9 +111,9 @@
       <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>
     </dependency>
     <dependency>
diff --git a/src/main/java/com/ibatis/common/jdbc/DbcpConfiguration.java b/src/main/java/com/ibatis/common/jdbc/DbcpConfiguration.java
index b505cf30..a184c59f 100644
--- a/src/main/java/com/ibatis/common/jdbc/DbcpConfiguration.java
+++ b/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,7 +152,7 @@ private BasicDataSource legacyDbcpConfiguration(Map map) {
       }
 
       if (notEmpty(maxActive)) {
-        basicDataSource.setMaxActive(Integer.parseInt(maxActive));
+        basicDataSource.setMaxTotal(Integer.parseInt(maxActive));
       }
 
       if (notEmpty(maxIdle)) {
@@ -159,7 +160,7 @@ private BasicDataSource legacyDbcpConfiguration(Map map) {
       }
 
       if (notEmpty(maxWait)) {
-        basicDataSource.setMaxWait(Integer.parseInt(maxWait));
+        basicDataSource.setMaxWait(Duration.ofMillis(Integer.parseInt(maxWait)));
       }
 
       Iterator props = map.keySet().iterator();

From 5a0f56295a6b8801aad9fd4c3db1982732a4953e Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 4 Nov 2023 15:01:02 -0400
Subject: [PATCH 2/2] [pom] Exclude commons-logging - we have jcl-over-slf4j if
 needed

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 32c2972c..0bc8b075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,12 @@
       <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>