This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 5b05ea608a9bbe7ad4b4dd9c5b5dcee6bbd437b3 Author: Gary Gregory <[email protected]> AuthorDate: Thu Dec 11 22:56:18 2025 +0000 Prepare for the next release candidate --- CONTRIBUTING.md | 4 +- README.md | 8 ++-- RELEASE-NOTES.txt | 96 ++++++++++++++++++++++++++++++++++++++++ pom.xml | 9 ---- src/changes/changes.xml | 2 +- src/changes/release-notes.vm | 2 +- src/site/xdoc/download_dbcp.xml | 34 +++++++------- src/site/xdoc/issue-tracking.xml | 12 ++--- src/site/xdoc/mail-lists.xml | 12 ++--- 9 files changed, 136 insertions(+), 43 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2e82f3f..65d8e317 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,11 +61,11 @@ Making Changes + Create a _topic branch_ for your isolated work. * Usually you should base your branch from the `master` branch. - * A good topic branch name can be the JIRA bug ID plus a keyword, for example, `DBCP-123-InputStream`. + * A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `DBCP-123-InputStream`. * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests. + Make commits of logical units. * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue. - * For example, `[DBCP-123] Close input stream earlier` + * For example, `[DBCP-123] Close input stream sooner` + Respect the original code style: + Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing. + 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 first. diff --git a/README.md b/README.md index 47a8e6f0..a609a2ee 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Apache Commons DBCP [](https://github.com/apache/commons-dbcp/actions/workflows/maven.yml) [](https://search.maven.org/artifact/org.apache.commons/commons-dbcp2) -[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.13.0) +[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.14.0) [](https://github.com/apache/commons-dbcp/actions/workflows/codeql-analysis.yml) [](https://api.securityscorecards.dev/projects/github.com/apache/commons-dbcp) @@ -68,7 +68,7 @@ Alternatively, you can pull it from the central Maven repositories: <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> - <version>2.13.0</version> + <version>2.14.0</version> </dependency> ``` @@ -89,8 +89,8 @@ There are some guidelines which will make applying PRs easier for us: + 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`. -+ Before you pushing a PR, run `mvn` (by itself), this runs the default goal, which contains all build checks. -+ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false` ++ Before you push a PR, run `mvn` (without arguments). This runs the default goal which contains all build checks. ++ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false -Pjacoco` If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas). You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md). diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 379931bd..38a62eb5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,99 @@ +Apache Commons DBCP 2.14.0 Release Notes +---------------------------------------- + +The Apache Commons DBCP team is pleased to announce the release of Apache Commons DBCP 2.14.0. + +Apache Commons DBCP software implements Database Connection Pooling. + +This is a minor release, including bug fixes and enhancements. + +Changes +------- +New features: +* Add org.apache.commons.dbcp2.datasources.PooledConnectionManager.setPassword(char[]). Thanks to Gary Gregory. + +Fixed Bugs +---------- +* DBCP-597: Validation query not timing out on connections managed by SharedPoolDataSource. Thanks to Xiaotian Bai, Raju Gupta, Gary Gregory. +* DBCP-597: Validation query not timing out on connections managed by PerUserPoolDataSource. Thanks to Gary Gregory. +* DBCP-597: KeyedCPDSConnectionFactory.validateObject(UserPassKey, PooledObject) ignores timeouts less than 1 second when there is no validation query. Thanks to Gary Gregory. +* Modernize tests to use JUnit 5 features. Thanks to Gary Gregory. +* Javadoc is missing its Overview page. Thanks to Gary Gregory. +* Deprecate org.apache.commons.dbcp2.Jdbc41Bridge.Jdbc41Bridge(), constructor will be private in the next major release. Thanks to Gary Gregory. +* Deprecate org.apache.commons.dbcp2.Constants.Constants(), constructor will be private in the next major release. Thanks to Gary Gregory. +* Fix Javadoc warnings on Java 17. Thanks to Gary Gregory. +* Fix Javadoc warnings on Java 21. Thanks to Gary Gregory. +* Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80). Thanks to Gary Gregory. +* XAException thrown by LocalXAResource now all include a message. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "isSharedConnection" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.managed.ManagedConnection] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "closed" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.PooledConnectionImpl] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "closed" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.DelegatingStatement] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "cacheState" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.DelegatingConnection] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Operation on the "fatalSqlExceptionThrown" shared variable in "PoolableConnection" class is not atomic [org.apache.commons.dbcp2.PoolableConnection] AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "clearStatementPoolOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolingConnection] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "maxTotal" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.SharedPoolDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultBlockWhenExhausted" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultLifo" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultMaxIdle" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultMaxTotal" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultMinIdle" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultNumTestsPerEvictionRun" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTestOnBorrow" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTestOnCreate" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTestOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTestWhileIdle" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTransactionIsolation" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "rollbackAfterValidation" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.datasources.InstanceKeyDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "loginTimeout" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS] At DriverAdapterCPDS.java:[line 644] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "maxIdle" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS] At DriverAdapterCPDS.java:[line 664] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "maxPreparedStatements" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS] At DriverAdapterCPDS.java:[line 673] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "numTestsPerEvictionRun" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS] At DriverAdapterCPDS.java:[line 722] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "poolPreparedStatements" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS] At DriverAdapterCPDS.java:[line 757] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "autoCommitOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory-] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "cacheState" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "clearStatementPoolOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "defaultTransactionIsolation" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "autoCommitOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "fastFailValidation" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "maxOpenPreparedStatements" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "poolStatements" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "rollbackOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.PoolableConnectionFactory] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "autoCommitOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbc-p2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "cacheState" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "clearStatementPoolOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "autoCommitOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "fastFailValidation" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "logExpiredConnections" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "registerConnectionMBean" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix SpotBugs [ERROR] Medium: Shared primitive variable "rollbackOnReturn" in one thread may not yield the value of the most recent write from another thread [org.apache.commons.dbcp2.BasicDataSource] AT_STALE_THREAD_WRITE_OF_PRIMITIVE. Thanks to Gary Gregory. +* Fix a potential resource leak if an SQLException occurs during an attempt to obtain an XAConnection. Thanks to Coverity Scan. +* Minor optimisations to the processing of the "connectionProperties" string. Thanks to Coverity Scan. + +Changes +------- +* Update tests and CPDSConnectionFactory#invalidate to accomodate changed behavior in the fix for POOL-424. +* Bump org.apache.commons:commons-parent from 78 to 93 #521, #537, #538. Thanks to Gary Gregory. +* Bump org.apache.commons:commons-pool2 from 2.12.0 to 2.13.0 #474. Thanks to Gary Gregory. +* Port site from Doxia 1 to 2. Thanks to Gary Gregory. +* Bump commons-logging:commons-logging from 1.3.4 to 1.3.5. Thanks to Gary Gregory. +* Bump org.slf4j:slf4j-simple from 2.0.16 to 2.0.17 #481. Thanks to Gary Gregory. +* Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.20.0 #506. Thanks to Gary Gregory, Dependabot. + +Removed +------- +* Removed internal constructors and methods from the package-private class CPDSConnectionFactory; this is binary compatible. Thanks to Gary Gregory. +* Removed an internal constructor and methods from the package-private class KeyedCPDSConnectionFactory; this is binary compatible. Thanks to Gary Gregory. + +The list of changes is here: https://commons.apache.org/proper/commons-dbcp/changes.html + +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/proper/commons-dbcp/ + +Download page: https://commons.apache.org/proper/commons-dbcp/download_dbcp.cgi + +----------------------------------------------------------------------------- Apache Commons DBCP 2.13.0 Release Notes ---------------------------------------- diff --git a/pom.xml b/pom.xml index 19d9d2d2..0478bec6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,11 +28,9 @@ <artifactId>commons-dbcp2</artifactId> <version>2.14.0-SNAPSHOT</version> <name>Apache Commons DBCP</name> - <inceptionYear>2001</inceptionYear> <description>Apache Commons DBCP software implements Database Connection Pooling</description> <url>https://commons.apache.org/proper/commons-dbcp/</url> - <distributionManagement> <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> <site> @@ -41,11 +39,9 @@ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-dbcp/</url> </site> </distributionManagement> - <issueManagement> <url>https://issues.apache.org/jira/browse/DBCP</url> </issueManagement> - <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/commons-dbcp.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-dbcp.git</developerConnection> @@ -56,7 +52,6 @@ <system>GitHub</system> <url>https://github.com/apache/commons-dbcp/actions</url> </ciManagement> - <dependencies> <dependency> <groupId>org.apache.commons</groupId> @@ -161,7 +156,6 @@ <scope>test</scope> </dependency> </dependencies> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -172,16 +166,13 @@ <commons.componentid>dbcp</commons.componentid> <commons.rc.version>RC1</commons.rc.version> <commons.module.name>org.apache.commons.dbcp2</commons.module.name> - <commons.release.version>2.14.0</commons.release.version> <commons.release.next>2.14.1</commons.release.next> <commons.release.desc>for JDBC 4.2 on Java 8</commons.release.desc> <commons.release.hash>sha512</commons.release.hash> - <commons.release.2.version>2.4.0</commons.release.2.version> <commons.release.2.desc>for JDBC 4.1 on Java 7</commons.release.2.desc> <commons.release.2.hash>sha256</commons.release.2.hash> - <commons.site.path>dbcp</commons.site.path> <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-dbcp</commons.scmPubUrl> <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 02eac221..74804b04 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -62,7 +62,7 @@ The <action> type attribute can be add,update,fix,remove. EvictionTimer --> <body> - <release version="2.14.0" date="YYYY-MM-DD" description="This is a minor release, including bug fixes and enhancements."> + <release version="2.14.0" date="2025-12-11" description="This is a minor release, including bug fixes and enhancements."> <!-- FIX --> <action type="fix" issue="DBCP-597" dev="ggregory" due-to="Xiaotian Bai, Raju Gupta, Gary Gregory">Validation query not timing out on connections managed by SharedPoolDataSource.</action> <action type="fix" issue="DBCP-597" dev="ggregory" due-to="Gary Gregory">Validation query not timing out on connections managed by PerUserPoolDataSource.</action> diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm index 5c333392..487a239a 100644 --- a/src/changes/release-notes.vm +++ b/src/changes/release-notes.vm @@ -15,7 +15,7 @@ ## specific language governing permissions and limitations ## under the License. ${project.name} ${version} Release Notes ------------------------------------------------- +---------------------------------------- The ${developmentTeam} is pleased to announce the release of ${project.name} ${version}. diff --git a/src/site/xdoc/download_dbcp.xml b/src/site/xdoc/download_dbcp.xml index 7f62a978..7422a205 100644 --- a/src/site/xdoc/download_dbcp.xml +++ b/src/site/xdoc/download_dbcp.xml @@ -56,10 +56,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Download Apache Commons DBCP</title> - <author email="[email protected]">Apache Commons Documentation Team</author> + <author email="[email protected]">Apache Commons Team</author> </properties> <body> <section name="Download Apache Commons DBCP"> @@ -79,7 +81,7 @@ limitations under the License. mirrors (at the end of the mirrors list) that should be available. <br></br> - [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end] + [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" alt="Logo"></img></a>[end] </p> <form action="[location]" method="get" id="SelectMirror"> @@ -113,32 +115,32 @@ limitations under the License. </p> </subsection> </section> - <section name="Apache Commons DBCP 2.13.0 for JDBC 4.2 on Java 8"> + <section name="Apache Commons DBCP 2.14.0 for JDBC 4.2 on Java 8"> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.tar.gz">commons-dbcp2-2.13.0-bin.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.tar.gz.sha512";>sha512</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.14.0-bin.tar.gz">commons-dbcp2-2.14.0-bin.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.14.0-bin.tar.gz.sha512";>sha512</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.14.0-bin.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.zip">commons-dbcp2-2.13.0-bin.zip</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.zip.sha512";>sha512</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.13.0-bin.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.14.0-bin.zip">commons-dbcp2-2.14.0-bin.zip</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.14.0-bin.zip.sha512";>sha512</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/binaries/commons-dbcp2-2.14.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.13.0-src.tar.gz">commons-dbcp2-2.13.0-src.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.13.0-src.tar.gz.sha512";>sha512</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.13.0-src.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.14.0-src.tar.gz">commons-dbcp2-2.14.0-src.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.14.0-src.tar.gz.sha512";>sha512</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.14.0-src.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.13.0-src.zip">commons-dbcp2-2.13.0-src.zip</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.13.0-src.zip.sha512";>sha512</a></td> - <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.13.0-src.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.14.0-src.zip">commons-dbcp2-2.14.0-src.zip</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.14.0-src.zip.sha512";>sha512</a></td> + <td><a href="https://downloads.apache.org/commons/dbcp/source/commons-dbcp2-2.14.0-src.zip.asc";>pgp</a></td> </tr> </table> </subsection> diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index ce7c6a99..9023e245 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -41,10 +41,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Apache Commons DBCP Issue tracking</title> - <author email="[email protected]">Apache Commons Documentation Team</author> + <author email="[email protected]">Apache Commons Team</author> </properties> <body> @@ -64,6 +66,7 @@ limitations under the License. <p> If you would like to report a bug, or raise an enhancement request with Apache Commons DBCP please do the following: + </p> <ol> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>Search existing open bugs</a>. If you find your issue listed then please add a comment with your details.</li> @@ -73,16 +76,15 @@ limitations under the License. <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310469&issuetype=1&priority=4&assignee=-1";>bug report</a> or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310469&issuetype=4&priority=4&assignee=-1";>enhancement request</a>.</li> </ol> - </p> <p> Please also remember these points: + </p> <ul> <li>the more information you provide, the better we can help you</li> <li>test cases are vital, particularly for any proposed enhancements</li> <li>the developers of Apache Commons DBCP are all unpaid volunteers</li> </ul> - </p> <p> For more information on creating patches see the @@ -91,12 +93,12 @@ limitations under the License. <p> You may also find these links useful: + </p> <ul> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>All Open Apache Commons DBCP bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All Resolved Apache Commons DBCP bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC";>All Apache Commons DBCP bugs</a></li> </ul> - </p> </section> </body> </document> diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index a8a817c7..d1872225 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -39,10 +39,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Apache Commons DBCP Mailing Lists</title> - <author email="[email protected]">Apache Commons Documentation Team</author> + <author email="[email protected]">Apache Commons Team</author> </properties> <body> @@ -53,10 +55,10 @@ limitations under the License. To make it easier for people to only read messages related to components they are interested in, the convention in Commons is to prefix the subject line of messages with the component's name, for example: - <ul> - <li>[dbcp] Problem with the ...</li> - </ul> </p> + <ul> + <li>[dbcp] Problem with the ...</li> + </ul> <p> Questions related to the usage of Apache Commons DBCP should be posted to the <a href="https://lists.apache.org/[email protected]";>User List</a>.
