Repository: commons-dbcp Updated Branches: refs/heads/master a3e1e88bf -> 9f4ececeb
Prepare for releasing 2.4.0. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/9f4ecece Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9f4ecece Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9f4ecece Branch: refs/heads/master Commit: 9f4ececebc793e9121cafead0bdac17e83b959dc Parents: a3e1e88 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 10 08:56:11 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 10 08:56:11 2018 -0600 ---------------------------------------------------------------------- CONTRIBUTING.md | 2 +- README.md | 16 ++++++++-------- pom.xml | 12 ++++++++---- src/site/xdoc/download_dbcp.xml | 26 +++++++++++++------------- src/site/xdoc/mail-lists.xml | 8 ++++---- 5 files changed, 34 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9f4ecece/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da4e203..d8821d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ Additional Resources + [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/) ++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) + `#apache-commons` IRC channel on `irc.freenode.net` http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9f4ecece/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 0f52532..0f55474 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,23 @@ Apache Commons DBCP =================== -[](https://travis-ci.org/apache/commons-dbcp2) -[](https://coveralls.io/r/apache/commons-dbcp2) +[](https://travis-ci.org/apache/commons-dbcp) +[](https://coveralls.io/r/apache/commons-dbcp) [](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/) -[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.3.0) +[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.4.0) -Apache Commons DBCP software implements Database Connection Pooling +${project.description} Documentation ------------- -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. +More information can be found on the [Apache Commons DBCP homepage](https://commons.apache.org/proper/commons-dbcp). +The [Javadoc](https://commons.apache.org/proper/commons-dbcp/javadocs/api-release) 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? ----------------------------------- -You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-dbcp2/download_dbcp2.cgi). +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: @@ -67,7 +67,7 @@ Alternatively you can pull it from the central Maven repositories: <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> ``` http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9f4ecece/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 68ec674..e66733b 100644 --- a/pom.xml +++ b/pom.xml @@ -258,12 +258,10 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> - <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/dbcp/</commons.distSvnStagingUrl> - <commons.release.isDistModule>true</commons.release.isDistModule> - <commons.componentid>dbcp2</commons.componentid> + <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.3.0</commons.release.version> + <commons.release.version>2.4.0</commons.release.version> <commons.release.desc>for JDBC 4.1 (Java 7.0+)</commons.release.desc> <commons.release.2.version>1.4</commons.release.2.version> <commons.release.2.desc>for JDBC 4 (Java 6.0)</commons.release.2.desc> @@ -285,6 +283,12 @@ <!-- See DBCP-445 and DBCP-454 --> <commons.osgi.import>javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*</commons.osgi.import> <commons.japicmp.ignoreMissingClasses>true</commons.japicmp.ignoreMissingClasses> + <!-- Commons Release Plugin --> + <commons.bc.version>2.3.0</commons.bc.version> + <commons.release.isDistModule>true</commons.release.isDistModule> + <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl> + <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName> + <commons.releaseManagerKey>2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB</commons.releaseManagerKey> </properties> <build> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9f4ecece/src/site/xdoc/download_dbcp.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/download_dbcp.xml b/src/site/xdoc/download_dbcp.xml index 130acbf..812a4c7 100644 --- a/src/site/xdoc/download_dbcp.xml +++ b/src/site/xdoc/download_dbcp.xml @@ -111,32 +111,32 @@ limitations under the License. </p> </subsection> </section> - <section name="Apache Commons DBCP 2.3.0 for JDBC 4.1 (Java 7.0+)"> + <section name="Apache Commons DBCP 2.4.0 for JDBC 4.1 (Java 7.0+)"> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.tar.gz">commons-dbcp2-2.3.0-bin.tar.gz</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.tar.gz.sha1";>sha1</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.4.0-bin.tar.gz">commons-dbcp2-2.4.0-bin.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.4.0-bin.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.4.0-bin.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.zip">commons-dbcp2-2.3.0-bin.zip</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.zip.sha1";>sha1</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.3.0-bin.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.4.0-bin.zip">commons-dbcp2-2.4.0-bin.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.4.0-bin.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.4.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.3.0-src.tar.gz">commons-dbcp2-2.3.0-src.tar.gz</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.3.0-src.tar.gz.sha1";>sha1</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.3.0-src.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.4.0-src.tar.gz">commons-dbcp2-2.4.0-src.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.4.0-src.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.4.0-src.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.3.0-src.zip">commons-dbcp2-2.3.0-src.zip</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.3.0-src.zip.sha1";>sha1</a></td> - <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.3.0-src.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.4.0-src.zip">commons-dbcp2-2.4.0-src.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.4.0-src.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.4.0-src.zip.asc";>pgp</a></td> </tr> </table> </subsection> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9f4ecece/src/site/xdoc/mail-lists.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 981d797..905a6e9 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -54,7 +54,7 @@ limitations under the License. the convention in Commons is to prefix the subject line of messages with the component's name, for example: <ul> - <li>[dbcp2] Problem with the ...</li> + <li>[dbcp] Problem with the ...</li> </ul> </p> <p> @@ -79,7 +79,7 @@ limitations under the License. <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>[dbcp2]</i></strong> - <i>thanks!</i> + with <i>[dbcp]</i></strong> - <i>thanks!</i> <br /> <br /> </p> @@ -104,7 +104,7 @@ limitations under the License. </td> <td><a href="mailto:user-subscr...@commons.apache.org";>Subscribe</a></td> <td><a href="mailto:user-unsubscr...@commons.apache.org";>Unsubscribe</a></td> - <td><a href="mailto:u...@commons.apache.org?subject=[dbcp2]";>Post</a></td> + <td><a href="mailto:u...@commons.apache.org?subject=[dbcp]";>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 @@ limitations under the License. </td> <td><a href="mailto:dev-subscr...@commons.apache.org";>Subscribe</a></td> <td><a href="mailto:dev-unsubscr...@commons.apache.org";>Unsubscribe</a></td> - <td><a href="mailto:d...@commons.apache.org?subject=[dbcp2]";>Post</a></td> + <td><a href="mailto:d...@commons.apache.org?subject=[dbcp]";>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 />
