You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/03/25 23:41:51 UTC

[commons-configuration] branch master updated: Prepare release candidate 2.9.0 RC1

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


The following commit(s) were added to refs/heads/master by this push:
     new 7c717fef Prepare release candidate 2.9.0 RC1
7c717fef is described below

commit 7c717fef7d5e5a584d2d8fcdb7fa079f5ee3dadf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 19:41:47 2023 -0400

    Prepare release candidate 2.9.0 RC1
---
 NOTICE.txt                               |   2 +-
 README.md                                |  59 ++++++-
 RELEASE-NOTES.txt                        | 149 ++++++++++++-----
 src/changes/changes.xml                  |   2 +-
 src/site/xdoc/download_configuration.xml | 264 +++++++++++++++----------------
 src/site/xdoc/issue-tracking.xml         |   2 +-
 src/site/xdoc/mail-lists.xml             |  22 ++-
 7 files changed, 316 insertions(+), 184 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 553e2d07..06c8ad70 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -2,4 +2,4 @@ Apache Commons Configuration
 Copyright 2001-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 9bc79edb..c5aaf6f7 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Apache Commons Configuration
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/?gav=true)
 [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-configuration2/2.8.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.8.0)
 [![CodeQL](https://github.com/apache/commons-configuration/workflows/CodeQL/badge.svg)](https://github.com/apache/commons-configuration/actions/workflows/codeql-analysis.yml?query=workflow%3ACodeQL)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-configuration/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-configuration)
 
 Tools to assist in the reading of configuration/preferences files in
         various formats
@@ -76,7 +77,7 @@ Alternatively you can pull it from the central Maven repositories:
 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.
@@ -101,7 +102,61 @@ Additional Resources
 
 + [Apache Commons Homepage](https://commons.apache.org/)
 + [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/CONFIGURATION)
++ [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/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1539427c..a97d5061 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,73 @@
-                        Apache Commons Configuration
-                        Version 2.8.0
-                        Release Notes
+Apache Commons Configuration
+Version 2.9.0
+Release Notes
+
+
+INTRODUCTION:
+=============
+
+This document contains the release notes for this version of the Commons
+Configuration component. It describes the changes since the previous version.
+The Commons Configuration software library provides a generic configuration
+interface which enables an application to read configuration data from a variety
+of sources.
+
+Tools to assist in the reading of configuration/preferences files in
+various formats.
+
+Minor release with new features and updated dependencies.
+
+Changes in this version include:
+
+New features:
+o CONFIGURATION-799:  Add DefaultConversionHandler#setListDelimiterHandler(ListDelimiterHandler). Thanks to Xinshiyou, Gary Gregory.
+
+Fixed Bugs:
+o CONFIGURATION-815:  Replace optional Apache Log4j 1.2.17 with 2.20.0. Thanks to Gary Gregory.
+o CONFIGURATION-799:  CombinedConfiguration#getKeys() can throw NoSuchElementException. Thanks to Jarek Sacha, Gary Gregory.
+o CONFIGURATION-822:  Fix ambiguity on the section determining #229. Thanks to Branislav Be?o, Gary Gregory, Bruno P. Kinoshita.
+o                     Use Java style array decelerations #244. Thanks to Arturo Bernal.
+o                     Add ImmutableNode.stream(). Thanks to Gary Gregory.
+o                     Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal(). Thanks to Gary Gregory.
+o                     Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String). Thanks to Gary Gregory.
+
+Changes:
+o                     Bump actions/checkout from 3 to 3.1.0 #224. Thanks to Gary Gregory, Dependabot.
+o                     Bump actions/setup-java from 3 to 3.5.1. Thanks to Gary Gregory.
+o                     Bump spotbugs-maven-plugin from 4.7.0.0 to 4.7.3.0 #193, #195, #228, #237. Thanks to Dependabot, Gary Gregory.
+o                     Bump spotbugs from 4.7.0 to 4.7.3. Thanks to Gary Gregory.
+o                     Bump org.springframework:spring-* from 5.3.21 to 5.3.26. Thanks to Dependabot, Gary Gregory.
+o                     Bump junit-jupiter from 5.8.2 to 5.9.1 #197, #217. Thanks to Dependabot.
+o                     Bump mockito-core from 4.6.1 to 4.11.0 #200, #235, #249, #257, #259. Thanks to Dependabot, Gary Gregory.
+o                     Bump slf4j.version from 1.7.36 to 2.0.7 #202, #210, #215, #238, #241, #291. Thanks to Dependabot.
+o                     Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 #201. Thanks to Dependabot.
+o                     Bump maven-javadoc-plugin from 3.4.0 to 3.4.1. Thanks to Gary Gregory.
+o                     Bump maven-pmd-plugin 3.17.0 to 3.19.0. Thanks to Gary Gregory.
+o                     Bump pmd from 6.47.0 to 6.53.0. Thanks to Gary Gregory.
+o                     Bump snakeyaml from 1.30 to 2.0 #203, #212, #219, #282, #283. Thanks to Dependabot, strangelookingnerd.
+o                     Bump jackson-databind from 2.13.3 to 2.14.2 #227, #246, #274. Thanks to Gary Gregory.
+o                     Bump spring.version from 5.3.22 to 5.3.23 #211. Thanks to Dependabot.
+o                     Bump commons-parent from 53 to 56 #216, #253. Thanks to Dependabot, Gary Gregory.
+o                     Bump log4j.version from 2.18.0 to 2.20.0 #213, #281. Thanks to Dependabot.
+o                     Bump japicmp-maven-plugin from 0.15.7 to 0.17.1. Thanks to Gary Gregory.
+o                     Bump commons-text from 1.9 to 1.10.0 #221. Thanks to Dependabot.
+o                     Bump actions/cache from 3.0.8 to 3.0.10 #223, #225. Thanks to Dependabot.
+
+
+Historical list of changes: https://commons.apache.org/proper/commons-configuration/changes-report.html
+
+For complete information on Apache Commons Configuration, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons Configuration website:
+
+https://commons.apache.org/proper/commons-configuration/
+
+Download it from https://commons.apache.org/proper/commons-configuration//download_text.cgi
+
+=============================================================================
+
+Apache Commons Configuration
+Version 2.8.0
+Release Notes
 
 
 INTRODUCTION:
@@ -109,9 +176,9 @@ Download it from https://commons.apache.org/proper/commons-configuration//downlo
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.7
-                        Release Notes
+Apache Commons Configuration
+Version 2.7
+Release Notes
 
 
 INTRODUCTION:
@@ -167,9 +234,9 @@ Download it from https://commons.apache.org/proper/commons-configuration//downlo
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.6
-                        Release Notes
+Apache Commons Configuration
+Version 2.6
+Release Notes
                         2019-09-13
 
 
@@ -226,9 +293,9 @@ Download it from https://commons.apache.org/proper/commons-configuration/downloa
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.5
-                        Release Notes
+Apache Commons Configuration
+Version 2.5
+Release Notes
 
 
 INTRODUCTION:
@@ -269,9 +336,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.4
-                        Release Notes
+Apache Commons Configuration
+Version 2.4
+Release Notes
 
 
 INTRODUCTION:
@@ -335,9 +402,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.3
-                        Release Notes
+Apache Commons Configuration
+Version 2.3
+Release Notes
 
 
 INTRODUCTION:
@@ -434,9 +501,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.2
-                        Release Notes
+Apache Commons Configuration
+Version 2.2
+Release Notes
 
 
 INTRODUCTION:
@@ -527,9 +594,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.1.1
-                        Release Notes
+Apache Commons Configuration
+Version 2.1.1
+Release Notes
 
 
 INTRODUCTION:
@@ -604,8 +671,8 @@ https://commons.apache.org/proper/commons-configuration/
 =============================================================================
 
                         Commons Configuration Package
-                        Version 2.1
-                        Release Notes
+Version 2.1
+Release Notes
 
 INTRODUCTION
 ============
@@ -679,9 +746,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.0
-                        Release Notes
+Apache Commons Configuration
+Version 2.0
+Release Notes
 
 INTRODUCTION
 ============
@@ -737,9 +804,9 @@ Commons Configuration 2.0 requires Java 1.6 or higher.
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.0-beta2
-                        Release Notes
+Apache Commons Configuration
+Version 2.0-beta2
+Release Notes
 
 After the first beta release in June 2015 there has been some feedback from the
 community resulting in (minor) adaptations of the API. In most cases, the
@@ -792,9 +859,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.0-beta1
-                        Release Notes
+Apache Commons Configuration
+Version 2.0-beta1
+Release Notes
 
 This is the first beta release of Commons Configuration 2.0 after two alpha
 versions. There has not been much feedback so far and no requests for API
@@ -814,9 +881,9 @@ o CONFIGURATION-598: Removed obsolete ConfigurationBuilder interface in the
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.0-alpha2
-                        Release Notes
+Apache Commons Configuration
+Version 2.0-alpha2
+Release Notes
 
 
 After version 2.0-alpha1 has been out for a while (the corresponding release
@@ -853,9 +920,9 @@ https://commons.apache.org/proper/commons-configuration/
 
 =============================================================================
 
-                        Apache Commons Configuration
-                        Version 2.0-alpha1
-                        Release Notes
+Apache Commons Configuration
+Version 2.0-alpha1
+Release Notes
 
 This is the first alpha release for version 2.0 of Commons Configuration.
 Version 2 is a major redesign of the Configuration API. It breaks compatibility
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f173c93d..fd4c78b4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,7 +23,7 @@
     <author email="dev@commons.apache.org">Apache Commons Community</author>
   </properties>
   <body>
-    <release version="2.9.0" date="TBD" description="Minor release with new features and updated dependencies.">
+    <release version="2.9.0" date="2023-03-25" description="Minor release with new features and updated dependencies.">
       <!-- FIX -->
       <action issue="CONFIGURATION-815" type="fix" dev="ggregory" due-to="Gary Gregory">
         Replace optional Apache Log4j 1.2.17 with 2.20.0.
diff --git a/src/site/xdoc/download_configuration.xml b/src/site/xdoc/download_configuration.xml
index b4461122..45b36363 100644
--- a/src/site/xdoc/download_configuration.xml
+++ b/src/site/xdoc/download_configuration.xml
@@ -1,130 +1,130 @@
-<?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 Configuration</title>
-    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
-  </properties>
-  <body>
-    <section name="Download Apache Commons Configuration">
-    <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 Configuration 2.8.0 (reworked 2.x version)">
+<?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 Configuration</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
+  </properties>
+  <body>
+    <section name="Download Apache Commons Configuration">
+    <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 Configuration 2.8.0 (Java 8)">
       <subsection name="Binaries">
         <table>
           <tr>
               <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.8.0-bin.tar.gz">commons-configuration2-2.8.0-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.8.0-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.8.0-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.8.0-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.8.0-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.8.0-bin.zip">commons-configuration2-2.8.0-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.8.0-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.8.0-bin.zip.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.8.0-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.8.0-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -132,13 +132,13 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.8.0-src.tar.gz">commons-configuration2-2.8.0-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.8.0-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.8.0-src.tar.gz.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.8.0-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.8.0-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.8.0-src.zip">commons-configuration2-2.8.0-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.8.0-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.8.0-src.zip.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.8.0-src.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.8.0-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -148,13 +148,13 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/configuration/binaries/commons-configuration-1.10-bin.tar.gz">commons-configuration-1.10-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration-1.10-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration-1.10-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration-1.10-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration-1.10-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/configuration/binaries/commons-configuration-1.10-bin.zip">commons-configuration-1.10-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration-1.10-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration-1.10-bin.zip.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration-1.10-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration-1.10-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -162,13 +162,13 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/configuration/source/commons-configuration-1.10-src.tar.gz">commons-configuration-1.10-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration-1.10-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration-1.10-src.tar.gz.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration-1.10-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration-1.10-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/configuration/source/commons-configuration-1.10-src.zip">commons-configuration-1.10-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration-1.10-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration-1.10-src.zip.asc">pgp</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration-1.10-src.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration-1.10-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 21371b57..3c1ac484 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 645fa00d..b2aa0d9d 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -105,7 +105,9 @@ limitations under the License.
           <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><a href="mailto:user@commons.apache.org?subject=[configuration]">Post</a></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
+          <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?user@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>
@@ -123,7 +125,9 @@ limitations under the License.
           <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><a href="mailto:dev@commons.apache.org?subject=[configuration]">Post</a></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
+          <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?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>
@@ -141,7 +145,9 @@ limitations under the License.
           <td><a href="mailto:issues-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:issues-unsubscribe@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="https://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a><br />
+              <a href="https://lists.apache.org/list.html?issues@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>
@@ -152,13 +158,15 @@ 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-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:commits-unsubscribe@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="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>
@@ -191,7 +199,9 @@ limitations under the License.
           <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
           <td><a class="externalLink" href="mailto:announce-unsubscribe@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="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?announce@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 />