Prepare release.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e54803..97eb3d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,47 +51,65 @@
+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons DBCP's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
+ Clearly describe the issue including steps to reproduce when it is a bug.
+ Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
Making Changes
--------------
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+ * Usually you should base your branch on the `master` or `trunk` branch.
+ * 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.
+ * e.g. `DBCP-123: Close input stream earlier`
+ Respect the original code style:
+ Only use spaces for indentation.
- + 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.
- + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+ + 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.
+ + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
Making Trivial Changes
----------------------
+The JIRA tickets are used to generate the changelog for the next release.
+
For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
+
Submitting Changes
------------------
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+ * Note that small patches & typical bug fixes do not require a CLA as
+ clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+ covers them.
+ Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+ * Verify _Files Changed_ shows only your intended changes and does not
+ include additional files like `target/*.class`
+ Update your JIRA ticket and include a link to the pull request in the ticket.
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
Additional Resources
--------------------
+ [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons DBCP JIRA project page](https://issues.apache.org/jira/browse/DBCP)
++ [Apache Commons DBCP JIRA project page][jira]
+ [Contributor License Agreement][cla]
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
[cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/DBCP
diff --git a/NOTICE.txt b/NOTICE.txt
index a705344..0d296b6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons DBCP
-Copyright 2001-2016 The Apache Software Foundation
+Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index a4b8cb9..e6599b6 100644
--- a/README.md
+++ b/README.md
@@ -43,15 +43,17 @@
Apache Commons DBCP
===================
-[](https://travis-ci.org/apache/commons-dbcp)
+[](https://travis-ci.org/apache/commons-dbcp2)
+[](https://coveralls.io/r/apache/commons-dbcp2)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/)
+[](http://www.apache.org/licenses/LICENSE-2.0.html)
Apache Commons DBCP software implements Database Connection Pooling
Documentation
-------------
-More information can be found on the [Apache Commons DBCP homepage](https://commons.apache.org/proper/commons-dbcp).
+More information can be found on the [Apache Commons DBCP homepage](https://commons.apache.org/proper/commons-dbcp2).
The [JavaDoc](https://commons.apache.org/proper/commons-dbcp2/javadocs/api-release) can be browsed.
Questions related to the usage of Apache Commons DBCP should be posted to the [user mailing list][ml].
@@ -65,7 +67,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
</dependency>
```
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 74cd94c..e0f3648 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,8 +1,8 @@
Apache Apache Commons DBCP
- Version 2.2
+ Version 2.2.0
RELEASE NOTES
-The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.2.
+The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.2.0.
Apache Commons DBCP software implements Database Connection Pooling.
@@ -12,8 +12,20 @@
New features:
o DBCP-451: Add constructor DriverManagerConnectionFactory(String).
+o DBCP-462: Refactoring to prepare for a future patch to enable pooling of all
+ prepared and callable statements in PoolingConnection. Thanks to Keiichi Fujino.
+o DBCP-458: Make it simpler to extend BasicDataSource to allow sub-classes to
+ provide custom GenericObjectPool implementations. Thanks to Adrian Tarau.
+o DBCP-474: Enable pooling of all prepared and callable statements
+ inPoolingConnection. Thanks to Keiichi Fujino.
Fixed Bugs:
+o DBCP-481: Update Apache Commons Pool from 2.4.2 to 2.5.0. Thanks to Gary Gregory.
+o DBCP-454: OSGi declarations contain multiple import headers for javax.transaction. Thanks to Philipp Marx, Matt Sicker.
+o DBCP-478: Wrong parameter name in site documentation for BasicDataSource Configuration Parameters. Thanks to nicola mele.
+o DBCP-452: Add jmxName to properties set by BasicDataSourceFactory. This
+ enables container-managed pools created from JNDI Resource
+ definitions to enable JMX by supplying a valid root JMX name.
o DBCP-446: NullPointerException thrown when calling ManagedConnection.isClosed(). Thanks to Gary Gregory, feng yang, Euclides M, Phil Steitz.
o DBCP-444: InvalidateConnection can result in closed connection returned by getConnection.
o DBCP-449: Complete the fix for DBCP-418, enabling PoolableConnection class to load in environments
@@ -24,6 +36,20 @@
BasicDataSource. Thanks to Philipp Marx.
o DBCP-456: Correct the name of the configuration attribute
softMinEvictableIdleTimeMillis. Thanks to Kyohei Nakamura.
+o DBCP-472: Avoid potential infinite loops when checking if an SQLException is fatal
+ for a connection or not.
+o DBCP-468: Expand the fail-fast for fatal connection errors feature to include
+ managed connections.
+o DBCP-463: Correct a typo in the method name
+ PoolableConnectionFactory#setMaxOpenPreparedStatements. The old method
+ remains but is deprecated so not to break clients currently using the
+ incorrect name.
+o DBCP-459: Ensure that a thread's interrupt status is visible to the caller if the
+ thread is interrupted during a call to
+ PoolingDataSource.getConnection().
+o DBCP-457: When using a BasicDataSource, pass changes related to the handling of
+ abandoned connections to the underlying pool so that the pool
+ configuration may be updated dynamically.
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index dd10315..981d797 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -54,7 +54,7 @@
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>
+ <li>[dbcp2] Problem with the ...</li>
</ul>
</p>
<p>
@@ -79,7 +79,7 @@
<section name="Apache Commons DBCP Mailing Lists">
<p>
<strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons DBCP</a>
- with <i>[dbcp]</i></strong> - <i>thanks!</i>
+ with <i>[dbcp2]</i></strong> - <i>thanks!</i>
<br />
<br />
</p>
@@ -104,7 +104,7 @@
</td>
<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="mailto:user@commons.apache.org?subject=[dbcp2]">Post</a></td>
<td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
<td><a href="http://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />
<a href="http://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />
@@ -122,7 +122,7 @@
</td>
<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="mailto:dev@commons.apache.org?subject=[dbcp2]">Post</a></td>
<td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
<td><a href="http://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />
<a href="http://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />
@@ -152,7 +152,7 @@
<td>
<strong>Commons Commits List</strong>
<br /><br />
- Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> system.
+ Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem.
<br /><br />
</td>
<td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>
