This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 6dcb374 Update Commons Pool 2 to 2.9.1-SNAPSHOT
new 2aaffcd Update Commons DBCP
new 5601e51 Fix back-port of Pool2 update not to use default methods
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 24 ++---
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 40 ++++---
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 5 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 18 ++--
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 3 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 6 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 17 ++-
.../tomcat/dbcp/dbcp2/DriverConnectionFactory.java | 13 +--
.../apache/tomcat/dbcp/dbcp2/DriverFactory.java | 6 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 26 +++--
.../dbcp/dbcp2/LifetimeExceededException.java | 1 -
.../tomcat/dbcp/dbcp2/ObjectNameWrapper.java | 8 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 71 +++----------
.../dbcp/dbcp2/PoolableCallableStatement.java | 4 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 20 +++-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 41 ++++---
.../dbcp/dbcp2/PoolablePreparedStatement.java | 8 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 17 ++-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 4 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 16 ++-
.../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 45 +++++---
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 4 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 118 +++++++--------------
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 4 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 55 ++++++++--
.../dbcp2/datasources/CPDSConnectionFactory.java | 19 ++--
.../dbcp2/datasources/InstanceKeyDataSource.java | 7 --
.../datasources/InstanceKeyDataSourceFactory.java | 18 ++--
.../datasources/KeyedCPDSConnectionFactory.java | 20 ++--
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 26 ++---
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 23 +---
.../dbcp/dbcp2/datasources/package-info.java | 2 +-
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 4 +-
.../dbcp/pool2/KeyedPooledObjectFactory.java | 4 +-
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 10 ++
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 4 +-
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 6 ++
webapps/docs/changelog.xml | 4 +
41 files changed, 346 insertions(+), 383 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
