Prepare for the next release candidate
diff --git a/README.md b/README.md
index a8db88e..83ce312 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,11 @@
[](https://github.com/apache/commons-configuration/actions/workflows/maven.yml)
[](https://app.codecov.io/gh/apache/commons-configuration)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/?gav=true)
-[](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.10.0)
+[](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.10.1)
[](https://github.com/apache/commons-configuration/actions/workflows/codeql-analysis.yml)
[](https://api.securityscorecards.dev/projects/github.com/apache/commons-configuration)
-Tools to assist in the reading of configuration/preferences files in
- various formats
+Tools to assist in the reading of configuration/preferences files in various formats; requires Java 8.
Documentation
-------------
@@ -70,7 +69,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.10.0</version>
+ <version>2.10.1</version>
</dependency>
```
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ab2e41a..8d79964 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -11,6 +11,72 @@
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; requires Java 8.
+
+Minor release with new features and updated dependencies; requires Java 8 or above.
+
+Changes in this version include:
+
+New features
+------------
+
+* Add AbstractConfiguration.getKeysInternal(String, String) #300. Thanks to KeijoB, Gary Gregory.
+* Add ImmutableConfiguration.getKeys(String, String) #300. Thanks to KeijoB, Gary Gregory.
+* Add PrefixedKeysIterator.PrefixedKeysIterator(Iterator<String%gt;, String, String) #300. Thanks to KeijoB, Gary Gregory.
+* Add Maven property project.build.outputTimestamp for build reproducibility. Thanks to Gary Gregory.
+* Guard PatternSubtreeConfigurationWrapper constructor against null #365. Thanks to Heewon Lee.
+
+Fixed Bugs
+----------
+
+* [StepSecurity] ci: Harden GitHub Actions #307. Thanks to step-security-bot, Gary Gregory.
+* CONFIGURATION-834: ConfirgurationPropertySource doesn't supply resolved values #309. Thanks to Keith Barlow, Gary Gregory.
+* Take prefix delimiter into account when SubsetConfiguration.getKeysInternal() is called #300. Thanks to KeijoB, Gary Gregory.
+* Guard ConfigurationMap against null configuration #355. Thanks to Heewon Lee, Gary Gregory.
+* CONFIGURATION-838: Properties parser stack overflows on large single-key inputs #369. Thanks to Ian Lynagh.
+* DatabaseConfiguration.AbstractJdbcOperation.execute() throws NullPointerException when no data source is set #368. Thanks to Heewon Lee, Gary Gregory.
+
+Changes
+-------
+
+* Bump jackson-databind from 2.14.2 to 2.16.1 #297, #303, #326, #331, #340. Thanks to Dependabot.
+* Bump commons-io:commons-io from 2.11.0 to 2.15.1. Thanks to Gary Gregory.
+* Bump spring-* from 5.3.26 to 5.3.32. Thanks to Gary Gregory.
+* Bump commons-parent from 57 to 67. Thanks to Gary Gregory.
+* Bump commons-codec:commons-codec from 1.15 to 1.16.1. Thanks to Gary Gregory.
+* Bump commons-lang3 from 3.11 to 3.14.0. Thanks to Gary Gregory.
+* Bump org.yaml:snakeyaml from 2.0 to 2.2 #312, #315. Thanks to Dependabot.
+* Bump slf4j.version from 2.0.7 to 2.0.12 #358. Thanks to Dependabot.
+* Bump org.apache.commons:commons-dbcp2 from 2.9.0 to 2.12.0. Thanks to Gary Gregory.
+* Bump org.apache.commons:commons-pool2 from 2.11.1 to 2.12.0. Thanks to Gary Gregory.
+* Bump org.apache.logging.log4j:log4j-1.2-* from 2.20.0 to 2.23.0 #334, #339, #367. Thanks to Gary Gregory, Dependabot.
+* Bump org.apache.commons:commons-text from 1.10.0 to 1.11.0. Thanks to Gary Gregory.
+* Bump commons-logging:commons-logging from 1.2 to 1.3.0. Thanks to Gary Gregory.
+
+
+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_configuration.cgi
+
+-----------------------------------------------------------------------------
+Apache Commons Configuration
+Version 2.10.0
+Release Notes
+
+Introducing Apache Commons Configuration
+----------------------------------------
+
+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.
diff --git a/pom.xml b/pom.xml
index 8ed545c..9b0606b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,14 @@
<inceptionYear>2001</inceptionYear>
<description>
- Tools to assist in the reading of configuration/preferences files in
- various formats.
+ Tools to assist in the reading of configuration/preferences files in various formats; requires Java 8.
</description>
<properties>
<commons.componentid>configuration</commons.componentid>
<commons.module.name>org.apache.commons.configuration2</commons.module.name>
- <commons.release.version>2.10.0</commons.release.version>
- <commons.release.next>2.10.1</commons.release.next>
+ <commons.release.version>2.10.1</commons.release.version>
+ <commons.release.next>2.10.2</commons.release.next>
<commons.release.desc>(Java 8 or above)</commons.release.desc>
<commons.release.2.name>commons-configuration-${commons.release.2.version}</commons.release.2.name>
<commons.release.2.version>1.10</commons.release.2.version>
@@ -46,9 +45,7 @@
<commons.jira.pid>12310467</commons.jira.pid>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
-
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration</commons.scmPubUrl>
-
<!-- Explicitly declare optional dependencies for the OSGi manifest. -->
<commons.osgi.import>
org.apache.commons.beanutils.*;resolution:=optional,
@@ -67,11 +64,9 @@
<slf4j.version>2.0.12</slf4j.version>
<!-- Spring 6 requires Java 17 -->
<spring.version>5.3.33</spring.version>
-
<japicmp.skip>false</japicmp.skip>
-
<!-- Commons Release Plugin -->
- <commons.bc.version>2.9.0</commons.bc.version>
+ <commons.bc.version>2.10.0</commons.bc.version>
<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>
diff --git a/src/site/xdoc/download_configuration.xml b/src/site/xdoc/download_configuration.xml
index be3907d..cfb31dc 100644
--- a/src/site/xdoc/download_configuration.xml
+++ b/src/site/xdoc/download_configuration.xml
@@ -113,32 +113,32 @@
</p>
</subsection>
</section>
- <section name="Apache Commons Configuration 2.10.0 (Java 8 or above)">
+ <section name="Apache Commons Configuration 2.10.1 (Java 8 or above)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz">commons-configuration2-2.10.0-bin.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz">commons-configuration2-2.10.1-bin.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip">commons-configuration2-2.10.0-bin.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip">commons-configuration2-2.10.1-bin.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz">commons-configuration2-2.10.0-src.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz">commons-configuration2-2.10.1-src.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.10.0-src.zip">commons-configuration2-2.10.0-src.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.0-src.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.0-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.10.1-src.zip">commons-configuration2-2.10.1-src.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.1-src.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/configuration/source/commons-configuration2-2.10.1-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
