On Mon, 20 Jan 2025 at 13:31, <ggreg...@apache.org> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > ggregory pushed a commit to branch POOL_2_X > in repository https://gitbox.apache.org/repos/asf/commons-pool.git > > > The following commit(s) were added to refs/heads/POOL_2_X by this push: > new f8d7bedc Prepare for the next release candidate > f8d7bedc is described below > > commit f8d7bedc2981b4e0608cdf350faae08b1d8050a9 > Author: Gary D. Gregory <garydgreg...@gmail.com> > AuthorDate: Mon Jan 20 13:31:19 2025 +0000 > > Prepare for the next release candidate > --- > CONTRIBUTING.md | 16 ++++---- > README.md | 87 > ++++++++++------------------------------ > RELEASE-NOTES.txt | 50 +++++++++++++++++++++++ > pom.xml | 8 ++-- > src/changes/changes.xml | 3 +- > src/changes/release-notes.vm | 5 ++- > src/site/xdoc/download_pool.xml | 34 ++++++++-------- > src/site/xdoc/issue-tracking.xml | 14 ++++--- > src/site/xdoc/mail-lists.xml | 52 ++++++++++++------------ > 9 files changed, 140 insertions(+), 129 deletions(-) > > diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md > index 5814970d..20ce6095 100644 > --- a/CONTRIBUTING.md > +++ b/CONTRIBUTING.md > @@ -6,7 +6,7 @@ > (the "License"); you may not use this file except in compliance with > the License. You may obtain a copy of the License at > > - http://www.apache.org/licenses/LICENSE-2.0 > + https://www.apache.org/licenses/LICENSE-2.0 > > Unless required by applicable law or agreed to in writing, software > distributed under the License is distributed on an "AS IS" BASIS, > @@ -41,28 +41,27 @@ > Contributing to Apache Commons Pool > ====================== > > -You have found a bug or you have an idea for a cool new feature? > Contributing code is a great way to give something back to > -the open source community. Before you dig right into the code there are a > few guidelines that we need contributors to > -follow so that we can have a chance of keeping on top of things. > +Have you found a bug or have an idea for a cool new feature? Contributing > code is a great way to give something back to the open-source community. > +Before you dig right into the code, we need contributors to follow a few > guidelines to have a chance of keeping on top of things. > > Getting Started > --------------- > > + Make sure you have a [JIRA account](https://issues.apache.org/jira/). > -+ Make sure you have a [GitHub account](https://github.com/signup/free). > ++ Make sure you have a [GitHub account](https://github.com/signup/free). > This is not essential, but makes providing patches much easier. > + If you're planning to implement a new feature it makes sense to discuss > your changes on the [dev list](https://commons.apache.org/mail-lists.html) > first. This way you can make sure you're not wasting your time on something > that isn't considered to be in Apache Commons Pool's scope. > + Submit a [Jira Ticket][jira] for your issue, assuming one does not already > exist. > + Clearly describe the issue including steps to reproduce when it is a bug. > + Make sure you fill in the earliest version that you know has the issue. > + Find the corresponding [repository on > GitHub](https://github.com/apache/?query=commons-), > -[fork](https://help.github.com/articles/fork-a-repo/) and check out your > forked repository. > +[fork](https://help.github.com/articles/fork-a-repo/) and check out your > forked repository. If you don't have a GitHub account, you can still clone > the Commons repository. > > Making Changes > -------------- > > + Create a _topic branch_ for your isolated work. > * Usually you should base your branch on the `master` branch. > - * A good topic branch name can be the JIRA bug id plus a keyword, e.g. > `POOL-123-InputStream`. > + * A good topic branch name can be the JIRA bug ID plus a keyword, e.g. > `POOL-123-InputStream`. > * If you have submitted multiple JIRA issues, try to maintain separate > branches and pull requests. > + Make commits of logical units. > * Make sure your commit messages are meaningful and in the proper format. > Your commit message should contain the key of the JIRA issue. > @@ -72,7 +71,7 @@ Making Changes > + Create minimal diffs - disable _On Save_ actions like _Reformat Source > Code_ or _Organize Imports_. If you feel the source code should be > reformatted create a separate PR for this change first. > + Check for unnecessary whitespace with `git diff` -- check before > committing. > + Make sure you have added the necessary tests for your changes, typically > in `src/test/java`. > -+ Run all the tests with `mvn clean verify` to assure nothing else was > accidentally broken. > ++ Run all the tests with `mvn clean verify` to ensure nothing else was > accidentally broken. > > Making Trivial Changes > ---------------------- > @@ -109,7 +108,6 @@ Additional Resources > + [General GitHub documentation](https://help.github.com/) > + [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` > > [cla]:https://www.apache.org/licenses/#clas > [jira]:https://issues.apache.org/jira/browse/POOL > diff --git a/README.md b/README.md > index 2f0488d1..b33d81f6 100644 > --- a/README.md > +++ b/README.md > @@ -6,7 +6,7 @@ > (the "License"); you may not use this file except in compliance with > the License. You may obtain a copy of the License at > > - http://www.apache.org/licenses/LICENSE-2.0 > + https://www.apache.org/licenses/LICENSE-2.0 > > Unless required by applicable law or agreed to in writing, software > distributed under the License is distributed on an "AS IS" BASIS, > @@ -43,10 +43,10 @@ > Apache Commons Pool > =================== > > -[](https://github.com/apache/commons-pool/actions) > +[](https://github.com/apache/commons-pool/actions/workflows/maven.yml) > [](https://search.maven.org/artifact/org.apache.commons/commons-pool2) > -[](https://javadoc.io/doc/org.apache.commons/commons-pool2/2.12.0) > -[](https://github.com/apache/commons-pool/actions/workflows/codeql-analysis.yml?query=workflow%3ACodeQL) > +[](https://javadoc.io/doc/org.apache.commons/commons-pool2/2.12.1) > +[](https://github.com/apache/commons-pool/actions/workflows/codeql-analysis.yml) > [](https://api.securityscorecards.dev/projects/github.com/apache/commons-pool) > > The Apache Commons Object Pooling Library. > @@ -58,27 +58,35 @@ More information can be found on the [Apache Commons Pool > homepage](https://comm > The [Javadoc](https://commons.apache.org/proper/commons-pool/apidocs) can be > browsed. > Questions related to the usage of Apache Commons Pool should be posted to > the [user mailing list](https://commons.apache.org/mail-lists.html). > > -Where can I get the latest release? > ------------------------------------ > +Getting the latest release > +-------------------------- > You can download source and binaries from our [download > page](https://commons.apache.org/proper/commons-pool/download_pool.cgi). > > -Alternatively, you can pull it from the central Maven repositories: > +Alternatively, you can pull it from the central Maven repositories: > > ```xml > <dependency> > <groupId>org.apache.commons</groupId> > <artifactId>commons-pool2</artifactId> > - <version>2.12.0</version> > + <version>2.12.1</version> > </dependency> > ``` > > +Building > +-------- > + > +Building requires a Java JDK and [Apache Maven](https://maven.apache.org/). > +The required Java version is found in the `pom.xml` as the > `maven.compiler.source` property. > + > +From a command shell, run `mvn` without arguments to invoke the default > Maven goal to run all tests and checks. > + > Contributing > ------------ > > We accept Pull Requests via GitHub. The [developer mailing > list](https://commons.apache.org/mail-lists.html) is the main channel of > communication for contributors. > There are some guidelines which will make applying PRs easier for us: > + No tabs! Please use spaces for indentation. > -+ Respect the code style. > ++ Respect the existing code style for each file. > + Create minimal diffs - disable on save actions like reformat source code > or organize imports. If you feel the source code should be reformatted create > a separate PR for this change. > + Provide JUnit tests for your changes and make sure your changes don't > break any existing tests by running `mvn`. > + Before you pushing a PR, run `mvn` (by itself), this runs the default > goal, which contains all build checks. > @@ -89,13 +97,13 @@ You can learn more about contributing via GitHub in our > [contribution guidelines > > License > ------- > -This code is under the [Apache Licence > v2](https://www.apache.org/licenses/LICENSE-2.0). > +This code is licensed under the [Apache License > v2](https://www.apache.org/licenses/LICENSE-2.0). > > See the `NOTICE.txt` file for required notices and attributions. > > -Donations > ---------- > -You like Apache Commons Pool? Then [donate back to the > ASF](https://www.apache.org/foundation/contributing.html) to support the > development. > +Donating > +-------- > +You like Apache Commons Pool? Then [donate back to the > ASF](https://www.apache.org/foundation/contributing.html) to support > development. > > Additional Resources > -------------------- > @@ -104,59 +112,8 @@ Additional Resources > + [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/POOL) > + [Apache Commons Slack > Channel](https://the-asf.slack.com/archives/C60NVB8AD) > + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) > -+ `#apache-commons` IRC channel on `irc.freenode.org` > > Apache Commons Components > ------------------------- > > -| Component | GitHub Repository | Apache Homepage | > -| --------- | ----------------- | ----------------| > -| Apache Commons BCEL | > [commons-bcel](https://github.com/apache/commons-bcel) | > [commons-bcel](https://commons.apache.org/proper/commons-bcel) | > -| Apache Commons Beanutils | > [commons-beanutils](https://github.com/apache/commons-beanutils) | > [commons-beanutils](https://commons.apache.org/proper/commons-beanutils) | > -| Apache Commons BSF | [commons-bsf](https://github.com/apache/commons-bsf) > | [commons-bsf](https://commons.apache.org/proper/commons-bsf) | > -| Apache Commons Build-plugin | > [commons-build-plugin](https://github.com/apache/commons-build-plugin) | > [commons-build-plugin](https://commons.apache.org/proper/commons-build-plugin) > | > -| Apache Commons Chain | > [commons-chain](https://github.com/apache/commons-chain) | > [commons-chain](https://commons.apache.org/proper/commons-chain) | > -| Apache Commons CLI | [commons-cli](https://github.com/apache/commons-cli) > | [commons-cli](https://commons.apache.org/proper/commons-cli) | > -| Apache Commons Codec | > [commons-codec](https://github.com/apache/commons-codec) | > [commons-codec](https://commons.apache.org/proper/commons-codec) | > -| Apache Commons Collections | > [commons-collections](https://github.com/apache/commons-collections) | > [commons-collections](https://commons.apache.org/proper/commons-collections) | > -| Apache Commons Compress | > [commons-compress](https://github.com/apache/commons-compress) | > [commons-compress](https://commons.apache.org/proper/commons-compress) | > -| Apache Commons Configuration | > [commons-configuration](https://github.com/apache/commons-configuration) | > [commons-configuration](https://commons.apache.org/proper/commons-configuration) > | > -| Apache Commons Crypto | > [commons-crypto](https://github.com/apache/commons-crypto) | > [commons-crypto](https://commons.apache.org/proper/commons-crypto) | > -| Apache Commons CSV | [commons-csv](https://github.com/apache/commons-csv) > | [commons-csv](https://commons.apache.org/proper/commons-csv) | > -| Apache Commons Daemon | > [commons-daemon](https://github.com/apache/commons-daemon) | > [commons-daemon](https://commons.apache.org/proper/commons-daemon) | > -| Apache Commons DBCP | > [commons-dbcp](https://github.com/apache/commons-dbcp) | > [commons-dbcp](https://commons.apache.org/proper/commons-dbcp) | > -| Apache Commons Dbutils | > [commons-dbutils](https://github.com/apache/commons-dbutils) | > [commons-dbutils](https://commons.apache.org/proper/commons-dbutils) | > -| Apache Commons Digester | > [commons-digester](https://github.com/apache/commons-digester) | > [commons-digester](https://commons.apache.org/proper/commons-digester) | > -| Apache Commons Email | > [commons-email](https://github.com/apache/commons-email) | > [commons-email](https://commons.apache.org/proper/commons-email) | > -| Apache Commons Exec | > [commons-exec](https://github.com/apache/commons-exec) | > [commons-exec](https://commons.apache.org/proper/commons-exec) | > -| Apache Commons Fileupload | > [commons-fileupload](https://github.com/apache/commons-fileupload) | > [commons-fileupload](https://commons.apache.org/proper/commons-fileupload) | > -| Apache Commons Functor | > [commons-functor](https://github.com/apache/commons-functor) | > [commons-functor](https://commons.apache.org/proper/commons-functor) | > -| Apache Commons Geometry | > [commons-geometry](https://github.com/apache/commons-geometry) | > [commons-geometry](https://commons.apache.org/proper/commons-geometry) | > -| Apache Commons Graph | > [commons-graph](https://github.com/apache/commons-graph) | > [commons-graph](https://commons.apache.org/proper/commons-graph) | > -| Apache Commons Imaging | > [commons-imaging](https://github.com/apache/commons-imaging) | > [commons-imaging](https://commons.apache.org/proper/commons-imaging) | > -| Apache Commons IO | [commons-io](https://github.com/apache/commons-io) | > [commons-io](https://commons.apache.org/proper/commons-io) | > -| Apache Commons JCI | [commons-jci](https://github.com/apache/commons-jci) > | [commons-jci](https://commons.apache.org/proper/commons-jci) | > -| Apache Commons JCS | [commons-jcs](https://github.com/apache/commons-jcs) > | [commons-jcs](https://commons.apache.org/proper/commons-jcs) | > -| Apache Commons Jelly | > [commons-jelly](https://github.com/apache/commons-jelly) | > [commons-jelly](https://commons.apache.org/proper/commons-jelly) | > -| Apache Commons Jexl | > [commons-jexl](https://github.com/apache/commons-jexl) | > [commons-jexl](https://commons.apache.org/proper/commons-jexl) | > -| Apache Commons Jxpath | > [commons-jxpath](https://github.com/apache/commons-jxpath) | > [commons-jxpath](https://commons.apache.org/proper/commons-jxpath) | > -| Apache Commons Lang | > [commons-lang](https://github.com/apache/commons-lang) | > [commons-lang](https://commons.apache.org/proper/commons-lang) | > -| Apache Commons Logging | > [commons-logging](https://github.com/apache/commons-logging) | > [commons-logging](https://commons.apache.org/proper/commons-logging) | > -| Apache Commons Math | > [commons-math](https://github.com/apache/commons-math) | > [commons-math](https://commons.apache.org/proper/commons-math) | > -| Apache Commons Net | [commons-net](https://github.com/apache/commons-net) > | [commons-net](https://commons.apache.org/proper/commons-net) | > -| Apache Commons Numbers | > [commons-numbers](https://github.com/apache/commons-numbers) | > [commons-numbers](https://commons.apache.org/proper/commons-numbers) | > -| Apache Commons Parent | > [commons-parent](https://github.com/apache/commons-parent) | > [commons-parent](https://commons.apache.org/proper/commons-parent) | > -| Apache Commons Pool | > [commons-pool](https://github.com/apache/commons-pool) | > [commons-pool](https://commons.apache.org/proper/commons-pool) | > -| Apache Commons Proxy | > [commons-proxy](https://github.com/apache/commons-proxy) | > [commons-proxy](https://commons.apache.org/proper/commons-proxy) | > -| Apache Commons RDF | [commons-rdf](https://github.com/apache/commons-rdf) > | [commons-rdf](https://commons.apache.org/proper/commons-rdf) | > -| Apache Commons Release-plugin | > [commons-release-plugin](https://github.com/apache/commons-release-plugin) | > [commons-release-plugin](https://commons.apache.org/proper/commons-release-plugin) > | > -| Apache Commons Rng | [commons-rng](https://github.com/apache/commons-rng) > | [commons-rng](https://commons.apache.org/proper/commons-rng) | > -| Apache Commons Scxml | > [commons-scxml](https://github.com/apache/commons-scxml) | > [commons-scxml](https://commons.apache.org/proper/commons-scxml) | > -| Apache Commons Signing | > [commons-signing](https://github.com/apache/commons-signing) | > [commons-signing](https://commons.apache.org/proper/commons-signing) | > -| Apache Commons Skin | > [commons-skin](https://github.com/apache/commons-skin) | > [commons-skin](https://commons.apache.org/proper/commons-skin) | > -| Apache Commons Statistics | > [commons-statistics](https://github.com/apache/commons-statistics) | > [commons-statistics](https://commons.apache.org/proper/commons-statistics) | > -| Apache Commons Testing | > [commons-testing](https://github.com/apache/commons-testing) | > [commons-testing](https://commons.apache.org/proper/commons-testing) | > -| Apache Commons Text | > [commons-text](https://github.com/apache/commons-text) | > [commons-text](https://commons.apache.org/proper/commons-text) | > -| Apache Commons Validator | > [commons-validator](https://github.com/apache/commons-validator) | > [commons-validator](https://commons.apache.org/proper/commons-validator) | > -| Apache Commons VFS | [commons-vfs](https://github.com/apache/commons-vfs) > | [commons-vfs](https://commons.apache.org/proper/commons-vfs) | > -| Apache Commons Weaver | > [commons-weaver](https://github.com/apache/commons-weaver) | > [commons-weaver](https://commons.apache.org/proper/commons-weaver) | > +Please see the [list of > components](https://commons.apache.org/components.html) > diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt > index b9141be2..859a8361 100644 > --- a/RELEASE-NOTES.txt > +++ b/RELEASE-NOTES.txt > @@ -1,3 +1,53 @@ > +Apache Commons Pool 2.12.1 Release Notes > +---------------------------------------- > + > +The Apache Commons Pool team is pleased to announce the release of Apache > Commons Pool 2.12.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.7.x and up requires Java 8 or above. > +Version 2.6.x requires Java 7 or above. > +Version 2.5.x requires Java 7 or above. > +Version 2.0 requires 6 or above. > + > +NOTE: The MBean interfaces (DefaultPooledObjectInfoMBean, > GenericKeyedObjectPoolMXBean > + and GenericKeyedObjectPoolMXBean) exist only to define the attributes > and methods > + that will be made available via JMX. They must not be implemented by > clients as > + they are subject to change between major, minor and patch version > releases of > + Commons Pool. Clients that implement any of these interfaces may not, > therefore, > + be able to upgrade to a new minor or patch release without requiring > code > + changes. > + > +${d} > + > +Changes in version 2.12.1 include: > + > + > +Fixed Bugs: > +o Use java.time.Instant precision in > org.apache.commons.pool2.impl.ThrowableCallStack.Snapshot throwable message. > Thanks to Gary Gregory. > +o GenericObjectPool.borrowObject(Duration) doesn't obey its > borrowMaxWait Duration argument when the argument is different from > GenericObjectPool.getMaxWaitDuration(). Thanks to Gary Gregory. > +o POOL-418: The maximum wait time for GenericObjectPool.borrowObject(*) may > exceed expectations due to a spurious thread wakeup. Thanks to Gary Gregory. > +o Javadoc is missing its Overview page. Thanks to Gary Gregory. > +o Migrate site generation templates to > https://maven.apache.org/xsd/xdoc-2.0.xsd. Thanks to Gary Gregory. > + > +Changes: > +o Bump org.apache.commons:commons-parent from 62 to 79. Thanks to > Gary Gregory. > +o [test] Bump commons-lang3 from 3.13.0 to 3.17.0. Thanks to Gary > Gregory. > +o [site] Pickup org.apache.bcel:bcel version from parent POM. > Thanks to Gary Gregory. > +o [test] Bump org.ow2.asm:asm-util from 9.5 to 9.7.1. Thanks to > Gary Gregory. > + > + > +For complete information on Apache Commons Pool, including instructions on > how to submit bug reports, > +patches, or suggestions for improvement, see the Apache Commons Pool website: > + > +https://commons.apache.org/proper/commons-pool/ > + > +Download page: > https://commons.apache.org/proper/commons-pool/download_pool.cgi > + > +----------------------------------------------------------------------------------------------- > Apache Commons Pool 2.12.0 RELEASE NOTES > > The Apache Commons Pool team is pleased to announce the release of Apache > Commons Pool 2.12.0. > diff --git a/pom.xml b/pom.xml > index 4d41a4bc..5e34abc5 100644 > --- a/pom.xml > +++ b/pom.xml > @@ -85,26 +85,26 @@ > > <project.build.outputTimestamp>2024-02-01T03:27:02Z</project.build.outputTimestamp> > <maven.compiler.source>1.8</maven.compiler.source> > <maven.compiler.target>1.8</maven.compiler.target> > + <commons.main.branch>POOL_2_X</commons.main.branch> > + <commons.release.branch>release-2.x</commons.release.branch> > <commons.componentid>pool</commons.componentid> > <commons.module.name>org.apache.commons.pool2</commons.module.name> > <commons.rc.version>RC1</commons.rc.version> > + > <!-- Java 8 --> > <commons.release.version>2.12.1</commons.release.version> > - <commons.release.version>2.12.2</commons.release.version> > + <commons.release.next>2.12.2</commons.release.next> > <commons.release.desc>(Java 8 or above)</commons.release.desc> > <!-- Java 7 --> > <commons.release.2.version>2.6.2</commons.release.2.version> > <commons.release.2.desc>(Java 7 or above)</commons.release.2.desc> > - > <commons.jira.id>POOL</commons.jira.id> > <commons.jira.pid>12310488</commons.jira.pid> > > <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory> > > <commons.osgi.import>net.sf.cglib.proxy;resolution:=optional,*</commons.osgi.import> > - > <!-- Commons Release Plugin --> > <commons.bc.version>2.12.0</commons.bc.version> > <commons.release.isDistModule>true</commons.release.isDistModule> > - > <japicmp.skip>false</japicmp.skip> > <spotbugs.skip>false</spotbugs.skip> > <surefire.argline></surefire.argline> > diff --git a/src/changes/changes.xml b/src/changes/changes.xml > index bdedf39e..3b0b09c4 100644 > --- a/src/changes/changes.xml > +++ b/src/changes/changes.xml > @@ -45,12 +45,13 @@ The <action> type attribute can be add,update,fix,remove. > <title>Apache Commons Pool Release Notes</title> > </properties> > <body> > - <release version="2.12.1" date="YYYY-MM-DD" description="This is a feature > and maintenance release (Java 8 or above)."> > + <release version="2.12.1" date="2025-01-19" description="This is a feature > and maintenance release (Java 8 or above)."> > <!-- FIX --> > <action type="fix" dev="ggregory" due-to="Gary Gregory">Use > java.time.Instant precision in > org.apache.commons.pool2.impl.ThrowableCallStack.Snapshot throwable > message.</action> > <action type="fix" dev="ggregory" due-to="Gary > Gregory">GenericObjectPool.borrowObject(Duration) doesn't obey its > borrowMaxWait Duration argument when the argument is different from > GenericObjectPool.getMaxWaitDuration().</action> > <action type="fix" issue="POOL-418" dev="ggregory" due-to="Gary > Gregory">The maximum wait time for GenericObjectPool.borrowObject(*) may > exceed expectations due to a spurious thread wakeup.</action> > <action type="fix" dev="ggregory" due-to="Gary Gregory">Javadoc is > missing its Overview page.</action> > + <action type="fix" dev="ggregory" due-to="Gary Gregory">Migrate site > generation templates to https://maven.apache.org/xsd/xdoc-2.0.xsd.</action> > <!-- ADD --> > <!-- UPDATE --> > <action type="update" dev="ggregory" due-to="Gary Gregory">Bump > org.apache.commons:commons-parent from 62 to 79.</action> > diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm > index e4b3356a..29b59c8d 100644 > --- a/src/changes/release-notes.vm > +++ b/src/changes/release-notes.vm > @@ -14,7 +14,8 @@ > ## KIND, either express or implied. See the License for the > ## specific language governing permissions and limitations > ## under the License. > - ${project.name} ${version} RELEASE NOTES > +${project.name} ${version} Release Notes > +---------------------------------------- > > The ${developmentTeam} is pleased to announce the release of ${project.name} > ${version}. > > @@ -41,7 +42,7 @@ NOTE: The MBean interfaces (DefaultPooledObjectInfoMBean, > GenericKeyedObjectPool > ## > ## Hack to get line breaks to work in release description. For this to work, > each line break in the > ## release description attribute in changes.xml needs to be preceded by a > single space. > -#set( $desc = $release.description ) > +#set( $desc = $commons.release.desc )
-1, that does not work, and is not appropriate. Please revert, so the description from the changes file is used instead. > #set( $desc2 = $desc.replace($esc.newline, " ") ) > #set( $d = $desc2.replace(" ",$esc.newline) ) > ${d} > diff --git a/src/site/xdoc/download_pool.xml b/src/site/xdoc/download_pool.xml > index adfbb71d..a1ce1c98 100644 > --- a/src/site/xdoc/download_pool.xml > +++ b/src/site/xdoc/download_pool.xml > @@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, > Version 2.0 > (the "License"); you may not use this file except in compliance with > the License. You may obtain a copy of the License at > > - http://www.apache.org/licenses/LICENSE-2.0 > + https://www.apache.org/licenses/LICENSE-2.0 > > Unless required by applicable law or agreed to in writing, software > distributed under the License is distributed on an "AS IS" BASIS, > @@ -56,10 +56,12 @@ limitations under the License. > | | > +======================================================================+ > --> > -<document> > +<document xmlns="http://maven.apache.org/XDOC/2.0" > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 > https://maven.apache.org/xsd/xdoc-2.0.xsd"> > <properties> > <title>Download Apache Commons Pool</title> > - <author email="dev@commons.apache.org">Apache Commons Documentation > Team</author> > + <author email="dev@commons.apache.org">Apache Commons Team</author> > </properties> > <body> > <section name="Download Apache Commons Pool"> > @@ -113,32 +115,32 @@ limitations under the License. > </p> > </subsection> > </section> > - <section name="Apache Commons Pool 2.12.0 (Java 8 or above)"> > + <section name="Apache Commons Pool 2.12.1 (Java 8 or above)"> > <subsection name="Binaries"> > <table> > <tr> > - <td><a > href="[preferred]/commons/pool/binaries/commons-pool2-2.12.0-bin.tar.gz">commons-pool2-2.12.0-bin.tar.gz</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.0-bin.tar.gz.sha512">sha512</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.0-bin.tar.gz.asc">pgp</a></td> > + <td><a > href="[preferred]/commons/pool/binaries/commons-pool2-2.12.1-bin.tar.gz">commons-pool2-2.12.1-bin.tar.gz</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.1-bin.tar.gz.sha512">sha512</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.1-bin.tar.gz.asc">pgp</a></td> > </tr> > <tr> > - <td><a > href="[preferred]/commons/pool/binaries/commons-pool2-2.12.0-bin.zip">commons-pool2-2.12.0-bin.zip</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.0-bin.zip.sha512">sha512</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.0-bin.zip.asc">pgp</a></td> > + <td><a > href="[preferred]/commons/pool/binaries/commons-pool2-2.12.1-bin.zip">commons-pool2-2.12.1-bin.zip</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.1-bin.zip.sha512">sha512</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/binaries/commons-pool2-2.12.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.12.0-src.tar.gz">commons-pool2-2.12.0-src.tar.gz</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.0-src.tar.gz.sha512">sha512</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.0-src.tar.gz.asc">pgp</a></td> > + <td><a > href="[preferred]/commons/pool/source/commons-pool2-2.12.1-src.tar.gz">commons-pool2-2.12.1-src.tar.gz</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.1-src.tar.gz.sha512">sha512</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.1-src.tar.gz.asc">pgp</a></td> > </tr> > <tr> > - <td><a > href="[preferred]/commons/pool/source/commons-pool2-2.12.0-src.zip">commons-pool2-2.12.0-src.zip</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.0-src.zip.sha512">sha512</a></td> > - <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.0-src.zip.asc">pgp</a></td> > + <td><a > href="[preferred]/commons/pool/source/commons-pool2-2.12.1-src.zip">commons-pool2-2.12.1-src.zip</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.1-src.zip.sha512">sha512</a></td> > + <td><a > href="https://downloads.apache.org/commons/pool/source/commons-pool2-2.12.1-src.zip.asc">pgp</a></td> > </tr> > </table> > </subsection> > diff --git a/src/site/xdoc/issue-tracking.xml > b/src/site/xdoc/issue-tracking.xml > index 4137eff3..ee99de56 100644 > --- a/src/site/xdoc/issue-tracking.xml > +++ b/src/site/xdoc/issue-tracking.xml > @@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, > Version 2.0 > (the "License"); you may not use this file except in compliance with > the License. You may obtain a copy of the License at > > - http://www.apache.org/licenses/LICENSE-2.0 > + https://www.apache.org/licenses/LICENSE-2.0 > > Unless required by applicable law or agreed to in writing, software > distributed under the License is distributed on an "AS IS" BASIS, > @@ -41,10 +41,12 @@ limitations under the License. > | | > +======================================================================+ > --> > -<document> > +<document xmlns="http://maven.apache.org/XDOC/2.0" > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 > https://maven.apache.org/xsd/xdoc-2.0.xsd"> > <properties> > <title>Apache Commons Pool Issue tracking</title> > - <author email="dev@commons.apache.org">Apache Commons Documentation > Team</author> > + <author email="dev@commons.apache.org">Apache Commons Team</author> > </properties> > <body> > > @@ -64,6 +66,7 @@ limitations under the License. > <p> > If you would like to report a bug, or raise an enhancement request with > Apache Commons Pool please do the following: > + </p> > <ol> > <li><a > href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310488&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search > existing open bugs</a>. > If you find your issue listed then please add a comment with > your details.</li> > @@ -73,16 +76,15 @@ limitations under the License. > <li>Submit either a <a > href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310488&issuetype=1&priority=4&assignee=-1">bug > report</a> > or <a > href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310488&issuetype=4&priority=4&assignee=-1">enhancement > request</a>.</li> > </ol> > - </p> > > <p> > Please also remember these points: > + </p> > <ul> > <li>the more information you provide, the better we can help you</li> > <li>test cases are vital, particularly for any proposed > enhancements</li> > <li>the developers of Apache Commons Pool are all unpaid > volunteers</li> > </ul> > - </p> > > <p> > For more information on creating patches see the > @@ -91,12 +93,12 @@ limitations under the License. > > <p> > You may also find these links useful: > + </p> > <ul> > <li><a > href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310488&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All > Open Apache Commons Pool bugs</a></li> > <li><a > href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310488&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All > Resolved Apache Commons Pool bugs</a></li> > <li><a > href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310488&sorter/field=issuekey&sorter/order=DESC">All > Apache Commons Pool bugs</a></li> > </ul> > - </p> > </section> > </body> > </document> > diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml > index 030956f3..59156542 100644 > --- a/src/site/xdoc/mail-lists.xml > +++ b/src/site/xdoc/mail-lists.xml > @@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, > Version 2.0 > (the "License"); you may not use this file except in compliance with > the License. You may obtain a copy of the License at > > - http://www.apache.org/licenses/LICENSE-2.0 > + https://www.apache.org/licenses/LICENSE-2.0 > > Unless required by applicable law or agreed to in writing, software > distributed under the License is distributed on an "AS IS" BASIS, > @@ -39,10 +39,12 @@ limitations under the License. > | | > +======================================================================+ > --> > -<document> > +<document xmlns="http://maven.apache.org/XDOC/2.0" > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 > https://maven.apache.org/xsd/xdoc-2.0.xsd"> > <properties> > <title>Apache Commons Pool Mailing Lists</title> > - <author email="dev@commons.apache.org">Apache Commons Documentation > Team</author> > + <author email="dev@commons.apache.org">Apache Commons Team</author> > </properties> > <body> > > @@ -53,15 +55,15 @@ limitations under the License. > To make it easier for people to only read messages related to > components they are interested in, > the convention in Commons is to prefix the subject line of messages > with the component's name, > for example: > - <ul> > - <li>[pool] Problem with the ...</li> > - </ul> > </p> > + <ul> > + <li>[pool] Problem with the ...</li> > + </ul> > <p> > Questions related to the usage of Apache Commons Pool should be > posted to the > - <a > href="https://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>. > + <a > href="https://lists.apache.org/list.html?u...@commons.apache.org">User > List</a>. > <br /> > - The <a > href="https://mail-archives.apache.org/mod_mbox/commons-dev/">Developer > List</a> > + The <a > href="https://lists.apache.org/list.html?dev@commons.apache.org">Developer > List</a> > is for questions and discussion related to the development of Apache > Commons Pool. > <br /> > Please do not cross-post; developers are also subscribed to the user > list. > @@ -70,8 +72,10 @@ limitations under the License. > to subscribe. > </p> > <p> > - <strong>Note:</strong> please don't send patches or attachments to > any of the mailing lists. > + <strong>Note:</strong> please don't send patches or attachments to > any of the mailing lists; > + most of the lists are set up to drop attachments. > Patches are best handled via the <a href="issue-tracking.html">Issue > Tracking</a> system. > + If you have a GitHub account, most components also accept PRs (pull > requests). > Otherwise, please upload the file to a public server and include the > URL in the mail. > </p> > </section> > @@ -105,12 +109,11 @@ limitations under the License. > <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=[pool]">Post</a></td> > - <td><a > href="https://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a><br > /> > + <td> > <a > href="https://lists.apache.org/list.html?u...@commons.apache.org">lists.apache.org</a> > </td> > - <td><a > href="https://markmail.org/list/org.apache.commons.users/">markmail.org</a><br > /> > - <a > href="https://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br > /> > - <a > href="https://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a> > + <td> > + <a > href="https://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a> > </td> > </tr> > > @@ -125,12 +128,11 @@ limitations under the License. > <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:dev@commons.apache.org?subject=[pool]">Post</a></td> > - <td><a > href="https://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a><br > /> > + <td> > <a > href="https://lists.apache.org/list.html?dev@commons.apache.org">lists.apache.org</a> > </td> > - <td><a > href="https://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br > /> > - <a > href="https://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br > /> > - <a > href="https://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a> > + <td> > + <a > href="https://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a> > </td> > </tr> > > @@ -145,10 +147,10 @@ limitations under the License. > <td><a > href="mailto:issues-subscr...@commons.apache.org">Subscribe</a></td> > <td><a > href="mailto:issues-unsubscr...@commons.apache.org">Unsubscribe</a></td> > <td><i>read only</i></td> > - <td><a > href="https://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a><br > /> > + <td> > <a > href="https://lists.apache.org/list.html?iss...@commons.apache.org">lists.apache.org</a> > </td> > - <td><a > href="https://markmail.org/list/org.apache.commons.issues/">markmail.org</a><br > /> > + <td> > <a > href="https://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a> > </td> > </tr> > @@ -164,10 +166,10 @@ limitations under the License. > <td><a > href="mailto:commits-subscr...@commons.apache.org">Subscribe</a></td> > <td><a > href="mailto:commits-unsubscr...@commons.apache.org">Unsubscribe</a></td> > <td><i>read only</i></td> > - <td><a > href="https://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a><br > /> > + <td> > <a > href="https://lists.apache.org/list.html?comm...@commons.apache.org">lists.apache.org</a> > </td> > - <td><a > href="https://markmail.org/list/org.apache.commons.commits/">markmail.org</a><br > /> > + <td> > <a > href="https://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a> > </td> > </tr> > @@ -199,13 +201,11 @@ limitations under the License. > <td><a class="externalLink" > href="mailto:announce-subscr...@apache.org">Subscribe</a></td> > <td><a class="externalLink" > href="mailto:announce-unsubscr...@apache.org">Unsubscribe</a></td> > <td><i>read only</i></td> > - <td><a class="externalLink" > href="https://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a><br > /> > + <td> > <a class="externalLink" > href="https://lists.apache.org/list.html?annou...@apache.org">lists.apache.org</a> > </td> > - <td><a class="externalLink" > href="https://markmail.org/list/org.apache.announce/">markmail.org</a><br /> > - <a class="externalLink" > href="https://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br > /> > - <a class="externalLink" > href="https://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br > /> > - <a class="externalLink" > href="https://news.gmane.org/gmane.comp.apache.announce">news.gmane.org</a> > + <td> > + <a class="externalLink" > href="https://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a> > </td> > </tr> > </table> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org