This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git


The following commit(s) were added to refs/heads/master by this push:
     new ba7bc50  Regenerate site files
ba7bc50 is described below

commit ba7bc500022f93b63021ca97c272fddc83d264a7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu May 25 10:32:53 2023 -0400

    Regenerate site files
---
 CONTRIBUTING.md                       | 46 +++++++++++------
 NOTICE.txt                            |  4 +-
 README.md                             | 87 ++++++++++++++++++++++++++++----
 src/site/xdoc/download_fileupload.xml | 94 ++++++++++++++++++++++++++---------
 src/site/xdoc/issue-tracking.xml      | 26 +++++-----
 src/site/xdoc/mail-lists.xml          | 81 +++++++++++++++++-------------
 6 files changed, 243 insertions(+), 95 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cb5d995..f8e1acb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:contributing-md                    |
+ | 1) Re-generate using: mvn commons-build:contributing-md              |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.jira.id  (required, alphabetic, upper case)             |
@@ -51,47 +51,65 @@ 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).
 + 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 FileUpload's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ 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.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on 
GitHub](https://github.com/apache/commons-fileupload),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your 
forked repository.
 
 Making Changes
 --------------
 
-+ Create a topic branch from where you want to base your work (this is usually 
the master/trunk branch).
++ 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. 
`FILEUPLOAD-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.
+  * e.g. `FILEUPLOAD-123: Close input stream earlier`
 + Respect the original code style:
   + Only use spaces for indentation.
-  + 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.
-  + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message 
should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
-+ Run all the tests with `mvn clean verify` to assure nothing else was 
accidentally broken.
+  + 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 checks with `mvn` or at least `mvn clean verify` to assure 
nothing was accidentally broken.
 
 Making Trivial Changes
 ----------------------
 
+The JIRA tickets are used to generate the change log for the next release.
+
 For changes of a trivial nature to comments and documentation, it is not 
always necessary to create a new ticket in JIRA.
 In this case, it is appropriate to start the first line of a commit with 
'(doc)' instead of a ticket number.
 
+
 Submitting Changes
 ------------------
 
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you 
haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache 
License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
 + Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` 
organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
 + Update your JIRA ticket and include a link to the pull request in the ticket.
 
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
 Additional Resources
 --------------------
 
 + [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons FileUpload JIRA project 
page](https://issues.apache.org/jira/browse/FILEUPLOAD)
++ [Apache Commons FileUpload JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request 
documentation](https://help.github.com/send-pull-requests/)
++ [GitHub pull request 
documentation](https://help.github.com/articles/creating-a-pull-request/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
 
 [cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/FILEUPLOAD
diff --git a/NOTICE.txt b/NOTICE.txt
index e35f9c2..388f0a8 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
-Apache Commons FileUpload
+Apache Commons FileUpload FileUpload
 Copyright 2002-2023 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/README.md b/README.md
index afd7aea..28bbe5e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:readme-md                          |
+ | 1) Re-generate using: mvn commons-build:readme-md                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
@@ -40,12 +40,15 @@
  |                                                                      |
  +======================================================================+
 --->
-Apache Commons FileUpload
+Apache Commons FileUpload Parent
 ===================
 
 [![GitHub Actions 
Status](https://github.com/apache/commons-fileupload/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-fileupload/actions)
-[![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/commons-fileupload/commons-fileupload/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-fileupload/commons-fileupload/?gav=true)
+[![Coverage 
Status](https://codecov.io/gh/apache/commons-fileupload/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-fileupload)
+[![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-fileupload2/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-fileupload2/?gav=true)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-fileupload2/2.0.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-fileupload2/2.0.0)
 
[![CodeQL](https://github.com/apache/commons-fileupload/workflows/CodeQL/badge.svg)](https://github.com/apache/commons-fileupload/actions/workflows/codeql-analysis.yml?query=workflow%3ACodeQL)
+[![OpenSSF 
Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-fileupload/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-fileupload)
 
 The Apache Commons FileUpload component provides a simple yet flexible means 
of adding support for multipart
     file upload functionality to servlets and web applications.
@@ -53,14 +56,16 @@ The Apache Commons FileUpload component provides a simple 
yet flexible means of
 Documentation
 -------------
 
-More information can be found on the [Apache Commons FileUpload 
homepage](https://commons.apache.org/proper/commons-fileupload).
-The 
[Javadoc](https://commons.apache.org/proper/commons-fileupload/javadocs/api-release)
 can be browsed.
-Questions related to the usage of Apache Commons FileUpload should be posted 
to the [user mailing list][ml].
+More information can be found on the [Apache Commons FileUpload Parent 
homepage](https://commons.apache.org/proper/commons-fileupload).
+The [Javadoc](https://commons.apache.org/proper/commons-fileupload/apidocs) 
can be browsed.
+Questions related to the usage of Apache Commons FileUpload Parent should be 
posted to the [user mailing list][ml].
 
 Where can I get the latest release?
 -----------------------------------
 You can download source and binaries from our [download 
page](https://commons.apache.org/proper/commons-fileupload/download_fileupload.cgi).
 
+Alternatively you can pull it from the central Maven repositories:
+
 Alternatively, you can pull it from the central Maven repositories:
 
 ```xml
@@ -81,10 +86,20 @@ The upcoming version 2.0.0 will be:
 </dependency>
 ```
 
+You can experiment today by building from git master or using a snapshot build:
+
+```xml
+<dependency>
+  <groupId>org.apache.commons</groupId>
+  <artifactId>commons-fileupload2</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+</dependency>
+```
+
 Contributing
 ------------
 
-We accept Pull Requests via GitHub. The [developer mailing list][ml] is the 
main channel of communication for contributors.
+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.
@@ -102,14 +117,68 @@ See the `NOTICE.txt` file for required notices and 
attributions.
 
 Donations
 ---------
-You like Apache Commons FileUpload? Then [donate back to the 
ASF](https://www.apache.org/foundation/contributing.html) to support the 
development.
+You like Apache Commons FileUpload Parent? Then [donate back to the 
ASF](https://www.apache.org/foundation/contributing.html) to support the 
development.
 
 Additional Resources
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
 + [Apache Issue Tracker 
(JIRA)](https://issues.apache.org/jira/browse/FILEUPLOAD)
++ [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`
 
-[ml]:https://commons.apache.org/mail-lists.html
+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) |
diff --git a/src/site/xdoc/download_fileupload.xml 
b/src/site/xdoc/download_fileupload.xml
index 1a7d0c0..3591929 100644
--- a/src/site/xdoc/download_fileupload.xml
+++ b/src/site/xdoc/download_fileupload.xml
@@ -26,15 +26,28 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:download-page                      |
+ | 1) Re-generate using: mvn commons-build:download-page                |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
- |    - commons.componentid (required, alphabetic, lower case)          |
+ |    - commons.componentid     (required, alphabetic, lower case)      |
  |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - commons.release.name    (required)                              |
+ |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
+ |    - commons.release.desc    (optional)                              |
+ |    - commons.release.subdir  (optional)                              |
+ |    - commons.release.hash    (optional, lowercase, default sha512)   |
+ |                                                                      |
+ |    - commons.release.[234].version       (conditional)               |
+ |    - commons.release.[234].name          (conditional)               |
+ |    - commons.release.[234].binary.suffix (optional)                  |
+ |    - commons.release.[234].desc          (optional)                  |
+ |    - commons.release.[234].subdir        (optional)                  |
+ |    - commons.release.[234].hash       (optional, lowercase, [sha512])|
  |                                                                      |
  | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
  |                                                                      |
  |  <properties>                                                        |
  |    <commons.componentid>math</commons.componentid>                   |
@@ -46,17 +59,17 @@ limitations under the License.
 <document>
   <properties>
     <title>Download Apache Commons FileUpload</title>
-    <author email="d...@commons.apache.org">Commons Documentation Team</author>
+    <author email="d...@commons.apache.org">Apache Commons Documentation 
Team</author>
   </properties>
   <body>
     <section name="Download Apache Commons FileUpload">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
+        builds, but you <strong>must</strong> <a 
href="https://www.apache.org/info/verification.html";>verify the integrity</a> of
         the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
+        be available from all the mirrors.
       </p>
 
       <p>
@@ -88,39 +101,74 @@ limitations under the License.
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/commons/KEYS";>KEYS</a>
-        link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature 
from our main site.
-        The <code>SHA256</code> link downloads the checksum from the main site.
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html";>verify the 
integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature 
(<code>*.asc</code> files);
+        failing that using the <code>SHA512</code> hash (<code>*.sha512</code> 
checksum files).
+      </p>
+      <p>
+        The <a href="https://downloads.apache.org/commons/KEYS";>KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons FileUpload 1.4 (requires Java 1.6 or later)">
+    <section name="Apache Commons FileUpload 2.0.0 in the 
org.apache.commons.fileupload2 namespace for Java 1.8 or later">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz">commons-fileupload2-2.0.0-bin.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz.asc";>pgp</a></td>
+          </tr>
+          <tr>
+              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip">commons-fileupload2-2.0.0-bin.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip.asc";>pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz">commons-fileupload2-2.0.0-src.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz.asc";>pgp</a></td>
+          </tr>
+          <tr>
+              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip">commons-fileupload2-2.0.0-src.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip.asc";>pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
+    <section name="Apache Commons FileUpload 1.5 in the 
org.apache.commons.fileupload namespace for Java 6">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload-1.4-bin.tar.gz">commons-fileupload-1.4-bin.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/binaries/commons-fileupload-1.4-bin.tar.gz.sha256";>sha256</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/binaries/commons-fileupload-1.4-bin.tar.gz.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload2-1.5-bin.tar.gz">commons-fileupload2-1.5-bin.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-1.5-bin.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-1.5-bin.tar.gz.asc";>pgp</a></td>
           </tr>
           <tr>
-              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload-1.4-bin.zip">commons-fileupload-1.4-bin.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/binaries/commons-fileupload-1.4-bin.zip.sha256";>sha256</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/binaries/commons-fileupload-1.4-bin.zip.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/fileupload/binaries/commons-fileupload2-1.5-bin.zip">commons-fileupload2-1.5-bin.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-1.5-bin.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-1.5-bin.zip.asc";>pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload-1.4-src.tar.gz">commons-fileupload-1.4-src.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-1.4-src.tar.gz.sha256";>sha256</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-1.4-src.tar.gz.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload2-1.5-src.tar.gz">commons-fileupload2-1.5-src.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-1.5-src.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-1.5-src.tar.gz.asc";>pgp</a></td>
           </tr>
           <tr>
-              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload-1.4-src.zip">commons-fileupload-1.4-src.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-1.4-src.zip.sha256";>sha256</a></td>
-              <td><a 
href="http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-1.4-src.zip.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/fileupload/source/commons-fileupload2-1.5-src.zip">commons-fileupload2-1.5-src.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-1.5-src.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-1.5-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 4a01f51..6214ae7 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -26,7 +26,7 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:jira-page                          |
+ | 1) Re-generate using: mvn commons-build:jira-page                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.jira.id  (required, alphabetic, upper case)             |
@@ -43,15 +43,15 @@ limitations under the License.
 -->
 <document>
   <properties>
-    <title>Commons FileUpload Issue tracking</title>
-    <author email="d...@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons FileUpload Issue tracking</title>
+    <author email="d...@commons.apache.org">Apache Commons Documentation 
Team</author>
   </properties>
   <body>
 
-    <section name="Commons FileUpload Issue tracking">
+    <section name="Apache Commons FileUpload Issue tracking">
       <p>
-      Commons FileUpload uses <a href="https://issues.apache.org/jira/";>ASF 
JIRA</a> for tracking issues.
-      See the <a 
href="https://issues.apache.org/jira/browse/FILEUPLOAD";>Commons FileUpload JIRA 
project page</a>.
+      Apache Commons FileUpload uses <a 
href="https://issues.apache.org/jira/";>ASF JIRA</a> for tracking issues.
+      See the <a 
href="https://issues.apache.org/jira/browse/FILEUPLOAD";>Apache Commons 
FileUpload JIRA project page</a>.
       </p>
 
       <p>
@@ -63,7 +63,7 @@ limitations under the License.
 
       <p>
       If you would like to report a bug, or raise an enhancement request with
-      Commons FileUpload please do the following:
+      Apache Commons FileUpload please do the following:
       <ol>
         <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4";>Search
 existing open bugs</a>.
             If you find your issue listed then please add a comment with your 
details.</li>
@@ -80,21 +80,21 @@ limitations under the License.
       <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 Commons FileUpload are all unpaid volunteers</li>
+        <li>the developers of Apache Commons FileUpload are all unpaid 
volunteers</li>
       </ul>
       </p>
 
       <p>
-      For more information on subversion and creating patches see the
-      <a href="http://www.apache.org/dev/contributors.html";>Apache 
Contributors Guide</a>.
+      For more information on creating patches see the
+      <a href="https://www.apache.org/dev/contributors.html";>Apache 
Contributors Guide</a>.
       </p>
 
       <p>
       You may also find these links useful:
       <ul>
-        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4";>All
 Open Commons FileUpload bugs</a></li>
-        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6";>All
 Resolved Commons FileUpload bugs</a></li>
-        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC";>All
 Commons FileUpload bugs</a></li>
+        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4";>All
 Open Apache Commons FileUpload bugs</a></li>
+        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6";>All
 Resolved Apache Commons FileUpload bugs</a></li>
+        <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310476&amp;sorter/field=issuekey&amp;sorter/order=DESC";>All
 Apache Commons FileUpload bugs</a></li>
       </ul>
       </p>
     </section>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index c47a77f..79acfac 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -26,7 +26,7 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:mail-page                          |
+ | 1) Re-generate using: mvn commons-build:mail-page                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
@@ -41,14 +41,14 @@ limitations under the License.
 -->
 <document>
   <properties>
-    <title>Commons FileUpload Mailing Lists</title>
-    <author email="d...@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons FileUpload Mailing Lists</title>
+    <author email="d...@commons.apache.org">Apache Commons Documentation 
Team</author>
   </properties>
   <body>
 
     <section name="Overview">
       <p>
-        <a href="index.html">Commons FileUpload</a> shares mailing lists with 
all the other 
+        <a href="index.html">Apache Commons FileUpload</a> shares mailing 
lists with all the other
         <a href="https://commons.apache.org/components.html";>Commons 
Components</a>.
         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,
@@ -58,24 +58,27 @@ limitations under the License.
         </ul>
       </p>
       <p>
-        Questions related to the usage of Commons FileUpload should be posted 
to the
+        Questions related to the usage of Apache Commons FileUpload should be 
posted to the
         <a href="https://mail-archives.apache.org/mod_mbox/commons-user/";>User 
List</a>.
         <br />
         The <a 
href="https://mail-archives.apache.org/mod_mbox/commons-dev/";>Developer List</a>
-        is for questions and discussion related to the development of Commons 
FileUpload.
+        is for questions and discussion related to the development of Apache 
Commons FileUpload.
         <br />
         Please do not cross-post; developers are also subscribed to the user 
list.
+        <br />
+        You must be subscribed to post to the mailing lists.  Follow the 
Subscribe links below
+        to subscribe.
       </p>
       <p>
         <strong>Note:</strong> please don't send patches or attachments to any 
of the mailing lists.
-        Patches are best handled via the <a href="issue-tracking.html">Issue 
Tracking</a> system. 
-        Otherwise, please upload the file to a public server and include the 
URL in the mail. 
+        Patches are best handled via the <a href="issue-tracking.html">Issue 
Tracking</a> system.
+        Otherwise, please upload the file to a public server and include the 
URL in the mail.
       </p>
     </section>
 
-    <section name="Commons FileUpload Mailing Lists">
+    <section name="Apache Commons FileUpload Mailing Lists">
       <p>
-        <strong>Please prefix the subject line of any messages for <a 
href="index.html">Commons FileUpload</a>
+        <strong>Please prefix the subject line of any messages for <a 
href="index.html">Apache Commons FileUpload</a>
         with <i>[fileupload]</i></strong> - <i>thanks!</i>
         <br />
         <br />
@@ -96,16 +99,18 @@ limitations under the License.
           <td>
             <strong>Commons User List</strong>
             <br /><br />
-            Questions on using Commons FileUpload.
+            Questions on using Apache Commons FileUpload.
             <br /><br />
           </td>
           <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=[fileupload]";>Post</a></td>
-          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-user/";>mail-archives.apache.org</a></td>
-          <td><a 
href="http://markmail.org/list/org.apache.commons.users/";>markmail.org</a><br />
-              <a 
href="http://www.mail-archive.com/user@commons.apache.org/";>www.mail-archive.com</a><br
 />
-              <a 
href="http://news.gmane.org/gmane.comp.jakarta.commons.devel";>news.gmane.org</a>
+          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-user/";>mail-archives.apache.org</a><br
 />
+              <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>
         </tr>
 
@@ -114,16 +119,18 @@ limitations under the License.
           <td>
             <strong>Commons Developer List</strong>
             <br /><br />
-            Discussion of development of Commons FileUpload.
+            Discussion of development of Apache Commons FileUpload.
             <br /><br />
           </td>
           <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:d...@commons.apache.org?subject=[fileupload]";>Post</a></td>
-          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-dev/";>mail-archives.apache.org</a></td>
-          <td><a 
href="http://markmail.org/list/org.apache.commons.dev/";>markmail.org</a><br />
-              <a 
href="http://www.mail-archive.com/dev@commons.apache.org/";>www.mail-archive.com</a><br
 />
-              <a 
href="http://news.gmane.org/gmane.comp.jakarta.commons.devel";>news.gmane.org</a>
+          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-dev/";>mail-archives.apache.org</a><br
 />
+              <a 
href="https://lists.apache.org/list.html?d...@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>
         </tr>
 
@@ -138,9 +145,11 @@ 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></td>
-          <td><a 
href="http://markmail.org/list/org.apache.commons.issues/";>markmail.org</a><br 
/>
-              <a 
href="http://www.mail-archive.com/issues@commons.apache.org/";>www.mail-archive.com</a>
+          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-issues/";>mail-archives.apache.org</a><br
 />
+              <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 
/>
+              <a 
href="https://www.mail-archive.com/issues@commons.apache.org/";>www.mail-archive.com</a>
           </td>
         </tr>
 
@@ -149,15 +158,17 @@ limitations under the License.
           <td>
             <strong>Commons Commits List</strong>
             <br /><br />
-            Only for e-mails automatically generated by the <a 
href="scm.html">source control</a> sytem.
+            Only for e-mails automatically generated by the <a 
href="scm.html">source control</a> system.
             <br /><br />
           </td>
           <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></td>
-          <td><a 
href="http://markmail.org/list/org.apache.commons.commits/";>markmail.org</a><br 
/>
-              <a 
href="http://www.mail-archive.com/commits@commons.apache.org/";>www.mail-archive.com</a>
+          <td><a 
href="https://mail-archives.apache.org/mod_mbox/commons-commits/";>mail-archives.apache.org</a><br
 />
+              <a 
href="https://lists.apache.org/list.html?commits@commons.apache.org";>lists.apache.org</a>
+          </td>
+          <td><a 
href="https://markmail.org/list/org.apache.commons.commits/";>markmail.org</a><br
 />
+              <a 
href="https://www.mail-archive.com/commits@commons.apache.org/";>www.mail-archive.com</a>
           </td>
         </tr>
 
@@ -185,14 +196,16 @@ limitations under the License.
             General announcements of Apache project releases.
             <br /><br />
           </td>
-          <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><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></td>
 
-          <td><a class="externalLink" 
href="http://markmail.org/list/org.apache.announce/";>markmail.org</a><br />
-              <a class="externalLink" 
href="http://old.nabble.com/Apache-News-and-Announce-f109.html";>old.nabble.com</a><br
 />
-              <a class="externalLink" 
href="http://www.mail-archive.com/announce@apache.org/";>www.mail-archive.com</a><br
 />
-              <a class="externalLink" 
href="http://news.gmane.org/gmane.comp.apache.announce";>news.gmane.org</a>
+          <td><a class="externalLink" 
href="https://mail-archives.apache.org/mod_mbox/www-announce/";>mail-archives.apache.org</a><br
 />
+              <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>
         </tr>
       </table>


Reply via email to