Prepare for 1.5.4 release.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@835676 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index baf2963..cf95450 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,16 +1,16 @@
- commons-pool-1.5.3 RELEASE NOTES
+ commons-pool-1.5.4 RELEASE NOTES
-This is a patch release containing a fix for POOL-149, a regression introduced in version 1.5.
+This is a patch release containing a fix for POOL-152, a regression introduced in version 1.5.
Changes in this version include:
Fixed Bugs:
-o POOL-149: Fix case where a thread could end up waiting indefinitely even if objects
- were available. Also fixes a couple of leaks in the internal processing
- object count that could lead to pool exhaustion. Thanks to Shuyang Zhou.
+o POOL-152: GenericObjectPool can block forever in borrowObject when the pool is exhausted and a newly created
+ object fails validation. When borrowing an object if a new object is created but validate fails,
+ the latch should not be returned to the queue as an exception will be thrown. Thanks to Bushov Alexander.
diff --git a/build.xml b/build.xml
index 1dd0840..fd5504c 100644
--- a/build.xml
+++ b/build.xml
@@ -40,7 +40,7 @@
<property name="name" value="commons-pool"/>
<property name="title" value="Apache Commons Object Pooling Package"/>
- <property name="version" value="1.5.4-SNAPSHOT"/>
+ <property name="version" value="1.5.4"/>
<property name="package" value="org.apache.commons.pool.*"/>
<property name="src.dir" value="${basedir}/src"/>
diff --git a/pom.xml b/pom.xml
index d925e59..3913aa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
<name>Commons Pool</name>
<inceptionYear>2001</inceptionYear>
@@ -133,7 +133,7 @@
<maven.compile.source>1.3</maven.compile.source>
<maven.compile.target>1.3</maven.compile.target>
<commons.componentid>pool</commons.componentid>
- <commons.release.version>1.5.3</commons.release.version>
+ <commons.release.version>1.5.4</commons.release.version>
<commons.jira.id>POOL</commons.jira.id>
<commons.jira.pid>12310488</commons.jira.pid>
</properties>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 935c07a..4ad5a67 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -18,10 +18,11 @@
<document>
<properties>
<title>Commons Pool Changes</title>
- <author email="sandymac@apache.org">Sandy McArthur</author>
</properties>
<body>
- <release version="1.5.4" date="TBD" description="">
+ <release version="1.5.4" date="TBD" description=
+ "This is a patch release containing a fix for POOL-152, a regression
+introduced in version 1.5.">
<action dev="markt" type="fix" issue="POOL-152" due-to="Bushov Alexander">
GenericObjectPool can block forever in borrowObject when the pool is exhausted and a newly created
object fails validation. When borrowing an object if a new object is created but validate fails,
diff --git a/xdocs/download_pool.xml b/xdocs/download_pool.xml
index 9acbe19..74e5197 100644
--- a/xdocs/download_pool.xml
+++ b/xdocs/download_pool.xml
@@ -102,17 +102,17 @@
<ul class="downloads">
<li class="group"><div class="links"><span class="label">Binary</span></div>
<ul>
- <li class="download"><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.3-bin.tar.gz">1.5.3.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.4-bin.tar.gz">1.5.4.tar.gz</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.3-bin.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.3-bin.tar.gz.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.4-bin.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.4-bin.tar.gz.asc">pgp</a>]</span>
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.3-bin.zip">1.5.3.zip</a>
+ <li class="download"><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.4-bin.zip">1.5.4.zip</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.3-bin.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.3-bin.zip.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.4-bin.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.4-bin.zip.asc">pgp</a>]</span>
</li>
</ul>
</li>
@@ -120,17 +120,17 @@
</li>
<li class="group"><div class="links"><span class="label">Source</span></div>
<ul>
- <li class="download"><a href="[preferred]/commons/pool/source/commons-pool-1.5.3-src.tar.gz">1.5.3.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/pool/source/commons-pool-1.5.4-src.tar.gz">1.5.4.tar.gz</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.3-src.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.3-src.tar.gz.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.4-src.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.4-src.tar.gz.asc">pgp</a>]</span>
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/pool/source/commons-pool-1.5.3-src.zip">1.5.3.zip</a>
+ <li class="download"><a href="[preferred]/commons/pool/source/commons-pool-1.5.4-src.zip">1.5.4.zip</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.3-src.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.3-src.zip.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.4-src.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.4-src.zip.asc">pgp</a>]</span>
</li>
</ul>
</li>
