This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to annotated tag commons-dbcp-2.7.0-RC1
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 50bae945de40a602f5746957bf389c6666b38c9f
Merge: 6b62b0e 87d9e3a
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Jul 31 08:45:25 2019 -0400
Merge branch 'master' into release
.travis.yml | 6 +-
CONTRIBUTING.md | 230 +--
NOTICE.txt | 10 +-
README.md | 210 +-
README.txt | 4 +-
RELEASE-NOTES.txt | 82 +-
pom.xml | 1022 +++++-----
src/changes/changes.xml | 2093 ++++++++++----------
src/conf/eclipse/formatter.xml | 370 ++++
.../org/apache/commons/dbcp2/AbandonedTrace.java | 14 +-
.../org/apache/commons/dbcp2/BasicDataSource.java | 451 ++---
.../commons/dbcp2/BasicDataSourceFactory.java | 9 +-
.../commons/dbcp2/ConnectionFactoryFactory.java | 77 +
.../apache/commons/dbcp2/DelegatingConnection.java | 67 +-
.../apache/commons/dbcp2/DelegatingResultSet.java | 4 +-
.../apache/commons/dbcp2/DelegatingStatement.java | 59 +-
.../commons/dbcp2/DriverConnectionFactory.java | 2 +
.../org/apache/commons/dbcp2/DriverFactory.java | 81 +
.../org/apache/commons/dbcp2/Jdbc41Bridge.java | 2 +-
.../apache/commons/dbcp2/ObjectNameWrapper.java | 9 +
.../commons/dbcp2/PoolableCallableStatement.java | 29 +-
.../commons/dbcp2/PoolableConnectionFactory.java | 32 +-
.../commons/dbcp2/PoolablePreparedStatement.java | 33 +-
.../apache/commons/dbcp2/PoolingDataSource.java | 2 +-
.../org/apache/commons/dbcp2/SQLExceptionList.java | 51 +
.../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 691 +++----
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 81 +
.../dbcp2/datasources/InstanceKeyDataSource.java | 20 +-
.../datasources/InstanceKeyDataSourceFactory.java | 2 +-
.../dbcp2/managed/BasicManagedDataSource.java | 2 +-
.../commons/dbcp2/managed/ManagedDataSource.java | 4 +
.../managed/PoolableManagedConnectionFactory.java | 2 +-
src/site/site.xml | 121 +-
src/site/xdoc/configuration.xml | 8 +
src/site/xdoc/download_dbcp.xml | 492 ++---
src/site/xdoc/index.xml | 210 +-
src/site/xdoc/issue-tracking.xml | 204 +-
src/site/xdoc/mail-lists.xml | 410 ++--
src/site/xdoc/release-notes-1.1.xml | 162 +-
src/site/xdoc/release-notes-1.2.xml | 60 +-
.../dbcp2/TestAbandonedBasicDataSource.java | 50 +-
.../apache/commons/dbcp2/TestBasicDataSource.java | 130 +-
.../commons/dbcp2/TestBasicDataSourceFactory.java | 12 +-
.../commons/dbcp2/TestBasicDataSourceMXBean.java | 4 +-
.../apache/commons/dbcp2/TestConnectionPool.java | 68 +-
.../org/apache/commons/dbcp2/TestConstants.java | 6 +-
.../dbcp2/TestDataSourceConnectionFactory.java | 10 +-
.../dbcp2/TestDelegatingCallableStatement.java | 12 +-
.../commons/dbcp2/TestDelegatingConnection.java | 173 +-
.../dbcp2/TestDelegatingDatabaseMetaData.java | 14 +-
.../dbcp2/TestDelegatingPreparedStatement.java | 12 +-
.../commons/dbcp2/TestDelegatingResultSet.java | 24 +-
.../commons/dbcp2/TestDelegatingStatement.java | 416 ++--
.../commons/dbcp2/TestDriverConnectionFactory.java | 6 +-
.../dbcp2/TestDriverManagerConnectionFactory.java | 31 +-
.../java/org/apache/commons/dbcp2/TestJndi.java | 24 +-
.../dbcp2/TestLifetimeExceededException.java | 6 +-
.../apache/commons/dbcp2/TestListException.java | 8 +-
.../org/apache/commons/dbcp2/TestPStmtKey.java | 108 +-
.../org/apache/commons/dbcp2/TestPStmtPooling.java | 22 +-
.../dbcp2/TestPStmtPoolingBasicDataSource.java | 23 +-
.../dbcp2/TestParallelCreationWithNoIdle.java | 320 +--
.../commons/dbcp2/TestPoolableConnection.java | 55 +-
.../commons/dbcp2/TestPoolingConnection.java | 14 +-
.../commons/dbcp2/TestPoolingDataSource.java | 24 +-
.../apache/commons/dbcp2/TestPoolingDriver.java | 28 +-
...dedException.java => TestSQLExceptionList.java} | 29 +-
.../java/org/apache/commons/dbcp2/TestUtils.java | 6 +-
.../commons/dbcp2/TesterCallableStatement.java | 2 +-
.../org/apache/commons/dbcp2/TesterConnection.java | 316 +--
.../commons/dbcp2/TesterConnectionFactory.java} | 31 +-
.../commons/dbcp2/TesterPreparedStatement.java | 1 +
.../org/apache/commons/dbcp2/TesterResultSet.java | 24 +-
.../org/apache/commons/dbcp2/TesterStatement.java | 27 +-
.../dbcp2/cpdsadapter/TestDriverAdapterCPDS.java | 139 +-
.../datasources/TestCPDSConnectionFactory.java | 12 +-
.../commons/dbcp2/datasources/TestFactory.java | 6 +-
.../datasources/TestInstanceKeyDataSource.java | 56 +-
.../TestKeyedCPDSConnectionFactory.java | 12 +-
.../datasources/TestPerUserPoolDataSource.java | 40 +-
.../commons/dbcp2/datasources/TestPoolKey.java | 10 +-
.../datasources/TestSharedPoolDataSource.java | 26 +-
.../commons/dbcp2/datasources/TestUserPassKey.java | 12 +-
.../dbcp2/managed/TestBasicManagedDataSource.java | 61 +-
.../dbcp2/managed/TestConnectionWithNarayana.java | 42 +-
.../managed/TestDataSourceXAConnectionFactory.java | 8 +-
.../commons/dbcp2/managed/TestLocalXaResource.java | 73 +-
.../dbcp2/managed/TestManagedConnection.java | 12 +-
.../dbcp2/managed/TestManagedDataSource.java | 43 +-
.../dbcp2/managed/TestManagedDataSourceInTx.java | 70 +-
.../managed/TestPoolableManagedConnection.java | 18 +-
.../dbcp2/managed/TestSynchronizationOrder.java | 98 +-
.../dbcp2/managed/TestTransactionContext.java | 33 +-
93 files changed, 5631 insertions(+), 4594 deletions(-)
