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 d7ed9a8 Prepare 2.5-RC1.
d7ed9a8 is described below
commit d7ed9a855b29eff4fa55181c490add2a27268294
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu May 23 09:25:34 2019 -0400
Prepare 2.5-RC1.
---
CONTRIBUTING.md | 6 +-
README.md | 10 +--
RELEASE-NOTES.txt | 114 +++++++++++++++++++++++--------
pom.xml | 4 +-
src/changes/changes.xml | 2 +-
src/changes/release-notes.vm | 6 +-
src/site/xdoc/download_configuration.xml | 56 ++++++++-------
src/site/xdoc/issue-tracking.xml | 2 +-
src/site/xdoc/mail-lists.xml | 2 +-
9 files changed, 130 insertions(+), 72 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9cad890..b6f5913 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) |
@@ -50,7 +50,7 @@ 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
you're 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 Configuration's scope.
++ 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 Configuration's scope.
+ Submit a [Jira Ticket][jira] for your issue, assuming one does not already
exist.
+ Clearly describe the issue including steps to reproduce when it is a bug.
+ Make sure you fill in the earliest version that you know has the issue.
@@ -107,7 +107,7 @@ Additional Resources
+ [Apache Commons Configuration 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)
+ `#apache-commons` IRC channel on `irc.freenode.net`
diff --git a/README.md b/README.md
index 75244c3..6445e02 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) |
@@ -43,8 +43,10 @@
Apache Commons Configuration
===================
-[](https://travis-ci.org/apache/commons-configuration)
+[](https://travis-ci.org/apache/commons-configuration)
+[](https://coveralls.io/r/apache/commons-configuration)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/)
+[](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.5)
Tools to assist in the reading of configuration/preferences files in
various formats
@@ -53,7 +55,7 @@ Documentation
-------------
More information can be found on the [Apache Commons Configuration
homepage](https://commons.apache.org/proper/commons-configuration).
-The
[Javadoc](https://commons.apache.org/proper/commons-configuration/javadocs/api-release)
can be browsed.
+The [Javadoc](https://commons.apache.org/proper/commons-configuration/apidocs)
can be browsed.
Questions related to the usage of Apache Commons Configuration should be
posted to the [user mailing list][ml].
Where can I get the latest release?
@@ -66,7 +68,7 @@ Alternatively you can pull it from the central Maven
repositories:
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
```
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0c554d1..6c82c27 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,52 @@
- Commons Configuration Package
- Version 2.4
- Release Notes
+ Apache Commons Configuration
+ Version 2.5
+ 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:
+
+
+Fixed Bugs:
+o CONFIGURATION-731: Allow user to specify the comments and separator chars.
Thanks to Shuai Zhang, Gary Gregory.
+
+Changes:
+o CONFIGURATION-738: Update Jackson from 2.9.7 to 2.9.8. Thanks to Gary
Gregory.
+o CONFIGURATION-739: Update Apache Commons Codec from 1.11 to 1.12. Thanks to
Gary Gregory.
+o CONFIGURATION-740: Update Apache Commons VFS from 2.2 to 2.3. Thanks to
Gary Gregory.
+o CONFIGURATION-741: Update Spring from 4.3.19 to 4.3.22. Thanks to Gary
Gregory.
+o CONFIGURATION-743: Update optional library snakeyaml from 1.23 to 1.24.
Thanks to Gary Gregory.
+o CONFIGURATION-747: Update Apache Commons Lang from 3.8.1 to 3.9. Thanks to
Gary Gregory.
+o CONFIGURATION-746: Update Jackson from 2.9.8 to 2.9.9. Thanks to Gary
Gregory.
+o CONFIGURATION-747: Update Spring from 4.3.22 to 4.3.24. Thanks to Gary
Gregory.
+o CONFIGURATION-745: Add the special key "includeoptional" for properties
files. Thanks to Gary Gregory.
+
+
+Historical list of changes:
http://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:
+
+http://commons.apache.org/proper/commons-configuration/
+
+=============================================================================
+
+ Apache Commons Configuration
+ Version 2.4
+ Release Notes
INTRODUCTION:
@@ -65,12 +111,11 @@ patches, or suggestions for improvement, see the Apache
Apache Commons Configura
http://commons.apache.org/proper/commons-configuration/
-Older release notes
-===================
+=============================================================================
Apache Commons Configuration
- Version 2.3
- Release Notes
+ Version 2.3
+ Release Notes
INTRODUCTION:
@@ -165,9 +210,11 @@ patches, or suggestions for improvement, see the Apache
Apache Commons Configura
http://commons.apache.org/proper/commons-configuration/
+=============================================================================
+
Apache Commons Configuration
- Version 2.2
- Release Notes
+ Version 2.2
+ Release Notes
INTRODUCTION:
@@ -256,10 +303,11 @@ patches, or suggestions for improvement, see the Apache
Apache Commons Configura
http://commons.apache.org/proper/commons-configuration/
+=============================================================================
Apache Commons Configuration
- Version 2.1.1
- Release Notes
+ Version 2.1.1
+ Release Notes
INTRODUCTION:
@@ -331,10 +379,11 @@ patches, or suggestions for improvement, see the Apache
Apache Commons Configura
http://commons.apache.org/proper/commons-configuration/
+=============================================================================
Commons Configuration Package
- Version 2.1
- Release Notes
+ Version 2.1
+ Release Notes
INTRODUCTION
============
@@ -406,9 +455,11 @@ on how to submit bug reports, patches, or suggestions for
improvement, see the
Apache Commons Configuration website:
http://commons.apache.org/proper/commons-configuration/
- Commons Configuration Package
- Version 2.0
- Release Notes
+=============================================================================
+
+ Apache Commons Configuration
+ Version 2.0
+ Release Notes
INTRODUCTION
============
@@ -462,9 +513,11 @@ o CONFIGURATION-618:
Commons Configuration 2.0 requires Java 1.6 or higher.
- Commons Configuration Package
- 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
@@ -515,9 +568,11 @@ on how to submit bug reports, patches, or suggestions for
improvement, see the
Apache Commons Configuration website:
http://commons.apache.org/proper/commons-configuration/
- Commons Configuration Package
- 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
@@ -535,10 +590,11 @@ Changes:
o CONFIGURATION-598: Removed obsolete ConfigurationBuilder interface in the
base package.
+=============================================================================
- Commons Configuration Package
- 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
@@ -573,9 +629,11 @@ patches, or suggestions for improvement, see the Apache
Commons Configuration we
http://commons.apache.org/proper/commons-configuration/
- Commons Configuration Package
- 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/pom.xml b/pom.xml
index 2c1344c..b639bf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,8 +576,8 @@
<commons.rc.version>RC1</commons.rc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
- <commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
-
<commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
+ <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
+ <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
</properties>
<build>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e5c1768..f9f6bf5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,7 +25,7 @@
</properties>
<body>
- <release version="2.5" date="2019-MM-DD"
+ <release version="2.5" date="2019-05-23"
description="Minor release with new features and updated
dependencies.">
<action dev="ggregory" type="fix" issue="CONFIGURATION-731"
due-to="Shuai Zhang, Gary Gregory">
Allow user to specify the comments and separator chars.
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index 8f27530..6cfcaad 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -18,9 +18,9 @@
$Id$
- Commons Configuration Package
- Version ${version}
- Release Notes
+ Apache Commons Configuration
+ Version ${version}
+ Release Notes
INTRODUCTION:
diff --git a/src/site/xdoc/download_configuration.xml
b/src/site/xdoc/download_configuration.xml
index 2933a17..7d535c5 100644
--- a/src/site/xdoc/download_configuration.xml
+++ b/src/site/xdoc/download_configuration.xml
@@ -26,22 +26,24 @@ 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.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.2/3.version (conditional) |
- | - commons.release.2/3.name (conditional) |
- | - commons.release.2/3.binary.suffix (optional) |
- | - commons.release.2/3.desc (optional) |
- | - commons.release.2/3.subdir (optional) |
+ | - 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: |
@@ -102,7 +104,7 @@ limitations under the License.
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>SHA1</code> hash (<code>*.sha1</code>
checksum 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>
@@ -111,36 +113,32 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Apache Commons Configuration 2.4 (reworked 2.x version)">
+ <section name="Apache Commons Configuration 2.5 (reworked 2.x version)">
<subsection name="Binaries">
<table>
<tr>
- <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz">commons-configuration2-2.4-bin.tar.gz</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.sha256";>sha256</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.sha512";>sha512</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz">commons-configuration2-2.5-bin.tar.gz</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.4-bin.zip">commons-configuration2-2.4-bin.zip</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.sha256";>sha256</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.sha512";>sha512</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.5-bin.zip">commons-configuration2-2.5-bin.zip</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.zip.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.4-src.tar.gz">commons-configuration2-2.4-src.tar.gz</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.sha256";>sha256</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.sha512";>sha512</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.5-src.tar.gz">commons-configuration2-2.5-src.tar.gz</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.tar.gz.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.4-src.zip">commons-configuration2-2.4-src.zip</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.sha256";>sha256</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.sha512";>sha512</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.5-src.zip">commons-configuration2-2.5-src.zip</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.zip.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
@@ -150,12 +148,12 @@ 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.sha1";>sha1</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>
</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.sha1";>sha1</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>
</tr>
</table>
@@ -164,12 +162,12 @@ 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.sha1";>sha1</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>
</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.sha1";>sha1</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>
</tr>
</table>
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 64406eb..44bf2c1 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) |
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 6eaed0a..8c68ae0 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) |
