You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/09/12 01:16:10 UTC
[6/8] zest-java git commit: Move from commons-dbcp to commons-dbcp2
for sql-dbcp library
Move from commons-dbcp to commons-dbcp2 for sql-dbcp library
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/4d8704f8
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/4d8704f8
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/4d8704f8
Branch: refs/heads/develop
Commit: 4d8704f89e77bdfffa866e964c2355a3980ac7b9
Parents: bf69b21
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 15:19:47 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:23:35 2016 -0700
----------------------------------------------------------------------
libraries.gradle | 4 ++--
.../zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java | 4 ++--
.../zest/library/sql/datasource/ExternalDataSourceTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 499d963..514ea3c 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -22,7 +22,7 @@
def asmVersion = '5.1'
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.54'
-def commonsDbcpVersion = '1.4' // Should be moved to commons-dbcp2
+def commonsDbcpVersion = '2.1.1'
def commonsLangVersion = '3.4'
def derbyVersion = '10.12.1.1'
def dnsJavaVersion = '2.1.7'
@@ -207,7 +207,7 @@ rootProject.ext {
javaSqlGenerator: "org.java-sql-generator:org.java-sql-generator.api:$javasqlgeneratorVersion",
javaSqlGeneratorImpl: "org.java-sql-generator:org.java-sql-generator.implementation:$javasqlgeneratorVersion",
velocity: "org.apache.velocity:velocity:$velocityVersion",
- commons_dbcp: "commons-dbcp:commons-dbcp:$commonsDbcpVersion",
+ commons_dbcp: "org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
commons_lang: "org.apache.commons:commons-lang3:$commonsLangVersion",
servlet_api: "javax.servlet:javax.servlet-api:$servletVersion",
http_client: "org.apache.httpcomponents:httpclient:$httpClientVersion",
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
----------------------------------------------------------------------
diff --git a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
index 92af487..86daca4 100644
--- a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
+++ b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
@@ -20,7 +20,7 @@
package org.apache.zest.library.sql.dbcp;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.zest.api.activation.Activators;
import org.apache.zest.api.mixin.Mixins;
import org.apache.zest.api.service.ServiceComposite;
@@ -58,7 +58,7 @@ public interface DBCPDataSourceServiceImporter
pool.setMinIdle( config.minPoolSize().get() );
}
if ( config.maxPoolSize().get() != null ) {
- pool.setMaxActive( config.maxPoolSize().get() );
+ pool.setMaxTotal( config.maxPoolSize().get() );
}
if ( config.loginTimeoutSeconds().get() != null ) {
pool.setLoginTimeout( config.loginTimeoutSeconds().get() );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
index fba0374..749d1bb 100644
--- a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
+++ b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
@@ -22,7 +22,7 @@ package org.apache.zest.library.sql.datasource;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Test;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;