[tomcat] branch main updated: Add a note re Pool 2 and DBCP 2

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 2c6b70f8c2 Add a note re Pool 2 and DBCP 2
2c6b70f8c2 is described below

commit 2c6b70f8c2bcccecc3fa3d80be75f502b115ec75
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Nov 29 19:25:23 2022 +0000

    Add a note re Pool 2 and DBCP 2
---
 MERGE.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MERGE.txt b/MERGE.txt
index 5a74e6264b..8c1ed33662 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -68,6 +68,9 @@ src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
 rel/commons-pool-2.11.1 (2021-08-17)
 
+Note: Changes beyond 2.11.1 require matching changes in DBCP that are not yet
+      (as of 2022-11-29) implemented
+
 DBCP2
 No unused code removed
 Sub-tree


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