Tagging 2.3 RC1.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/tags/POOL_2_3_RC1@1647463 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index fbbf547..9544a88 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,13 +1,13 @@
- Apache Commons Pool 2.2 RELEASE NOTES
+ Apache Commons Pool 2.3 RELEASE NOTES
-The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.2.
+The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.3.
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 version 2.0 or 2.1 to 2.2.
+No client code changes are required to migrate from version 2.0, 2.1, or 2.2 to 2.3.
Users of version 1.x should consult the migration guide on the Commons Pool web site.
NOTE: The MBean interfaces (DefaultPooledObjectInfoMBean, GenericKeyedObjectPoolMXBean
@@ -18,20 +18,49 @@
be able to upgrade to a new minor or patch release without requiring code
changes.
-This is a maintenance release that adds a new testOnCreate configuration option and fixes a small number of bugs.
+This is a maintenance release that includes bug fixes and minor enhancements.
-Changes in version 2.2 include:
+Changes in version 2.3 include:
New features:
-o Add a new validation configuration option testOnCreate that tests an
- object immediately after it is created.
+o POOL-262: Made fairness configurable for GenericObjectPool, GenericKeyedObjectPool.
Fixed Bugs:
-o POOL-248: Ensure that if an attempt is made to return an object multiple times that
- the current active and idle object counts are not corrupted. Thanks to Warren Chen.
-o POOL-249: Fix Javadoc issues when building docs with Java 8. Thanks to Ville Skyttä.
-o Fix the remaining Javadoc warnings.
+o POOL-279: Eliminated possibility that DefaultPoolObject#getIdleTimeMillis() could
+ return a negative value. Use by pool implementations would not hit this
+ bug. Thanks to Jacopo Cappellato.
+o POOL-275: Made wrapped BaseProxyHandler.pooledObject volatile.
+o POOL-277: Replace synchronisation with lock-free maxBorrowWaitTimeMillis to
+ increase scalability. Thanks to Lucas Pouzac.
+o POOL-276: Ensure that objects are not validated on borrow when testOnBorrow is set
+ to false, testOnCreate is set to true and the pool is exhausted at the
+ point borrowObject() is called.
+o POOL-270: Fixed error in GenericKeyedObjectPool constructor causing minEvictableIdleTimeMillis
+ to be used in place of timeBetweenEvictionRunsMillis in eviction timer setup
+ when a GenericKeyedObjectPoolConfig instance is supplied to the constructor. Thanks to Michael Berman.
+o POOL-263: Fix a threading issue that meant that concurrent calls to close() and
+ returnObject() could result in some returned objects not being destroyed.
+o POOL-261: Correctly mark cglib as an optional dependency and ensure that the OSGi
+ manifest information reflects that.
+o Improve performance of statistics collection for pools that extend
+ BaseGenericObjectPool.
+o POOL-259: Made client wait time statistics accurate when pools are configured to
+ block indefinitely. Also modified computation to include latency clients
+ experience due to waiting on factory methods.
+o Prevent potential memory leaks when the Pool is dereferenced without being
+ closed.
+o Prevent potential memory leaks with using an Evictor in a container
+ environment.
+o Protect against a user provided eviction policy throwing an exception and
+ stopping the Evictor thread.
+o Use the thread context class loader to load custom eviction policies. This
+ allows application provided eviction policies to be used in a container
+ environment when the pooling implementation is provided by the container.
+o POOL-281: Fix a potential infinite loop in the underlying Deque implementation.
+Changes:
+o POOL-273: Update cglib to 3.1 from 3.0.
+o POOL-274: Update asm-util to 5.0.3 from 4.0.
For complete information on Apache Commons Pool, including instructions on how to submit bug reports,
diff --git a/build.xml b/build.xml
index 0d7c9a7..00018b2 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@
<property name="name" value="commons-pool2"/>
<property name="title" value="Apache Commons Object Pooling Package"/>
- <property name="version" value="2.2-SNAPSHOT"/>
+ <property name="version" value="2.3"/>
<property name="package" value="org.apache.commons.pool2.*"/>
<property name="src.dir" value="${basedir}/src"/>
@@ -57,7 +57,7 @@
<property name="test.failonerror" value="true" />
<property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2013 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2014 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
<property name="javadoc.overview" value="${src.java.dir}/org/apache/commons/pool2/overview.html" />
<property name="javac.optimize" value="false"/>
diff --git a/pom.xml b/pom.xml
index 11a424c..9152f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-pool2</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</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.2</commons.release.version>
+ <commons.release.version>2.3</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>
diff --git a/pool-RC.sh b/pool-RC.sh
index 00117bb..47dfc89 100755
--- a/pool-RC.sh
+++ b/pool-RC.sh
@@ -28,7 +28,7 @@
# $Revision$ $Date$
# -----------------------------------------------------------------------------
# Set script variables
-version=2.1
+version=2.3
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 fcffdd8..04e9438 100755
--- a/pool-pre-RC.sh
+++ b/pool-pre-RC.sh
@@ -25,6 +25,6 @@
#
# $Revision$ $Date$
# ----------------------------------------------------------------------------
-
-mvn changes:announcement-generate -Prelease-notes # [-Dchanges.version=nnn]
-mvn commons:download-page -Dcommons.componentid=pool # Override to get download_pool
+version=2.3
+mvn changes:announcement-generate -Prelease-notes -Dchanges.version=${version}
+mvn commons:download-page -Dcommons.componentid=pool -Dcommons.release.version=${version}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e0d6b4f..99d7845 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,7 +43,8 @@
<title>Apache Commons Pool Changes</title>
</properties>
<body>
- <release version="2.3" date="TBD" description="TBD">
+ <release version="2.3" date="TBD" description=
+"This is a maintenance release that includes bug fixes and minor enhancements.">
<action dev="psteitz" type="fix" issue="POOL-279" due-to="Jacopo Cappellato">
Eliminated possibility that DefaultPoolObject#getIdleTimeMillis() could
return a negative value. Use by pool implementations would not hit this
diff --git a/src/site/xdoc/download_pool.xml b/src/site/xdoc/download_pool.xml
index 3705172..4458ce2 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.2 (Java 6.0+)">
+ <section name="Apache Commons Pool 2.3 (Java 6.0+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz">commons-pool2-2.2-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.3-bin.tar.gz">commons-pool2-2.3-bin.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.3-bin.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.3-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.2-bin.zip">commons-pool2-2.2-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.3-bin.zip">commons-pool2-2.3-bin.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.3-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.3-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.2-src.tar.gz">commons-pool2-2.2-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.3-src.tar.gz">commons-pool2-2.3-src.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.3-src.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.3-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.2-src.zip">commons-pool2-2.2-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.3-src.zip">commons-pool2-2.3-src.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.3-src.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool2-2.3-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
