This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


    from 7706bdc80f Update SpotBugs to 4.8.4
     new c611488dc9 Update internal fork of Commons BCEL to 6.9.0
     new b0ee756871 Update Commons DBCP to 2.12.0
     new 287f97c53a Align with Commons DBCP 2.12.0

The 3 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                                          |   4 +-
 .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java   |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  | 151 +++++++++---------
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  33 ++--
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |   2 +-
 .../dbcp/dbcp2/ConnectionFactoryFactory.java       |   3 +-
 .../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java |  13 ++
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java    |   4 +-
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java     |   6 +-
 .../dbcp/dbcp2/DelegatingPreparedStatement.java    |  42 ++---
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java     |   2 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java     |  12 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |   4 +-
 .../dbcp/dbcp2/PoolableCallableStatement.java      |   2 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java      | 177 ++++++++++++---------
 .../dbcp/dbcp2/PoolableConnectionFactory.java      |   2 +-
 .../dbcp/dbcp2/PoolablePreparedStatement.java      |  13 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java       |  36 ++++-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java       |   8 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java    |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java       |   3 +-
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java     |  23 ++-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 137 +++++++++-------
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java    |  20 ++-
 .../dbcp/dbcp2/cpdsadapter/package-info.java       |  18 +--
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  34 ++--
 .../datasources/KeyedCPDSConnectionFactory.java    |   2 +-
 .../dbcp2/datasources/PerUserPoolDataSource.java   |   6 +-
 .../dbcp2/datasources/SharedPoolDataSource.java    |   2 +-
 .../dbcp/dbcp2/datasources/package-info.java       |  58 +++----
 .../dbcp/dbcp2/managed/BasicManagedDataSource.java |  15 +-
 .../managed/DataSourceXAConnectionFactory.java     |   7 +-
 .../dbcp2/managed/LocalXAConnectionFactory.java    |   8 +-
 .../dbcp/dbcp2/managed/ManagedConnection.java      |   8 +-
 .../dbcp/dbcp2/managed/TransactionRegistry.java    |   2 +-
 .../dbcp/dbcp2/managed/XAConnectionFactory.java    |   4 +-
 .../org/apache/tomcat/dbcp/dbcp2/package-info.java |  12 +-
 .../util/bcel/classfile/ArrayElementValue.java     |   4 +-
 .../tomcat/util/bcel/classfile/ElementValue.java   |   1 +
 webapps/docs/changelog.xml                         |   6 +
 40 files changed, 478 insertions(+), 410 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to