You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2026/01/19 21:10:44 UTC
(jackrabbit) 01/01: JCR-5220: upgrade to commons-dbcp2 - wip
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCR-5220
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
commit 501c2f1520ac8ea49b06545387c25727997e88d6
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Jan 19 22:10:28 2026 +0100
JCR-5220: upgrade to commons-dbcp2 - wip
---
jackrabbit-core/pom.xml | 6 +++---
.../jackrabbit/core/util/db/ConnectionFactoryTest.java | 4 ++--
jackrabbit-data/pom.xml | 6 +++---
.../apache/jackrabbit/core/util/db/ConnectionFactory.java | 12 ++++++------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
index 38e669989..0d514a9ef 100644
--- a/jackrabbit-core/pom.xml
+++ b/jackrabbit-core/pom.xml
@@ -233,9 +233,9 @@ org.apache.jackrabbit.core.version.RemoveAndAddVersionLabelXATest#testVersionLab
<artifactId>commons-io</artifactId>
</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.14.0</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/db/ConnectionFactoryTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/db/ConnectionFactoryTest.java
index 46fbf6bcf..e65c41f72 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/db/ConnectionFactoryTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/db/ConnectionFactoryTest.java
@@ -24,7 +24,7 @@ import javax.sql.DataSource;
import junit.framework.TestCase;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.jackrabbit.core.config.ConfigurationException;
import org.apache.jackrabbit.core.config.DataSourceConfig;
@@ -146,7 +146,7 @@ public class ConnectionFactoryTest extends TestCase {
}
private void assertPoolDefaults(BasicDataSource ds, String validationQuery, int maxCons) {
- assertEquals(maxCons, ds.getMaxActive());
+ assertEquals(maxCons, ds.getMaxTotal());
assertEquals(validationQuery, ds.getValidationQuery());
assertTrue(ds.getDefaultAutoCommit());
assertFalse(ds.getTestOnBorrow());
diff --git a/jackrabbit-data/pom.xml b/jackrabbit-data/pom.xml
index b669e82d2..ba9e5bd7d 100644
--- a/jackrabbit-data/pom.xml
+++ b/jackrabbit-data/pom.xml
@@ -86,9 +86,9 @@
<artifactId>commons-io</artifactId>
</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.14.0</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
index 65f63eb56..3f061fab6 100644
--- a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
+++ b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
@@ -30,9 +30,9 @@ import javax.naming.Context;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.DelegatingConnection;
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.apache.jackrabbit.core.config.DataSourceConfig;
import org.apache.jackrabbit.core.config.DataSourceConfig.DataSourceDefinition;
import org.apache.jackrabbit.util.Base64;
@@ -102,7 +102,7 @@ public final class ConnectionFactory {
BasicDataSource bds =
getDriverDataSource(driverClass, def.getUrl(), def.getUser(), def.getPassword());
if (def.getMaxPoolSize() > 0) {
- bds.setMaxActive(def.getMaxPoolSize());
+ bds.setMaxTotal(def.getMaxPoolSize());
}
if (def.getValidationQuery() != null && !"".equals(def.getValidationQuery().trim())) {
bds.setValidationQuery(def.getValidationQuery());
@@ -348,8 +348,8 @@ public final class ConnectionFactory {
ds.setTestWhileIdle(true);
ds.setTimeBetweenEvictionRunsMillis(600000); // 10 Minutes
ds.setMinEvictableIdleTimeMillis(60000); // 1 Minute
- ds.setMaxActive(-1); // unlimited
- ds.setMaxIdle(GenericObjectPool.DEFAULT_MAX_IDLE + 10);
+ ds.setMaxTotal(-1); // unlimited
+ ds.setMaxIdle(GenericObjectPoolConfig.DEFAULT_MAX_IDLE + 10);
ds.setValidationQuery(guessValidationQuery(url));
ds.setAccessToUnderlyingConnectionAllowed(true);
ds.setPoolPreparedStatements(Boolean.valueOf(System.getProperty(SYSTEM_PROPERTY_POOL_PREPARED_STATEMENTS, "true")));