Prepare for the next release candidate
diff --git a/README.md b/README.md
index d84859f..b22e2f0 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
[](https://github.com/apache/commons-dbcp/actions/workflows/maven.yml)
[](https://app.codecov.io/gh/apache/commons-dbcp)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/?gav=true)
-[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.10.0)
+[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.11.0)
[](https://github.com/apache/commons-dbcp/actions/workflows/codeql-analysis.yml)
[](https://api.securityscorecards.dev/projects/github.com/apache/commons-dbcp)
@@ -59,8 +59,8 @@
The [Javadoc](https://commons.apache.org/proper/commons-dbcp/apidocs) can be browsed.
Questions related to the usage of Apache Commons DBCP should be posted to the [user mailing list][ml].
-Where can I get the latest release?
------------------------------------
+Getting the latest release
+--------------------------
You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-dbcp/download_dbcp.cgi).
Alternatively, you can pull it from the central Maven repositories:
@@ -69,17 +69,25 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
</dependency>
```
+Building
+--------
+
+Building requires a Java JDK and [Apache Maven](https://maven.apache.org/).
+The required Java version is found in the `pom.xml` as the `maven.compiler.source` property.
+
+From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks.
+
Contributing
------------
We accept Pull Requests via GitHub. The [developer mailing list](https://commons.apache.org/mail-lists.html) is the main channel of communication for contributors.
There are some guidelines which will make applying PRs easier for us:
+ No tabs! Please use spaces for indentation.
-+ Respect the code style.
++ Respect the existing code style for each file.
+ Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```.
@@ -88,13 +96,13 @@
License
-------
-This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0).
+This code is licensed under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0).
See the `NOTICE.txt` file for required notices and attributions.
-Donations
----------
-You like Apache Commons DBCP? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development.
+Donating
+--------
+You like Apache Commons DBCP? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support development.
Additional Resources
--------------------
@@ -108,54 +116,4 @@
Apache Commons Components
-------------------------
-| Component | GitHub Repository | Apache Homepage |
-| --------- | ----------------- | ----------------|
-| Apache Commons BCEL | [commons-bcel](https://github.com/apache/commons-bcel) | [commons-bcel](https://commons.apache.org/proper/commons-bcel) |
-| Apache Commons Beanutils | [commons-beanutils](https://github.com/apache/commons-beanutils) | [commons-beanutils](https://commons.apache.org/proper/commons-beanutils) |
-| Apache Commons BSF | [commons-bsf](https://github.com/apache/commons-bsf) | [commons-bsf](https://commons.apache.org/proper/commons-bsf) |
-| Apache Commons Build-plugin | [commons-build-plugin](https://github.com/apache/commons-build-plugin) | [commons-build-plugin](https://commons.apache.org/proper/commons-build-plugin) |
-| Apache Commons Chain | [commons-chain](https://github.com/apache/commons-chain) | [commons-chain](https://commons.apache.org/proper/commons-chain) |
-| Apache Commons CLI | [commons-cli](https://github.com/apache/commons-cli) | [commons-cli](https://commons.apache.org/proper/commons-cli) |
-| Apache Commons Codec | [commons-codec](https://github.com/apache/commons-codec) | [commons-codec](https://commons.apache.org/proper/commons-codec) |
-| Apache Commons Collections | [commons-collections](https://github.com/apache/commons-collections) | [commons-collections](https://commons.apache.org/proper/commons-collections) |
-| Apache Commons Compress | [commons-compress](https://github.com/apache/commons-compress) | [commons-compress](https://commons.apache.org/proper/commons-compress) |
-| Apache Commons Configuration | [commons-configuration](https://github.com/apache/commons-configuration) | [commons-configuration](https://commons.apache.org/proper/commons-configuration) |
-| Apache Commons Crypto | [commons-crypto](https://github.com/apache/commons-crypto) | [commons-crypto](https://commons.apache.org/proper/commons-crypto) |
-| Apache Commons CSV | [commons-csv](https://github.com/apache/commons-csv) | [commons-csv](https://commons.apache.org/proper/commons-csv) |
-| Apache Commons Daemon | [commons-daemon](https://github.com/apache/commons-daemon) | [commons-daemon](https://commons.apache.org/proper/commons-daemon) |
-| Apache Commons DBCP | [commons-dbcp](https://github.com/apache/commons-dbcp) | [commons-dbcp](https://commons.apache.org/proper/commons-dbcp) |
-| Apache Commons Dbutils | [commons-dbutils](https://github.com/apache/commons-dbutils) | [commons-dbutils](https://commons.apache.org/proper/commons-dbutils) |
-| Apache Commons Digester | [commons-digester](https://github.com/apache/commons-digester) | [commons-digester](https://commons.apache.org/proper/commons-digester) |
-| Apache Commons Email | [commons-email](https://github.com/apache/commons-email) | [commons-email](https://commons.apache.org/proper/commons-email) |
-| Apache Commons Exec | [commons-exec](https://github.com/apache/commons-exec) | [commons-exec](https://commons.apache.org/proper/commons-exec) |
-| Apache Commons Fileupload | [commons-fileupload](https://github.com/apache/commons-fileupload) | [commons-fileupload](https://commons.apache.org/proper/commons-fileupload) |
-| Apache Commons Functor | [commons-functor](https://github.com/apache/commons-functor) | [commons-functor](https://commons.apache.org/proper/commons-functor) |
-| Apache Commons Geometry | [commons-geometry](https://github.com/apache/commons-geometry) | [commons-geometry](https://commons.apache.org/proper/commons-geometry) |
-| Apache Commons Graph | [commons-graph](https://github.com/apache/commons-graph) | [commons-graph](https://commons.apache.org/proper/commons-graph) |
-| Apache Commons Imaging | [commons-imaging](https://github.com/apache/commons-imaging) | [commons-imaging](https://commons.apache.org/proper/commons-imaging) |
-| Apache Commons IO | [commons-io](https://github.com/apache/commons-io) | [commons-io](https://commons.apache.org/proper/commons-io) |
-| Apache Commons JCI | [commons-jci](https://github.com/apache/commons-jci) | [commons-jci](https://commons.apache.org/proper/commons-jci) |
-| Apache Commons JCS | [commons-jcs](https://github.com/apache/commons-jcs) | [commons-jcs](https://commons.apache.org/proper/commons-jcs) |
-| Apache Commons Jelly | [commons-jelly](https://github.com/apache/commons-jelly) | [commons-jelly](https://commons.apache.org/proper/commons-jelly) |
-| Apache Commons Jexl | [commons-jexl](https://github.com/apache/commons-jexl) | [commons-jexl](https://commons.apache.org/proper/commons-jexl) |
-| Apache Commons Jxpath | [commons-jxpath](https://github.com/apache/commons-jxpath) | [commons-jxpath](https://commons.apache.org/proper/commons-jxpath) |
-| Apache Commons Lang | [commons-lang](https://github.com/apache/commons-lang) | [commons-lang](https://commons.apache.org/proper/commons-lang) |
-| Apache Commons Logging | [commons-logging](https://github.com/apache/commons-logging) | [commons-logging](https://commons.apache.org/proper/commons-logging) |
-| Apache Commons Math | [commons-math](https://github.com/apache/commons-math) | [commons-math](https://commons.apache.org/proper/commons-math) |
-| Apache Commons Net | [commons-net](https://github.com/apache/commons-net) | [commons-net](https://commons.apache.org/proper/commons-net) |
-| Apache Commons Numbers | [commons-numbers](https://github.com/apache/commons-numbers) | [commons-numbers](https://commons.apache.org/proper/commons-numbers) |
-| Apache Commons Parent | [commons-parent](https://github.com/apache/commons-parent) | [commons-parent](https://commons.apache.org/proper/commons-parent) |
-| Apache Commons Pool | [commons-pool](https://github.com/apache/commons-pool) | [commons-pool](https://commons.apache.org/proper/commons-pool) |
-| Apache Commons Proxy | [commons-proxy](https://github.com/apache/commons-proxy) | [commons-proxy](https://commons.apache.org/proper/commons-proxy) |
-| Apache Commons RDF | [commons-rdf](https://github.com/apache/commons-rdf) | [commons-rdf](https://commons.apache.org/proper/commons-rdf) |
-| Apache Commons Release-plugin | [commons-release-plugin](https://github.com/apache/commons-release-plugin) | [commons-release-plugin](https://commons.apache.org/proper/commons-release-plugin) |
-| Apache Commons Rng | [commons-rng](https://github.com/apache/commons-rng) | [commons-rng](https://commons.apache.org/proper/commons-rng) |
-| Apache Commons Scxml | [commons-scxml](https://github.com/apache/commons-scxml) | [commons-scxml](https://commons.apache.org/proper/commons-scxml) |
-| Apache Commons Signing | [commons-signing](https://github.com/apache/commons-signing) | [commons-signing](https://commons.apache.org/proper/commons-signing) |
-| Apache Commons Skin | [commons-skin](https://github.com/apache/commons-skin) | [commons-skin](https://commons.apache.org/proper/commons-skin) |
-| Apache Commons Statistics | [commons-statistics](https://github.com/apache/commons-statistics) | [commons-statistics](https://commons.apache.org/proper/commons-statistics) |
-| Apache Commons Testing | [commons-testing](https://github.com/apache/commons-testing) | [commons-testing](https://commons.apache.org/proper/commons-testing) |
-| Apache Commons Text | [commons-text](https://github.com/apache/commons-text) | [commons-text](https://commons.apache.org/proper/commons-text) |
-| Apache Commons Validator | [commons-validator](https://github.com/apache/commons-validator) | [commons-validator](https://commons.apache.org/proper/commons-validator) |
-| Apache Commons VFS | [commons-vfs](https://github.com/apache/commons-vfs) | [commons-vfs](https://commons.apache.org/proper/commons-vfs) |
-| Apache Commons Weaver | [commons-weaver](https://github.com/apache/commons-weaver) | [commons-weaver](https://commons.apache.org/proper/commons-weaver) |
+Please see the [list of components](https://commons.apache.org/components.html)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 44bd02d..a482744 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,4 +1,35 @@
Apache Commons DBCP
+ Version 2.11.0
+ RELEASE NOTES
+
+The Apache Commons DBCP team is pleased to announce the release of Apache Commons DBCP 2.11.0.
+
+Apache Commons DBCP software implements Database Connection Pooling.
+
+This is a minor release, including bug fixes and enhancements.
+
+Changes in this version include:
+
+Changes:
+o Update call sites of deprecated APIs from Apache Commons Pool. Thanks to Gary Gregory.
+o Add DataSourceMXBean.getUserName() and deprecate getUsername(). Thanks to Gary Gregory, Dependabot.
+o Bump h2 from 2.2.220 to 2.2.224, #308. Thanks to Gary Gregory, Dependabot.
+o Bump commons-parent from 60 to 64. Thanks to Gary Gregory.
+o Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 #301. Thanks to Dependabot.
+o Bump org.apache.commons:commons-pool2 from 2.11.1 to 2.12.0. Thanks to Gary Gregory.
+o Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3. Thanks to Gary Gregory.
+
+
+For complete information on Apache Commons DBCP, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Commons DBCP website:
+
+https://commons.apache.org/dbcp/
+
+Download page: https://commons.apache.org/dbcp/download_dbcp.cgi
+
+-----------------------------------------------------------------------------
+
+ Apache Commons DBCP
Version 2.10.0
RELEASE NOTES
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index eebd858..12df39d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,7 +62,7 @@
EvictionTimer
-->
<body>
- <release version="2.11.0" date="20YY-MM-DD" description="This is a minor release, including bug fixes and enhancements.">
+ <release version="2.11.0" date="2023-10-23" description="This is a minor release, including bug fixes and enhancements.">
<!-- FIX -->
<action type="update" dev="ggregory" due-to="Gary Gregory">Update call sites of deprecated APIs from Apache Commons Pool.</action>
<!-- ADD -->
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index 12489a2..14f9e50 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -109,3 +109,4 @@
Download page: ${project.url}download_dbcp.cgi
-----------------------------------------------------------------------------
+
diff --git a/src/site/xdoc/download_dbcp.xml b/src/site/xdoc/download_dbcp.xml
index db043f5..ce0badd 100644
--- a/src/site/xdoc/download_dbcp.xml
+++ b/src/site/xdoc/download_dbcp.xml
@@ -113,32 +113,32 @@
</p>
</subsection>
</section>
- <section name="Apache Commons DBCP 2.10.0 for JDBC 4.2 on Java 8">
+ <section name="Apache Commons DBCP 2.11.0 for JDBC 4.2 on Java 8">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.tar.gz">commons-dbcp2-2.10.0-bin.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.tar.gz">commons-dbcp2-2.11.0-bin.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.zip">commons-dbcp2-2.10.0-bin.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.10.0-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.zip">commons-dbcp2-2.11.0-bin.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.11.0-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.10.0-src.tar.gz">commons-dbcp2-2.10.0-src.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.10.0-src.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.10.0-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.11.0-src.tar.gz">commons-dbcp2-2.11.0-src.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.11.0-src.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.11.0-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.10.0-src.zip">commons-dbcp2-2.10.0-src.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.10.0-src.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.10.0-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.11.0-src.zip">commons-dbcp2-2.11.0-src.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.11.0-src.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.11.0-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 3efd0de..3c5d89e 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -59,9 +59,9 @@
</p>
<p>
Questions related to the usage of Apache Commons DBCP should be posted to the
- <a href="https://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
+ <a href="https://lists.apache.org/list.html?user@commons.apache.org">User List</a>.
<br />
- The <a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
+ The <a href="https://lists.apache.org/list.html?dev@commons.apache.org">Developer List</a>
is for questions and discussion related to the development of Apache Commons DBCP.
<br />
Please do not cross-post; developers are also subscribed to the user list.
@@ -70,8 +70,10 @@
to subscribe.
</p>
<p>
- <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.
+ <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists;
+ most of the lists are set up to drop attachments.
Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
+ If you have a GitHub account, most components also accept PRs (pull requests).
Otherwise, please upload the file to a public server and include the URL in the mail.
</p>
</section>
@@ -105,12 +107,11 @@
<td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
<td><a href="mailto:user@commons.apache.org?subject=[dbcp]">Post</a></td>
- <td><a href="https://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a><br />
+ <td>
<a href="https://lists.apache.org/list.html?user@commons.apache.org">lists.apache.org</a>
</td>
- <td><a href="https://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />
- <a href="https://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />
- <a href="https://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
+ <td>
+ <a href="https://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a>
</td>
</tr>
@@ -125,12 +126,11 @@
<td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
<td><a href="mailto:dev@commons.apache.org?subject=[dbcp]">Post</a></td>
- <td><a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a><br />
+ <td>
<a href="https://lists.apache.org/list.html?dev@commons.apache.org">lists.apache.org</a>
</td>
- <td><a href="https://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />
- <a href="https://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />
- <a href="https://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
+ <td>
+ <a href="https://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a>
</td>
</tr>
@@ -145,10 +145,10 @@
<td><a href="mailto:issues-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:issues-unsubscribe@commons.apache.org">Unsubscribe</a></td>
<td><i>read only</i></td>
- <td><a href="https://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a><br />
+ <td>
<a href="https://lists.apache.org/list.html?issues@commons.apache.org">lists.apache.org</a>
</td>
- <td><a href="https://markmail.org/list/org.apache.commons.issues/">markmail.org</a><br />
+ <td>
<a href="https://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a>
</td>
</tr>
@@ -164,10 +164,10 @@
<td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:commits-unsubscribe@commons.apache.org">Unsubscribe</a></td>
<td><i>read only</i></td>
- <td><a href="https://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a><br />
+ <td>
<a href="https://lists.apache.org/list.html?commits@commons.apache.org">lists.apache.org</a>
</td>
- <td><a href="https://markmail.org/list/org.apache.commons.commits/">markmail.org</a><br />
+ <td>
<a href="https://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a>
</td>
</tr>
@@ -199,13 +199,11 @@
<td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
<td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
<td><i>read only</i></td>
- <td><a class="externalLink" href="https://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a><br />
+ <td>
<a class="externalLink" href="https://lists.apache.org/list.html?announce@apache.org">lists.apache.org</a>
</td>
- <td><a class="externalLink" href="https://markmail.org/list/org.apache.announce/">markmail.org</a><br />
- <a class="externalLink" href="https://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
- <a class="externalLink" href="https://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />
- <a class="externalLink" href="https://news.gmane.org/gmane.comp.apache.announce">news.gmane.org</a>
+ <td>
+ <a class="externalLink" href="https://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a>
</td>
</tr>
</table>
