From f399f912cf34a1f2a7963472ad19119bdc453071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Mon, 24 Sep 2018 06:41:20 +0000 Subject: [PATCH] [OPENJPA-2750] Commons dbcp is updated to latest version - thx @solomax - This closes #22 git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1841800 13f79535-47bb-0310-9956-ffa450edef68 --- openjpa-all/pom.xml | 4 ++-- openjpa-features/src/main/feature/feature.xml | 2 +- openjpa-jdbc/pom.xml | 6 +++--- .../jdbc/schema/DBCPDriverDataSource.java | 10 +++++----- .../openjpa/jdbc/sql/PostgresDictionary.java | 6 +++--- openjpa-persistence-jdbc/pom.xml | 4 ++-- .../org/apache/openjpa/conf/TestBadJdbcUrl.java | 2 +- openjpa-persistence-locking/pom.xml | 4 ++-- openjpa-project/assembly.xml | 2 +- openjpa-project/bin-assembly.xml | 2 +- openjpa-project/pom.xml | 4 ++-- .../src/doc/manual/ref_guide_dbsetup.xml | 2 +- .../src/it/default_settings/pom.xml | 2 +- .../src/it/dependingArtifact/prjB/pom.xml | 2 +- .../src/it/enhanceIncludesExcludes/pom.xml | 2 +- .../src/it/nonDefaultPersistenceXml/pom.xml | 2 +- .../openjpa-maven-plugin/src/it/settings.xml | 2 +- .../src/it/sqlActionDropSchema/pom.xml | 4 ++-- .../src/it/testDependencies/prjB/pom.xml | 2 +- pom.xml | 16 ++++++++-------- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml index 4875c5e98..0f58e1e9e 100644 --- a/openjpa-all/pom.xml +++ b/openjpa-all/pom.xml @@ -134,8 +134,8 @@ commons-logging - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml index b1f0bdf1b..96f771f2a 100644 --- a/openjpa-features/src/main/feature/feature.xml +++ b/openjpa-features/src/main/feature/feature.xml @@ -25,7 +25,7 @@ mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1 mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1 mvn:org.apache.commons/commons-pool2/2.6.0 - mvn:commons-dbcp/commons-dbcp/1.4 + mvn:org.apache.commons/commons-dbcp2/2.5.0 mvn:commons-collections/commons-collections/3.2.2 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1 mvn:org.apache.xbean/xbean-asm6-shaded/4.9 diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 3f36d7ed6..0752a3652 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -55,7 +55,7 @@ true - hsqldb + org.hsqldb hsqldb provided @@ -65,8 +65,8 @@ provided - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 provided diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java index 36aa46fe2..cf3915c90 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java @@ -41,8 +41,8 @@ import org.apache.openjpa.lib.util.Closeable; public class DBCPDriverDataSource extends SimpleDriverDataSource implements Configurable, Closeable { - private static String DBCPPACKAGENAME = "org.apache.commons.dbcp"; - private static String DBCPBASICDATASOURCENAME = "org.apache.commons.dbcp.BasicDataSource"; + private static String DBCPPACKAGENAME = "org.apache.commons.dbcp2"; + private static String DBCPBASICDATASOURCENAME = "org.apache.commons.dbcp2.BasicDataSource"; private static Class _dbcpClass; private static Boolean _dbcpAvail; private static RuntimeException _dbcpEx; @@ -59,7 +59,7 @@ extends SimpleDriverDataSource implements Configurable, Closeable { try { if (_ds != null) { if (isDBCPLoaded(getClassLoader())) { - ((org.apache.commons.dbcp.BasicDataSource)_dbcpClass.cast(_ds)).close(); + ((org.apache.commons.dbcp2.BasicDataSource)_dbcpClass.cast(_ds)).close(); } } } catch (Exception e) { @@ -106,7 +106,7 @@ extends SimpleDriverDataSource implements Configurable, Closeable { * This method should not throw an exception, as it is called by * AutoDriverDataSource to determine if user already specified * to use Commons DBCP. - * @return true if ConnectionDriverName contains org.apache.commons.dbcp, + * @return true if ConnectionDriverName contains org.apache.commons.dbcp2, * otherwise false */ protected boolean isDBCPDataSource() { @@ -117,7 +117,7 @@ extends SimpleDriverDataSource implements Configurable, Closeable { /** * This method should not throw an exception, as it is called by * AutoDriverDataSource to determine if it should use DBCP or not - * based on if org.apache.commons.dbcp.BasicDataSource can be loaded. + * based on if org.apache.commons.dbcp2.BasicDataSource can be loaded. * @return true if Commons DBCP was found on the classpath, otherwise false */ static protected boolean isDBCPLoaded(ClassLoader cl) { diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java index febbf74b3..d3750fe9a 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java @@ -876,7 +876,7 @@ public class PostgresDictionary if (innerConn instanceof PGConnection) { return (PGConnection) innerConn; } - if (innerConn.getClass().getName().startsWith("org.apache.commons.dbcp")) { + if (innerConn.getClass().getName().startsWith("org.apache.commons.dbcp2")) { return (PGConnection) getDbcpDelegate(innerConn); } return (PGConnection) unwrapConnection(conn, PGConnection.class); @@ -893,10 +893,10 @@ public class PostgresDictionary try { if (dbcpGetDelegate == null) { Class dbcpConnectionClass = - Class.forName("org.apache.commons.dbcp.DelegatingConnection", true, AccessController + Class.forName("org.apache.commons.dbcp2.DelegatingConnection", true, AccessController .doPrivileged(J2DoPrivHelper.getContextClassLoaderAction())); Class poolingDataSource = Class.forName( - "org.apache.commons.dbcp.PoolingDataSource", true, + "org.apache.commons.dbcp2.PoolingDataSource", true, AccessController.doPrivileged(J2DoPrivHelper .getContextClassLoaderAction())); Method setAccessToUnderlyingConnectionAllowed = poolingDataSource diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 1537bb225..d5eb83613 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -74,7 +74,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} test @@ -557,7 +557,7 @@ mvn test -Dtest= -Ptest-derbynet --> jdbc:db2://localhost:1527/openjpa20 - + uid pwd com.ibm.db2.jcc.DB2Driver diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java index c9f3e92cb..db6d1588c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java @@ -49,7 +49,7 @@ public class TestBadJdbcUrl extends TestCase { public static final String GOOD_DRIVER = "org.apache.derby.jdbc.EmbeddedDriver"; public static final String GOOD_DATASOURCE = - "org.apache.commons.dbcp.BasicDataSource"; + "org.apache.commons.dbcp2.BasicDataSource"; public static final String BAD_DRIVER = "bad.driver"; public static final String BAD_URL_PROTOCOL = "bad.url.protocol"; diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml index 129988367..3e0be2b5e 100644 --- a/openjpa-persistence-locking/pom.xml +++ b/openjpa-persistence-locking/pom.xml @@ -84,7 +84,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} test @@ -534,7 +534,7 @@ mvn test -Dtest= -Ptest-derbynet --> jdbc:db2://localhost:1527/openjpa20 - + uid pwd com.ibm.db2.jcc.DB2Driver diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml index 8e7afe9f4..e76713e30 100644 --- a/openjpa-project/assembly.xml +++ b/openjpa-project/assembly.xml @@ -137,7 +137,7 @@ commons-collections:commons-collections org.apache.commons:commons-pool2 commons-logging:commons-logging - commons-dbcp:commons-dbcp + org.apache.commons:commons-dbcp2 org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-jpa_2.1_spec diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml index 9c1fc179e..5c6f7348f 100644 --- a/openjpa-project/bin-assembly.xml +++ b/openjpa-project/bin-assembly.xml @@ -76,7 +76,7 @@ commons-collections:commons-collections org.apache.commons:commons-pool2 commons-logging:commons-logging - commons-dbcp:commons-dbcp + org.apache.commons:commons-dbcp2 org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-jpa_2.1_spec diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index 747135bdd..1197e986f 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -411,8 +411,8 @@ commons-logging - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 diff --git a/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml b/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml index caeb3f5a8..192510963 100644 --- a/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml +++ b/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml @@ -86,7 +86,7 @@ select between the old SimpleDriverDataSource and a new has been provided on the classpath and OpenJPA is not running in a container managed mode or with managed transactions. Note, that only the openjpa-all.jar includes Commons DBCP, so you will need to -include the commons-dbcp.jar from the OpenJPA binary +include the commons-dbcp2.jar from the OpenJPA binary distribution if you are using the normal openjpa.jar. diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml index 094133d67..c9847e85a 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml @@ -62,7 +62,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml index d808cf9ae..f8c491c43 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml @@ -58,7 +58,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml index 6ffe18429..d5f6d0809 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml @@ -61,7 +61,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml index b8967f181..a4fc45b75 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml @@ -50,7 +50,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml b/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml index b8a82c106..47f559e37 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml @@ -45,7 +45,7 @@ - 1.8.0.10 + 2.4.1 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml index 66ad1fa9b..cce1721ae 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml @@ -61,7 +61,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} @@ -137,7 +137,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml index 8c1f34a23..42342ebde 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml @@ -50,7 +50,7 @@ - hsqldb + org.hsqldb hsqldb ${hsqldb.version} diff --git a/pom.xml b/pom.xml index 07245565d..1dda00a4a 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ false 10.12.1.1 - 1.8.0.10 + 2.4.1 5.1.12 9.1-901-1.jdbc4 @@ -482,7 +482,7 @@ jdbc:derby://localhost:1527/openjpa20;create=true;traceDirectory=target;traceFile=derby.log org.apache.derby.jdbc.ClientDriver - + uid pwd ${openjpa.derbynet.driver} @@ -554,9 +554,9 @@ ${derby.version} - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.5.0 javax.xml.bind @@ -569,7 +569,7 @@ 2.2.1 - hsqldb + org.hsqldb hsqldb ${hsqldb.version} @@ -629,8 +629,8 @@ test - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 test