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-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new e17fee4  Prepare for the next release candidate
e17fee4 is described below

commit e17fee46b6bcb1bf2cca341ceeb18983f70a65f5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 23 09:51:17 2023 -0400

    Prepare for the next release candidate
---
 README.md                        | 221 +++++++++++++++++----------------
 RELEASE-NOTES.txt                |  69 +++++++++++
 pom.xml                          |   1 +
 src/changes/changes.xml          |   2 +-
 src/site/xdoc/download_cli.xml   | 256 +++++++++++++++++++--------------------
 src/site/xdoc/issue-tracking.xml |   2 +-
 src/site/xdoc/mail-lists.xml     |  40 +++---
 7 files changed, 336 insertions(+), 255 deletions(-)

diff --git a/README.md b/README.md
index 4aff0a7..8f7ac53 100644
--- a/README.md
+++ b/README.md
@@ -1,106 +1,119 @@
-<!---
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!---
- +======================================================================+
- |****                                                              ****|
- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
- |****                    DO NOT EDIT DIRECTLY                      ****|
- |****                                                              ****|
- +======================================================================+
- | TEMPLATE FILE: readme-md-template.md                                 |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- |                                                                      |
- | 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)          |
- |    - commons.release.version (required)                              |
- |                                                                      |
- | 3) Example Properties                                                |
- |                                                                      |
- |  <properties>                                                        |
- |    <commons.componentid>math</commons.componentid>                   |
- |    <commons.release.version>1.2</commons.release.version>            |
- |  </properties>                                                       |
- |                                                                      |
- +======================================================================+
---->
-Apache Commons CLI
-===================
-
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!---
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: readme-md-template.md                                 |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 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)          |
+ |    - commons.release.version (required)                              |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.componentid>math</commons.componentid>                   |
+ |    <commons.release.version>1.2</commons.release.version>            |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+--->
+Apache Commons CLI
+===================
+
 [![Java 
CI](https://github.com/apache/commons-cli/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-cli/actions/workflows/maven.yml)
-[![Coverage 
Status](https://codecov.io/gh/apache/commons-cli/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-cli/branch/master)
-[![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/?gav=true)
-[![Javadocs](https://javadoc.io/badge/commons-cli/commons-cli/1.5.0.svg)](https://javadoc.io/doc/commons-cli/commons-cli/1.5.0)
+[![Coverage 
Status](https://codecov.io/gh/apache/commons-cli/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-cli)
+[![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/?gav=true)
+[![Javadocs](https://javadoc.io/badge/commons-cli/commons-cli/1.6.0.svg)](https://javadoc.io/doc/commons-cli/commons-cli/1.6.0)
 
[![CodeQL](https://github.com/apache/commons-cli/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-cli/actions/workflows/codeql-analysis.yml)
-
-Apache Commons CLI provides a simple API for presenting, processing and 
validating a Command Line Interface.
-
-Documentation
--------------
-
-More information can be found on the [Apache Commons CLI 
homepage](https://commons.apache.org/proper/commons-cli).
-The [Javadoc](https://commons.apache.org/proper/commons-cli/apidocs) can be 
browsed.
-Questions related to the usage of Apache Commons CLI 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-cli/download_cli.cgi).
-
-Alternatively, you can pull it from the central Maven repositories:
-
-```xml
-<dependency>
-  <groupId>commons-cli</groupId>
-  <artifactId>commons-cli</artifactId>
-  <version>1.5.0</version>
-</dependency>
-```
-
-Contributing
-------------
-
-We accept Pull Requests via GitHub. The [developer mailing list][ml] 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.
-+ 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```.
-
-If you plan to contribute on a regular basis, please consider filing a 
[contributor license agreement](https://www.apache.org/licenses/#clas).
-You can learn more about contributing via GitHub in our [contribution 
guidelines](CONTRIBUTING.md).
-
-License
--------
-This code is 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 CLI? 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/CLI)
-+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ `#apache-commons` IRC channel on `irc.freenode.org`
-
-[ml]:https://commons.apache.org/mail-lists.html
+[![OpenSSF 
Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-cli/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-cli)
+
+Apache Commons CLI provides a simple API for presenting, processing and 
validating a Command Line Interface.
+
+Documentation
+-------------
+
+More information can be found on the [Apache Commons CLI 
homepage](https://commons.apache.org/proper/commons-cli).
+The [Javadoc](https://commons.apache.org/proper/commons-cli/apidocs) can be 
browsed.
+Questions related to the usage of Apache Commons CLI should be posted to the 
[user mailing list][ml].
+
+Getting the latest release
+--------------------------
+You can download source and binaries from our [download 
page](https://commons.apache.org/proper/commons-cli/download_cli.cgi).
+
+Alternatively, you can pull it from  the central Maven repositories:
+
+```xml
+<dependency>
+  <groupId>commons-cli</groupId>
+  <artifactId>commons-cli</artifactId>
+  <version>1.6.0</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 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```.
+
+If you plan to contribute on a regular basis, please consider filing a 
[contributor license agreement](https://www.apache.org/licenses/#clas).
+You can learn more about contributing via GitHub in our [contribution 
guidelines](CONTRIBUTING.md).
+
+License
+-------
+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.
+
+Donating
+--------
+You like Apache Commons CLI? Then [donate back to the 
ASF](https://www.apache.org/foundation/contributing.html) to support 
development.
+
+Additional Resources
+--------------------
+
++ [Apache Commons Homepage](https://commons.apache.org/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/CLI)
++ [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
+-------------------------
+
+Please see the [list of components](https://commons.apache.org/components.html)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index bbb86fb..b69838d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,72 @@
+Apache Commons CLI
+Version 1.6.0
+Release Notes
+
+
+This document contains the release notes for this version of the Apache 
Commons 
+CLI Component of the Apache Commons Project. Commons CLI provides a simple API
+for working with the command line arguments and options.
+
+Apache Commons CLI provides a simple API for presenting, processing and 
validating a Command Line Interface.
+
+New features and bug fixes
+
+Changes in this version include:
+
+
+Fixed Bugs
+==========
+
+o           [StepSecurity] ci: Harden GitHub Actions #176. Thanks to 
step-security-bot, Gary Gregory.
+o CLI-318:  Inconsistent date format in changes report. Thanks to Alexander 
Veit, Gary Gregory.
+o CLI-283:  Fix NPE in CommandLine.resolveOption(String). Thanks to Dilraj 
Singh, Gary Gregory.
+o CLI-283:  CommandLine.addOption(Option) should not allow a null Option. 
Thanks to Dilraj Singh, Gary Gregory.
+o CLI-283:  CommandLine.addArgs(String) should not allow a null String. Thanks 
to Gary Gregory.
+o CLI-303:  Site docs: "Usage Scenarios" refers to deprecated methods. Thanks 
to Julian Schilling, Gary Gregory.
+o CLI-317:  NullPointerException thrown by CommandLineParser.parse(). Thanks 
to Philippe Bastiani, Sruteesh Kumar Paramata, Gary Gregory.
+o CLI-313:  StringIndexOutOfBoundsException thrown by 
CommandLineParser.parse(). Thanks to Dominik Stadler, HUNG LU, Sruteesh Kumar 
Paramata.
+
+Updates
+=======
+
+o           Fix SpotBugs Error: Medium: Method intentionally throws 
RuntimeException. [org.apache.commons.cli.Option] At Option.java:[lines 
417-423] THROWS_METHOD_THROWS_RUNTIMEEXCEPTION Thanks to Gary Gregory.
+o           Fix SpotBugs Error: Medium: Method intentionally throws 
RuntimeException. [org.apache.commons.cli.Option] At Option.java:[lines 
446-450] THROWS_METHOD_THROWS_RUNTIMEEXCEPTION Thanks to Gary Gregory.
+o           Fix SpotBugs Error: Medium: Method intentionally throws 
RuntimeException. [org.apache.commons.cli.Option] At Option.java:[lines 
474-478] THROWS_METHOD_THROWS_RUNTIMEEXCEPTION Thanks to Gary Gregory.
+o           Use EMPTY_STRING_ARRAY constant. #102. Thanks to Ken Dombeck.
+o           Fix site links that are broken #155. Thanks to Arturo Bernal.
+o           Use Math.max() #111. 
+            Delete unused assignment #112. Thanks to Arturo Bernal.
+o           Add github/codeql-action. Thanks to Dependabot, Gary Gregory.
+o           Bump Java from 7 to 8. Thanks to Gary Gregory.
+o           Bump actions/cache from 2.1.7 to 3.0.10 #97, #130, #132. Thanks to 
Dependabot, Gary Gregory.
+o           Bump actions/checkout from 3 to 3.1.0 #133. Thanks to Gary 
Gregory, Dependabot.
+o           Bump actions/setup-java from 2 to 3.6.0 #136. Thanks to Gary 
Gregory.
+o           Bump spotbugs from 4.5.3 to 4.7.3 #96, #107, #113, #125, #138. 
Thanks to Gary Gregory, Dependabot.
+o           Bump spotbugs-maven-plugin from 4.5.3.0 to 4.7.3.0 #98, #108, 
#115, #117, #126, #145. Thanks to Dependabot.
+o           Bump commons-parent from 52 to 64 #100, #128, #151, #158. Thanks 
to Dependabot, Gary Gregory.
+o           Bump maven-antrun-plugin from 3.0.0 to 3.1.0 #103. Thanks to 
Dependabot.
+o           Bump maven-javadoc-plugin from 3.3.2 to 3.4.1 #105, #120. Thanks 
to Dependabot.
+o           Bump maven-pmd-plugin from 3.16.0 to 3.19.0 #110, #124. Thanks to 
Dependabot.
+o           Bump jacoco-maven-plugin from 0.8.7 to 0.8.8. Thanks to Gary 
Gregory.
+o           Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 #121. Thanks to 
Gary Gregory.
+o           Bump japicmp-maven-plugin from 0.15.4 to 0.16.0. Thanks to Gary 
Gregory.
+o           Update JUnit 4 to 5 vintage. Thanks to Gary Gregory.
+
+
+Historical list of changes: 
https://commons.apache.org/proper/commons-cli/changes-report.html
+
+For complete information on Apache Commons CLI, including instructions on how 
to submit bug reports,
+patches, or suggestions for improvement, see the Apache Commons CLI website:
+
+https://commons.apache.org/proper/commons-cli/
+
+Download page: https://commons.apache.org/proper/commons-cli/download_cli.cgi
+
+Have fun!
+The Apache Commons Team
+
+------------------------------------------------------------------------------
+
 Apache Commons CLI
 Version 1.5.0
 Release Notes
diff --git a/pom.xml b/pom.xml
index d7701fd..6ebca44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,6 +200,7 @@
     <commons.componentid>cli</commons.componentid>
     <commons.module.name>org.apache.commons.cli</commons.module.name>
     <commons.release.version>1.6.0</commons.release.version>
+    <commons.release.next>1.7.0</commons.release.next>
     
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
     <commons.release.isDistModule>true</commons.release.isDistModule>
     <commons.rc.version>RC1</commons.rc.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4369a87..6f2e0e1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
     <title>Apache Commons CLI Release Notes</title>
   </properties>
   <body>
-    <release version="1.6.0" date="2023-MM-DD" description="New features and 
bug fixes">
+    <release version="1.6.0" date="2023-10-23" description="New features and 
bug fixes">
       <!-- FIX -->
       <action type="update" dev="ggregory" due-to="Gary Gregory">
         Fix SpotBugs Error: Medium: Method intentionally throws 
RuntimeException. [org.apache.commons.cli.Option] At Option.java:[lines 
417-423] THROWS_METHOD_THROWS_RUNTIMEEXCEPTION
diff --git a/src/site/xdoc/download_cli.xml b/src/site/xdoc/download_cli.xml
index 9f6cbc9..6a2d8f1 100644
--- a/src/site/xdoc/download_cli.xml
+++ b/src/site/xdoc/download_cli.xml
@@ -1,144 +1,144 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-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
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
- +======================================================================+
- |****                                                              ****|
- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
- |****                    DO NOT EDIT DIRECTLY                      ****|
- |****                                                              ****|
- +======================================================================+
- | TEMPLATE FILE: download-page-template.xml                            |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- |                                                                      |
- | 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.release.version (required)                              |
- |    - 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>                   |
- |    <commons.release.version>1.2</commons.release.version>            |
- |  </properties>                                                       |
- |                                                                      |
- +======================================================================+
--->
-<document>
-  <properties>
-    <title>Download Apache Commons CLI</title>
-    <author email="d...@commons.apache.org">Apache Commons Documentation 
Team</author>
-  </properties>
-  <body>
-    <section name="Download Apache Commons CLI">
-    <subsection name="Using a Mirror">
-      <p>
-        We recommend you use a mirror to download our release
-        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 all the mirrors.
-      </p>
-
-      <p>
-        You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.
-        <br></br>
-        [if-any logo]<a href="[link]"><img align="right" src="[logo]" 
border="0"></img></a>[end]
-      </p>
-
-      <form action="[location]" method="get" id="SelectMirror">
-        <p>
-          Other mirrors:
-          <select name="Preferred">
-          [if-any http]
-            [for http]<option value="[http]">[http]</option>[end]
-          [end]
-          [if-any ftp]
-            [for ftp]<option value="[ftp]">[ftp]</option>[end]
-          [end]
-          [if-any backup]
-            [for backup]<option value="[backup]">[backup] 
(backup)</option>[end]
-          [end]
-          </select>
-          <input type="submit" value="Change"></input>
-        </p>
-      </form>
-
-      <p>
-        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://www.apache.org/dist/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 CLI 1.5.0 ">
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: download-page-template.xml                            |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 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.release.version (required)                              |
+ |    - 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>                   |
+ |    <commons.release.version>1.2</commons.release.version>            |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+-->
+<document>
+  <properties>
+    <title>Download Apache Commons CLI</title>
+    <author email="d...@commons.apache.org">Apache Commons Documentation 
Team</author>
+  </properties>
+  <body>
+    <section name="Download Apache Commons CLI">
+    <subsection name="Using a Mirror">
+      <p>
+        We recommend you use a mirror to download our release
+        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 all the mirrors.
+      </p>
+
+      <p>
+        You are currently using <b>[preferred]</b>.  If you
+        encounter a problem with this mirror, please select another
+        mirror.  If all mirrors are failing, there are <i>backup</i>
+        mirrors (at the end of the mirrors list) that should be
+        available.
+        <br></br>
+        [if-any logo]<a href="[link]"><img align="right" src="[logo]" 
border="0"></img></a>[end]
+      </p>
+
+      <form action="[location]" method="get" id="SelectMirror">
+        <p>
+          Other mirrors:
+          <select name="Preferred">
+          [if-any http]
+            [for http]<option value="[http]">[http]</option>[end]
+          [end]
+          [if-any ftp]
+            [for ftp]<option value="[ftp]">[ftp]</option>[end]
+          [end]
+          [if-any backup]
+            [for backup]<option value="[backup]">[backup] 
(backup)</option>[end]
+          [end]
+          </select>
+          <input type="submit" value="Change"></input>
+        </p>
+      </form>
+
+      <p>
+        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 CLI 1.6.0 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a 
href="[preferred]/commons/cli/binaries/commons-cli-1.5.0-bin.tar.gz">commons-cli-1.5.0-bin.tar.gz</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5.0-bin.tar.gz.sha512";>sha512</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5.0-bin.tar.gz.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/cli/binaries/commons-cli-1.6.0-bin.tar.gz">commons-cli-1.6.0-bin.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/binaries/commons-cli-1.6.0-bin.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/binaries/commons-cli-1.6.0-bin.tar.gz.asc";>pgp</a></td>
           </tr>
           <tr>
-              <td><a 
href="[preferred]/commons/cli/binaries/commons-cli-1.5.0-bin.zip">commons-cli-1.5.0-bin.zip</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5.0-bin.zip.sha512";>sha512</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5.0-bin.zip.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/cli/binaries/commons-cli-1.6.0-bin.zip">commons-cli-1.6.0-bin.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/binaries/commons-cli-1.6.0-bin.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/binaries/commons-cli-1.6.0-bin.zip.asc";>pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a 
href="[preferred]/commons/cli/source/commons-cli-1.5.0-src.tar.gz">commons-cli-1.5.0-src.tar.gz</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5.0-src.tar.gz.sha512";>sha512</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5.0-src.tar.gz.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/cli/source/commons-cli-1.6.0-src.tar.gz">commons-cli-1.6.0-src.tar.gz</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/source/commons-cli-1.6.0-src.tar.gz.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/source/commons-cli-1.6.0-src.tar.gz.asc";>pgp</a></td>
           </tr>
           <tr>
-              <td><a 
href="[preferred]/commons/cli/source/commons-cli-1.5.0-src.zip">commons-cli-1.5.0-src.zip</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5.0-src.zip.sha512";>sha512</a></td>
-              <td><a 
href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5.0-src.zip.asc";>pgp</a></td>
+              <td><a 
href="[preferred]/commons/cli/source/commons-cli-1.6.0-src.zip">commons-cli-1.6.0-src.zip</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/source/commons-cli-1.6.0-src.zip.sha512";>sha512</a></td>
+              <td><a 
href="https://downloads.apache.org/commons/cli/source/commons-cli-1.6.0-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 9eaea48..edcfaf0 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -85,7 +85,7 @@ limitations under the License.
       </p>
 
       <p>
-      For more information on subversion and creating patches see the
+      For more information on creating patches see the
       <a href="https://www.apache.org/dev/contributors.html";>Apache 
Contributors Guide</a>.
       </p>
 
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 1129461..a2f5355 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -59,9 +59,9 @@ limitations under the License.
       </p>
       <p>
         Questions related to the usage of Apache Commons CLI 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?d...@commons.apache.org";>Developer 
List</a>
         is for questions and discussion related to the development of Apache 
Commons CLI.
         <br />
         Please do not cross-post; developers are also subscribed to the user 
list.
@@ -70,8 +70,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 +107,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=[cli]";>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 +126,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:d...@commons.apache.org?subject=[cli]";>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?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>
+              <a 
href="https://www.mail-archive.com/dev@commons.apache.org/";>www.mail-archive.com</a>
           </td>
         </tr>
 
@@ -145,10 +145,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>
@@ -158,16 +158,16 @@ 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><br
 />
+          <td>
               <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
 />
+          <td>
               <a 
href="https://www.mail-archive.com/commits@commons.apache.org/";>www.mail-archive.com</a>
           </td>
         </tr>
@@ -199,13 +199,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>


Reply via email to