Tagged 2.4.1 RC1.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/tags/POOL_2_4_1_RC1@1682493 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a315285..92eb3f5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,13 +1,13 @@
- Apache Commons Pool 2.4 RELEASE NOTES
+ Apache Commons Pool 2.4.1 RELEASE NOTES
-The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.4.
+The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.4.1.
Apache Commons Pool provides an object-pooling API and a number of object pool implementations.
Version 2 contains a completely re-written pooling implementation compared to the 1.x series.
In addition to performance and scalability improvements, version 2 includes robust instance
tracking and pool monitoring. Version 2 requires JDK level 1.6 or above.
-No client code changes are required to migrate from versions 2.0-2.3 to version 2.4.
+No client code changes are required to migrate from versions 2.0-2.3 to version 2.4.1.
Users of version 1.x should consult the migration guide on the Commons Pool web site.
NOTE: The MBean interfaces (DefaultPooledObjectInfoMBean, GenericKeyedObjectPoolMXBean
@@ -18,7 +18,14 @@
be able to upgrade to a new minor or patch release without requiring code
changes.
-This is a maintenance release that includes bug fixes and minor enhancements.
+This is a patch release, replacing a defective binary jar in version 2.4. Other
+than the build configuration the source distribution for version 2.4.1 is identical
+to version 2.4.
+
+Changes in version 2.4.1 include:
+
+Fixed Bugs:
+o POOL-297: Reverted coburta plugin update that caused binary jar corruption.
Changes in version 2.4 include:
@@ -44,7 +51,6 @@
o POOL-296: Update asm-util from 5.0.3 to 5.0.4.
o POOL-293: Exposed getEvictionPolicy as protected in BaseGenericObjectPool.
-
For complete information on Apache Commons Pool, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Apache Commons Pool website:
diff --git a/build.xml b/build.xml
index 3195564..86abedb 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
<property name="name" value="commons-pool2"/>
<property name="title" value="Apache Commons Object Pooling Package"/>
- <property name="version" value="2.4-SNAPSHOT"/>
+ <property name="version" value="2.4.1"/>
<property name="package" value="org.apache.commons.pool2.*"/>
<property name="src.dir" value="${basedir}/src"/>
diff --git a/doap_pool.rdf b/doap_pool.rdf
index 99c1fb5..e9c648b 100644
--- a/doap_pool.rdf
+++ b/doap_pool.rdf
@@ -36,6 +36,13 @@
<release>
<Version>
<name>commons-pool</name>
+ <created>2015-05-27</created>
+ <revision>2.3</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>commons-pool</name>
<created>2014-12-30</created>
<revision>2.3</revision>
</Version>
diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml
index ca31e20..01a38a1 100644
--- a/findbugs-exclude-filter.xml
+++ b/findbugs-exclude-filter.xml
@@ -173,4 +173,34 @@
<Method name="equals" />
<Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" />
</Match>
+ <Match>
+ <!-- Code needs to use get to ensure latest queue is retrieved -->
+ <Class name="org.apache.commons.pool2.impl.GenericKeyedObjectPool" />
+ <Method name="clearOldest" />
+ <Bug pattern="WMI_WRONG_MAP_ITERATOR" />
+ </Match>
+ <Match>
+ <!-- Code needs to use get to ensure latest queue is retrieved -->
+ <Class name="org.apache.commons.pool2.impl.GenericKeyedObjectPool" />
+ <Method name="getNumWaitersByKey" />
+ <Bug pattern="WMI_WRONG_MAP_ITERATOR" />
+ </Match>
+ <Match>
+ <!-- Code needs to use get to ensure latest queue is retrieved -->
+ <Class name="org.apache.commons.pool2.impl.GenericKeyedObjectPool" />
+ <Method name="hasBorrowWaiters" />
+ <Bug pattern="WMI_WRONG_MAP_ITERATOR" />
+ </Match>
+ <Match>
+ <!-- Code needs to use get to ensure latest queue is retrieved -->
+ <Class name="org.apache.commons.pool2.impl.GenericKeyedObjectPool" />
+ <Method name="listAllObjects" />
+ <Bug pattern="WMI_WRONG_MAP_ITERATOR" />
+ </Match>
+ <Match>
+ <!-- Code needs to use get to ensure latest queue is retrieved -->
+ <Class name="org.apache.commons.pool2.impl.GenericKeyedObjectPool" />
+ <Method name="reuseCapacity" />
+ <Bug pattern="WMI_WRONG_MAP_ITERATOR" />
+ </Match>
</FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index aae6f3a..9b76413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-pool2</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4.1</version>
<name>Apache Commons Pool</name>
<inceptionYear>2001</inceptionYear>
@@ -150,7 +150,7 @@
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<commons.componentid>pool2</commons.componentid>
- <commons.release.version>2.3</commons.release.version>
+ <commons.release.version>2.4.1</commons.release.version>
<commons.release.desc>(Java 6.0+)</commons.release.desc>
<commons.release.2.version>1.6</commons.release.2.version>
<commons.release.2.desc>(Java 5.0+)</commons.release.2.desc>
@@ -248,7 +248,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
diff --git a/pool-RC.sh b/pool-RC.sh
index f4e5c89..a915295 100755
--- a/pool-RC.sh
+++ b/pool-RC.sh
@@ -28,7 +28,7 @@
# $Revision$ $Date$
# -----------------------------------------------------------------------------
# Set script variables
-version=2.4
+version=2.4.1
repo_path=~/.m2/repository/org/apache/commons/commons-pool2/${version}
release_path=~/pool-rc #checkout of https://dist.apache.org/repos/dist/dev/commons/pool
#
diff --git a/pool-pre-RC.sh b/pool-pre-RC.sh
index da5acc8..7ca1e36 100755
--- a/pool-pre-RC.sh
+++ b/pool-pre-RC.sh
@@ -25,6 +25,6 @@
#
# $Revision$ $Date$
# ----------------------------------------------------------------------------
-version=2.4
+version=2.4.1
mvn changes:announcement-generate -Prelease-notes -Dchanges.version=${version}
mvn commons:download-page -Dcommons.componentid=pool -Dcommons.release.version=${version}
diff --git a/pool-release.sh b/pool-release.sh
index 60acde3..6c23f9e 100755
--- a/pool-release.sh
+++ b/pool-release.sh
@@ -31,8 +31,8 @@
# $Revision$ $Date$
# -----------------------------------------------------------------------------
# Set script variables
-version=2.4 # version being released
-last_version=2.3 # previous version, will be replaced in README.html
+version=2.4.1 # version being released
+last_version=2.4 # previous version, will be replaced in README.html
rc_path=~/pool-rc # checkout of https://dist.apache.org/repos/dist/dev/commons/pool
release_path=~/pool-release #https://dist.apache.org/repos/dist/release/commons/pool
#
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d85168d..21a8493 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,7 +43,15 @@
<title>Apache Commons Pool Changes</title>
</properties>
<body>
- <release version="2.4" date="TBD" description=
+ <release version="2.4.1" date="TBD" description=
+ "This is a patch release, replacing a defective binary jar in version 2.4. Other
+than the build configuration, the source distribution for version 2.4.1 is identical
+to version 2.4.">
+ <action dev="psteitz" issue="POOL-297" type="fix">
+ Reverted coburta plugin update that caused binary jar corruption.
+ </action>
+ </release>
+ <release version="2.4" date="2015-05-27" description=
"This is a maintenance release that includes bug fixes and minor enhancements.">
<action dev="psteitz" type="fix" issue="POOL-287" due-to="Caleb Spare and Thomas Neidhart">
Fixed capacity leak when an object is offered from a GenericKeyedObjectPool while it is
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index 00ade07..26ba77c 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -23,7 +23,7 @@
In addition to performance and scalability improvements, version 2 includes robust instance
tracking and pool monitoring. Version 2 requires JDK level 1.6 or above.
-No client code changes are required to migrate from versions 2.0-2.3 to version 2.4.
+No client code changes are required to migrate from versions 2.0-2.3 to version 2.4.1.
Users of version 1.x should consult the migration guide on the Commons Pool web site.
NOTE: The MBean interfaces (DefaultPooledObjectInfoMBean, GenericKeyedObjectPoolMXBean
diff --git a/src/site/site.xml b/src/site/site.xml
index 7aa6d67..5818027 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -31,6 +31,7 @@
<item name="Javadoc (2.1 release)" href="http://commons.apache.org/proper/commons-pool/api-2.1/index.html"/>
<item name="Javadoc (2.2 release)" href="http://commons.apache.org/proper/commons-pool/api-2.2/index.html"/>
<item name="Javadoc (2.3 release)" href="http://commons.apache.org/proper/commons-pool/api-2.3/index.html"/>
+ <item name="Javadoc (2.4 release)" href="http://commons.apache.org/proper/commons-pool/api-2.4/index.html"/>
<item name="Examples" href="/examples.html"/>
<item name="Downloads" href="/download_pool.cgi"/>
<item name="Wiki" href="http://wiki.apache.org/commons/Pool"/>
diff --git a/src/site/xdoc/download_pool.xml b/src/site/xdoc/download_pool.xml
index c6ab6b6..aa62618 100644
--- a/src/site/xdoc/download_pool.xml
+++ b/src/site/xdoc/download_pool.xml
@@ -95,32 +95,32 @@
</p>
</subsection>
</section>
- <section name="Apache Commons Pool 2.4 (Java 6.0+)">
+ <section name="Apache Commons Pool 2.4.1 (Java 6.0+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4-bin.tar.gz">commons-pool2-2.4-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.1-bin.tar.gz">commons-pool2-2.4.1-bin.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.1-bin.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.1-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4-bin.zip">commons-pool2-2.4-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.1-bin.zip">commons-pool2-2.4.1-bin.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.1-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.1-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4-src.tar.gz">commons-pool2-2.4-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.1-src.tar.gz">commons-pool2-2.4.1-src.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.1-src.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.1-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4-src.zip">commons-pool2-2.4-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.1-src.zip">commons-pool2-2.4.1-src.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.1-src.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.1-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
