This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 20036fae29e1fa3f3d932041e7e347ddfeae7a2e Author: Gary Gregory <[email protected]> AuthorDate: Tue Jul 30 09:41:54 2019 -0400 Revert "[DBCP-548] Update Apache Commons Pool from 2.6.1 to 2.7.0." This reverts commit f5d63237102dfc5bdbf059e6ad308215d4e8c1dc. --- pom.xml | 10 +++++----- src/changes/changes.xml | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 59401e2..04e3b2f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>commons-dbcp2</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <name>Apache Commons DBCP</name> <inceptionYear>2001</inceptionYear> @@ -286,7 +286,7 @@ <commons.rc.version>RC1</commons.rc.version> <commons.module.name>org.apache.commons.dbcp2</commons.module.name> - <commons.release.version>2.7.0</commons.release.version> + <commons.release.version>2.6.0</commons.release.version> <commons.release.desc>for JDBC 4.2 on Java 8</commons.release.desc> <commons.release.2.version>2.4.0</commons.release.2.version> @@ -310,13 +310,13 @@ <!-- Override CP version until that is updated --> <commons.checkstyle.version>3.0.0</commons.checkstyle.version> <!-- Constant for Commons Pool version (used in multiple places) --> - <commons.pool.version>2.7.0</commons.pool.version> - <commons.japicmp.version>0.14.1</commons.japicmp.version> + <commons.pool.version>2.6.1</commons.pool.version> + <commons.japicmp.version>0.13.0</commons.japicmp.version> <!-- 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.6.2</commons.bc.version> + <commons.bc.version>2.5.0</commons.bc.version> <commons.release.isDistModule>true</commons.release.isDistModule> <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName> <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ce7977e..706254c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -60,7 +60,7 @@ The <action> type attribute can be add,update,fix,remove. --> <body> - <release version="2.7.0" date="2019-MM-DD" description="This is a minor release, including bug fixes and enhancements."> + <release version="2.6.1" date="2019-MM-DD" description="This is a minor release, including bug fixes and enhancements."> <action dev="ggregory" type="update" due-to="Gary Gregory"> Update tests from com.h2database:h2 1.4.197 to 1.4.199. </action> @@ -76,9 +76,6 @@ The <action> type attribute can be add,update,fix,remove. <action dev="ggregory" type="update" due-to="Gary Gregory"> Update tests from org.mockito:mockito-core 2.28.2 to 3.0.0. </action> - <action dev="ggregory" type="update" issue="DBCP-548" due-to="Gary Gregory"> - Update Apache Commons Pool from 2.6.1 to 2.7.0. - </action> </release> <release version="2.6.0" date="2019-02-14" description="This is a minor release, including bug fixes and enhancements."> <action dev="chtompki" type="add" issue="DBCP-534" due-to="Peter Wicks">
