Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons Configuration 2.20.1 RC1 Deployer properties:"userAgent" = "Apache-Maven/3.9.6 (Java 17.0.10; Mac OS X 14.3.1)""userId" = "ggregory""ip" = "98.180.73.170"Details:The following artifacts have been staged/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.jar.asc(SHA1: 3e7785265b647272bf06f6eb1c612ee6efad7cd4)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.jar(SHA1: 2b681b3bcddeaa5bf5c2a2939cd77e2f9ad6efda)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-tests.jar(SHA1: 48f0cd1de5083a805f2f02a8ff2a3652fbbb1639)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-cyclonedx.xml.asc(SHA1: 1e5cf8b0fcc9253f7c303562d5ecd0d4ab55c89f)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-sources.jar.asc(SHA1: cd78801b06db61c2bbe252d154b884ffd4be609b)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-javadoc.jar.asc(SHA1: bd832a0e2b8ec95e577ec086571c254adc0c64c5)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-tests.jar.asc(SHA1: 734026ad22da7fcc1e91fb15b31436c0509bbba7)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-cyclonedx.xml(SHA1: 57f35ac1d16cf58f24af770f32c2261b62a110a9)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-test-sources.jar(SHA1: fa250efaaf34d07a9dd90a755dc67182618d6de6)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-test-sources.jar.asc(SHA1: 6247687efa5f854f16df5e66e7e95acbe0bed740)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-cyclonedx.json(SHA1: 95c9361afd4ff26554f45b84a7b672686d03b025)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-javadoc.jar(SHA1: c4456330f9c9aaa82176f4cb600708799e615631)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.pom.asc(SHA1: d32ebfb31db88583da114dbe8e88a587fcc34675)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.spdx.json.asc(SHA1: 90d97bb62136c2c81426dc9b458f0a0e47bace15)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-cyclonedx.json.asc(SHA1: da743747e961c729c4dbb7f430c2790f9af61e32)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.spdx.json(SHA1: 59627067a12c1733b9e365ab48587417a8fe083f)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1-sources.jar(SHA1: 9857337eb462073b07af85ad13a97f7f982e9889)/org/apache/commons/commons-configuration2/2.10.1/commons-configuration2-2.10.1.pom(SHA1: 564e1ed820307a1f618040e0c8eceb09efb3d5e0)Action performed by Gary D. Gregory (ggregory)
svn commit: r67980 - in /dev/commons/configuration/2.10.1-RC1: ./ binaries/ site/ site/apidocs/ site/apidocs/legal/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/api
Author: ggregory Date: Sun Mar 17 20:30:55 2024 New Revision: 67980 Log: Staging release: commons-configuration2, version: 2.10.1 [This commit notification would consist of 476 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
(commons-configuration) annotated tag commons-configuration-2.10.1-RC1 created (now 06899920)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag commons-configuration-2.10.1-RC1 in repository https://gitbox.apache.org/repos/asf/commons-configuration.git at 06899920 (tag) tagging 81573fa387435e985cc05356c33c49273fc4a018 (commit) replaces rel/commons-configuration-2.10.0 by Gary Gregory on Sun Mar 17 20:22:38 2024 + - Log - Tag Apache Commons Configuration release 2.10.1 RC1 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmX3UQ4ACgkQhv3H4qES YstQYwf8DyzeojMuCQiLAa1x2rloXheP3fFO8vvHHwiDArrrg91XdE8/2xbyX9J0 N65B44nUKfsO0fTal4+HCHeDG0qo6isBL/8zZNePVuAmCzbYWP4IN8rrye0IW8ve Nd7ZUcE4UHjwr3sJjEFXIUO8h+umNdjcODZYvJmJ4PXyFRrVKx3LTo5mQYVL/H0x chyqtTD4Plggx2CSvy9w3kZdWdAETs5taHBAlpDcAqEKj0Wc/2jmk+Qh2pj72vtt 2MudhKkrLk6xXSfGNbipO9IKlbxoouExjOXzch7+5MWNVogeYtXwzB59iPM50HUE LtutwHk5EywRJsQYMz7uQpzcxCzUBA== =hgpp -END PGP SIGNATURE- --- No new revisions were added by this update.
(commons-configuration) branch release updated: Prepare for the next release candidate
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/release by this push:
new 81573fa3 Prepare for the next release candidate
81573fa3 is described below
commit 81573fa387435e985cc05356c33c49273fc4a018
Author: Gary Gregory
AuthorDate: Sun Mar 17 20:22:23 2024 +
Prepare for the next release candidate
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b0606b5..428eb245 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
4.0.0
commons-configuration2
- 2.10.1-SNAPSHOT
+ 2.10.1
Apache Commons Configuration
2001
@@ -70,7 +70,7 @@
RC1
true
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
-
2024-03-12T23:55:07Z
+
2024-03-17T20:14:52Z
https://commons.apache.org/proper/commons-configuration/
(commons-configuration) branch release updated (23911807 -> c2f4d787)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 23911807 Prepare for the next release candidate add c2f4d787 Prepare for the next release candidate No new revisions were added by this update. Summary of changes: RELEASE-NOTES.txt | 36 1 file changed, 8 insertions(+), 28 deletions(-)
(commons-configuration) branch master updated: Prepare for the next release candidate
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 c2f4d787 Prepare for the next release candidate c2f4d787 is described below commit c2f4d78765e8dc9fe4ff7ff46f1bb95067ac1065 Author: Gary Gregory AuthorDate: Sun Mar 17 20:14:27 2024 + Prepare for the next release candidate --- RELEASE-NOTES.txt | 36 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 8d799644..d3449696 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,5 @@ Apache Commons Configuration -Version 2.10.0 +Version 2.10.1 Release Notes Introducing Apache Commons Configuration @@ -17,41 +17,20 @@ Minor release with new features and updated dependencies; requires Java 8 or abo 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(Iteratorhttps://commons.apache.org/proper/commons-configuration/changes-report.html @@ -64,6 +43,7 @@ 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
(commons-configuration) branch release updated (e21bb4ee -> 23911807)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from e21bb4ee Prepare for the next release candidate add 3fa63353 Move less edited fragment to the bottom add 7a626368 Move properties near the top add 23911807 Prepare for the next release candidate No new revisions were added by this update. Summary of changes: README.md| 7 +- RELEASE-NOTES.txt| 66 pom.xml | 587 +++ src/site/xdoc/download_configuration.xml | 26 +- 4 files changed, 373 insertions(+), 313 deletions(-)
(commons-configuration) 01/03: Move less edited fragment to the bottom
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 commit 3fa633538bcab8f58127ac9ed64eca1a21e2f0e2 Author: Gary Gregory AuthorDate: Sun Mar 17 16:08:26 2024 -0400 Move less edited fragment to the bottom --- pom.xml | 454 1 file changed, 227 insertions(+), 227 deletions(-) diff --git a/pom.xml b/pom.xml index 639c2884..08cb0e74 100644 --- a/pom.xml +++ b/pom.xml @@ -58,233 +58,6 @@ - - - Daniel Rall - dlr - d...@finemaltcoding.com - CollabNet, Inc. - -Java Developer - - - - - Jason van Zyl - jvanzyl - ja...@zenplex.com - Zenplex - -Java Developer - - - - - Martin Poeschl - mpoeschl - mpoes...@marmot.at - tucana.at - -Java Developer - - - - - dIon Gillard - dion - d...@multitask.com.au - Multitask Consulting - -Java Developer - - - - - Henning P. Schmiedehausen - henning - h...@intermeta.de - INTERMETA - Gesellschaft fuer Mehrwertdienste mbH - 2 - -Java Developer - - - - - Eric Pugh - epugh - ep...@upstate.com - upstate.com - -Java Developer - - - - - Brian E. Dunbar - bdunbar - bdun...@dunbarconsulting.org - dunbarconsulting.org - -Java Developer - - - - - Emmanuel Bourg - ebourg - ebo...@apache.org - Ariane Software - +1 - -Java Developer - - - - - Oliver Heger - oheger - ohe...@apache.org - Bosch Software Innovations - +1 - -Java Developer - - - - - Jrg Schaible - joehni - joerg.schai...@gmx.de - +1 - -Java Developer - - - - - Ralph Goers - rgoers - rgo...@apache.org - Intuit - -8 - -Java Developer - - - - - ggregory - Gary Gregory - ggregory at apache.org - https://www.garygregory.com - The Apache Software Foundation - https://www.apache.org/ - -PMC Member - - America/New_York - - https://people.apache.org/~ggregory/img/garydgregory80.png - - - - - Claude Warren - claudenw - cla...@apache.org - 0 - -Java Developer - - - - - Rob Tompkins - chtompki - chtom...@apache.org - -4 - -Java Developer - - - - - - - Konstantin Shaposhnikov - k...@scand.com - scand.com - - - - Jamie M. Guillemette - jmguilleme...@gmail.com - TD Bank - - - - Jorge Ferrer - jorge.fer...@gmail.com - - - - - Gabriele Garuglieri - gabriele.garugli...@infoblu.it - Infoblu S.p.A - - - - Nicolas De Loof - nicolas.del...@gmail.com - Cap Gemini - - - - Oliver Kopp - kopp...@gmail.com - - - - Dennis Kieselhorst - d...@apache.org - IRIAN Deutschland - - - - Raviteja Lokineni - raviteja.lokin...@gmail.com - - - - Vincent Maurin - vincent.maurin...@gmail.com - glispa GmbH - - - - The Alchemist - kap4...@gmail.com - - - - Pascal Essiembre - pascal.essiem...@norconex.com - Norconex Inc. - https://www.norconex.com - -developer - - -4 - - - - Patrick Schmidt - patrick.schm...@codecamp.de - - - org.apache.commons @@ -859,4 +632,231 @@ + + + Daniel Rall + dlr + d...@finemaltcoding.com + CollabNet, Inc. + +Java Developer + + + + + Jason van Zyl + jvanzyl + ja...@zenplex.com + Zenplex + +Java Developer + + + + + Martin Poeschl + mpoeschl + mpoes...@marmot.at + tucana.at + +Java Developer + + + + + dIon Gillard + dion + d...@multitask.com.au + Multitask Consulting + +Java Developer + + + + + Henning P. Schmiedehausen + henning + h...@intermeta.de + INTERMETA - Gesellschaft fuer Mehrwertdienste mbH + 2 + +Java Developer + + + + + Eric Pugh + epugh + ep...@upstate.com + upstate.com + +Java Developer + + + + + Brian E. Dunbar + bdunbar + bdun...@dunbarconsulting.org + dunbarconsulting.org + +Java Developer + + + + + Emmanuel Bourg + ebourg +
(commons-configuration) 03/03: Prepare for the next release candidate
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 commit 23911807cfc8130518dbcbdc54056760966501f2 Author: Gary Gregory AuthorDate: Sun Mar 17 20:11:40 2024 + Prepare for the next release candidate --- README.md| 7 ++-- RELEASE-NOTES.txt| 66 pom.xml | 13 ++- src/site/xdoc/download_configuration.xml | 26 ++--- 4 files changed, 86 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index a8db88ed..83ce3124 100644 --- a/README.md +++ b/README.md @@ -46,12 +46,11 @@ Apache Commons Configuration [](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 @@ Alternatively, you can pull it from the central Maven repositories: org.apache.commons commons-configuration2 - 2.10.0 + 2.10.1 ``` diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ab2e41ac..8d799644 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -11,6 +11,72 @@ 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; 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(Iteratorhttps://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 8ed545cf..9b0606b5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,15 +29,14 @@ 2001 -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. configuration org.apache.commons.configuration2 -2.10.0 -2.10.1 +2.10.1 +2.10.2 (Java 8 or above)
(commons-configuration) branch master updated (e21bb4ee -> 23911807)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from e21bb4ee Prepare for the next release candidate new 3fa63353 Move less edited fragment to the bottom new 7a626368 Move properties near the top new 23911807 Prepare for the next release candidate The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md| 7 +- RELEASE-NOTES.txt| 66 pom.xml | 587 +++ src/site/xdoc/download_configuration.xml | 26 +- 4 files changed, 373 insertions(+), 313 deletions(-)
(commons-configuration) 02/03: Move properties near the top
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
commit 7a6263685a86e3285295fa8d269887a3e9313f1e
Author: Gary Gregory
AuthorDate: Sun Mar 17 16:09:09 2024 -0400
Move properties near the top
---
pom.xml | 90 -
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index 08cb0e74..8ed545cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,51 @@
various formats.
+
+configuration
+
org.apache.commons.configuration2
+2.10.0
+2.10.1
+(Java 8 or above)
+
commons-configuration-${commons.release.2.version}
+1.10
+(old 1.x version)
+CONFIGURATION
+12310467
+1.8
+1.8
+
+
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration
+
+
+
+ org.apache.commons.beanutils.*;resolution:=optional,
+ org.apache.commons.codec.*;resolution:=optional,
+ org.apache.commons.jxpath.*;resolution:=optional,
+ org.apache.xml.resolver.*;resolution:=optional,
+ javax.servlet.*;resolution:=optional,
+ org.apache.commons.jexl2.*;resolution:=optional,
+ org.apache.commons.vfs2.*;resolution:=optional,
+ org.springframework.*;resolution:=optional,
+ com.fasterxml.jackson.*;resolution:=optional,
+ org.yaml.snakeyaml.*;resolution:=optional,
+ *
+
+2.23.1
+2.0.12
+
+5.3.33
+
+false
+
+
+2.9.0
+RC1
+true
+
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
+
2024-03-12T23:55:07Z
+
+
https://commons.apache.org/proper/commons-configuration/
@@ -306,51 +351,6 @@
-
-configuration
-
org.apache.commons.configuration2
-2.10.0
-2.10.1
-(Java 8 or above)
-
commons-configuration-${commons.release.2.version}
-1.10
-(old 1.x version)
-CONFIGURATION
-12310467
-1.8
-1.8
-
-
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration
-
-
-
- org.apache.commons.beanutils.*;resolution:=optional,
- org.apache.commons.codec.*;resolution:=optional,
- org.apache.commons.jxpath.*;resolution:=optional,
- org.apache.xml.resolver.*;resolution:=optional,
- javax.servlet.*;resolution:=optional,
- org.apache.commons.jexl2.*;resolution:=optional,
- org.apache.commons.vfs2.*;resolution:=optional,
- org.springframework.*;resolution:=optional,
- com.fasterxml.jackson.*;resolution:=optional,
- org.yaml.snakeyaml.*;resolution:=optional,
- *
-
-2.23.1
-2.0.12
-
-5.3.33
-
-false
-
-
-2.9.0
-RC1
-true
-
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
-
2024-03-12T23:55:07Z
-
-
clean verify apache-rat:check japicmp:cmp checkstyle:check
spotbugs:check pmd:check pmd:cpd-check javadoc:javadoc
(commons-configuration) branch release updated (0409a978 -> e21bb4ee)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 0409a978 Bump to next development version add c147f2be Bump com.fasterxml.jackson.core:jackson-databind from 2.16.1 to 2.17.0 (#378) add 8505dc3b Bump com.fasterxml.jackson.core:jackson-databind from 2.16.1 to 2.17.0 #378 add 8b15be2d Bump log4j.version from 2.23.0 to 2.23.1 (#379) add 8647cd45 Bump log4j.version from 2.23.0 to 2.23.1 #379 add ea0f24c9 Sort members add 56b5c4dc [CONFIGURATION-840] StackOverflowError when adding property in AbstractListDelimiterHandler.flattenIterator() add c50f01f5 [CONFIGURATION-839] Version 2.10.0 fails java.lang.module.FindException: Module servlet.api not found add 26f5435b Bump actions/setup-java from 4.1.0 to 4.2.1 (#383) add 8add1c72 Bump actions/checkout from 4.1.1 to 4.1.2 (#385) add ddf885bd Bump github/codeql-action from 3.24.6 to 3.24.7 (#384) add 15b07437 Better description add 7d7d399d [CONFIGURATION-840] More tests add 041094f8 [CONFIGURATION-840] More tests add aeba79ef Sort interface members add 06df1136 Use Apache in the doc add a1777588 Remove unnecessary file add 43f4dab0 [CONFIGURATION-841] StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree add 380d52a3 Describe where Java 8 is required in changes.xml add d28d992b Bump spring.version from 5.3.32 to 5.3.33 (#380) add 66a896da Bump spring.version from 5.3.32 to 5.3.33 #380 add e90cc549 Typo in changes.xml add 033d50d9 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration add 82bb3ac7 Better internal name add 46e54950 Javadoc add 860d17b6 Inline pre-Java 5 internal utility method add e21bb4ee Prepare for the next release candidate No new revisions were added by this update. Summary of changes: .github/workflows/codeql-analysis.yml | 8 +- .github/workflows/coverage.yml | 4 +- .github/workflows/maven.yml| 4 +- .github/workflows/scorecards-analysis.yml | 4 +- NOTICE.txt | 10 +- RELEASE-NOTES.txt | 67 pom.xml| 10 +- src/changes/changes.xml| 26 +- src/conf/CommonsConfiguration.xsd | 2 +- src/conf/README| 4 - .../AbstractHierarchicalConfiguration.java | 8 +- .../commons/configuration2/Configuration.java | 104 +++--- .../commons/configuration2/DataConfiguration.java | 2 +- .../configuration2/HierarchicalConfiguration.java | 90 ++--- .../ImmutableHierarchicalConfiguration.java| 42 +-- .../beanutils/BeanCreationContext.java | 18 +- .../configuration2/beanutils/BeanDeclaration.java | 34 +- .../builder/BasicBuilderProperties.java| 118 +++ .../builder/DatabaseBuilderProperties.java | 56 ++-- .../builder/PropertiesBuilderProperties.java | 18 +- .../builder/XMLBuilderProperties.java | 16 +- .../combined/CombinedBuilderProperties.java| 76 ++--- .../convert/AbstractListDelimiterHandler.java | 40 ++- .../convert/ListDelimiterHandler.java | 54 +-- .../configuration2/convert/PropertyConverter.java | 59 ++-- .../configuration2/io/FileHandlerListener.java | 20 +- .../configuration2/resolver/CatalogResolver.java | 2 +- .../configuration2/resolver/EntityRegistry.java| 14 +- .../configuration2/sync/NoOpSynchronizer.java | 4 +- .../commons/configuration2/sync/Synchronizer.java | 12 +- .../configuration2/sync/SynchronizerSupport.java | 18 +- .../tree/ConfigurationNodeVisitor.java | 20 +- .../configuration2/tree/ExpressionEngine.java | 56 ++-- .../commons/configuration2/tree/NodeHandler.java | 108 +++--- .../configuration2/tree/NodeKeyResolver.java | 50 +-- .../commons/configuration2/tree/NodeModel.java | 76 ++--- src/site/xdoc/download_configuration.xml | 372 ++--- src/site/xdoc/issue-tracking.xml | 204 +-- .../TestPropertiesConfiguration.java | 138 +++- 39 files changed, 1085 insertions(+), 883 deletions(-) delete mode 100644 src/conf/README
(commons-configuration) branch master updated: Prepare for the next release candidate
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 e21bb4ee Prepare for the next release candidate e21bb4ee is described below commit e21bb4ee87463cd4a524152e9d38c64e43b069ed Author: Gary Gregory AuthorDate: Sun Mar 17 20:01:40 2024 + Prepare for the next release candidate --- NOTICE.txt | 10 +- RELEASE-NOTES.txt| 67 ++ pom.xml | 2 +- src/changes/changes.xml | 2 +- src/site/xdoc/download_configuration.xml | 372 +++ src/site/xdoc/issue-tracking.xml | 204 - 6 files changed, 362 insertions(+), 295 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 655d659c..0e7b835c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ -Apache Commons Configuration -Copyright 2001-2024 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). +Apache Commons Configuration +Copyright 2001-2024 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 38b731e2..ab2e41ac 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -11,6 +11,73 @@ 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; 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(Iteratorhttps://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 b92e169a..639c2884 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2001 Tools to assist in the reading of configuration/preferences files in -various formats +various formats. https://commons.apache.org/proper/commons-configuration/ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 83aca3f7..349cd193 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -23,7 +23,7 @@ Apache Commons Community - + StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). java.lang.module.FindException: Module servlet.api not found. diff --git a/src/site/xdoc/download_configuration.xml b/src/site/xdoc/download_configuration.xml index f5428cc7..be3907d2 100644 --- a/src/site/xdoc/download_configuration.xml +++ b/src/site/xdoc/download_configuration.xml @@ -1,186 +1,186 @@ - - - - - -Download Apache Commons Configuration -Apache Commons Documentation Team - - - - - -We recommend you use a mirror to download our release -builds, but you must https://www.apache.org/info/verification.html;>verify the integrity 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. - - - -You are currently using [preferred]. If you -encounter a problem with this mirror, please select another -mirror. If all mirrors are
(commons-configuration) 02/03: Javadoc
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
commit 46e549506fb033d0b2663fc48082b8c28c153e8e
Author: Gary Gregory
AuthorDate: Sun Mar 17 15:52:55 2024 -0400
Javadoc
---
.../configuration2/convert/PropertyConverter.java | 50 +++---
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index f499ca4e..38cc965f 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -77,11 +77,11 @@ public final class PropertyConverter {
* Private constructor prevents instances from being created.
*/
private PropertyConverter() {
-// to prevent instantiation...
+// presvents instantiation.
}
/**
- * Performs a data type conversion from the specified value object to the
given target data class. If additional
+ * Converts the specified value object to the given target data class. If
additional
* information is required for this conversion, it is obtained from the
passed in {@code DefaultConversionHandler}
* object. If the class is a primitive type (Integer.TYPE, Boolean.TYPE,
etc), the value returned will use the wrapper
* type (Integer.class, Boolean.class, etc).
@@ -167,7 +167,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Boolean. Internally the {@code
org.apache.commons.lang.BooleanUtils} class from
+ * Converts the specified object into a Boolean. Internally the {@code
org.apache.commons.lang.BooleanUtils} class from
* the https://commons.apache.org/lang/;>Commons Lang project
is used to perform this conversion. This
* class accepts some more tokens for the boolean value of true,
e.g. {@code yes} and {@code on}. Please refer to
* the documentation of this class for more details.
@@ -207,7 +207,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Byte.
+ * Converts the specified object into a Byte.
*
* @param value the value to convert
* @return the converted value
@@ -222,7 +222,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Short.
+ * Converts the specified object into a Short.
*
* @param value the value to convert
* @return the converted value
@@ -237,7 +237,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into an Integer.
+ * Converts the specified object into an Integer.
*
* @param value the value to convert
* @return the converted value
@@ -252,7 +252,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Long.
+ * Converts the specified object into a Long.
*
* @param value the value to convert
* @return the converted value
@@ -267,7 +267,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Float.
+ * Converts the specified object into a Float.
*
* @param value the value to convert
* @return the converted value
@@ -282,7 +282,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Double.
+ * Converts the specified object into a Double.
*
* @param value the value to convert
* @return the converted value
@@ -297,7 +297,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a Duration.
+ * Converts the specified object into a Duration.
*
* @param value the value to convert
* @return the converted value
@@ -319,7 +319,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a BigInteger.
+ * Converts the specified object into a BigInteger.
*
* @param value the value to convert
* @return the converted value
@@ -334,7 +334,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a BigDecimal.
+ * Converts the specified object into a BigDecimal.
*
* @param value the value to convert
* @return the converted value
@@ -391,7 +391,7 @@ public final class PropertyConverter {
}
/**
- * Convert the specified object into a File.
+ * Converts the specified object into a File.
*
* @param value the value to convert
* @return the converted value
@@ -412,7 +412,7 @@ public final class PropertyConverter {
}
/**
- * Convert
(commons-configuration) 03/03: Inline pre-Java 5 internal utility method
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
commit 860d17b62801d3d6ba77aeb37ee30afbee8e8938
Author: Gary Gregory
AuthorDate: Sun Mar 17 15:56:49 2024 -0400
Inline pre-Java 5 internal utility method
---
.../org/apache/commons/configuration2/DataConfiguration.java | 2 +-
.../commons/configuration2/convert/PropertyConverter.java | 11 ++-
.../commons/configuration2/resolver/CatalogResolver.java | 2 +-
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
index 318b2333..574256f6 100644
--- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
@@ -47,7 +47,7 @@ import org.apache.commons.lang3.StringUtils;
* {@link java.net.InetAddress}
* {@code javax.mail.internet.InternetAddress} (requires Javamail in the
classpath)
* {@code jakarta.mail.internet.InternetAddress} (requires Javamail 2.+ in
the classpath)
- * {@link Enum} (Java 5 enumeration types)
+ * {@link Enum}
*
*
* Lists and arrays are available for all types.
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index 38cc965f..b45a1d90 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -147,7 +147,7 @@ public final class PropertyConverter {
return toPattern(value);
} else if (Locale.class.equals(cls)) {
return toLocale(value);
-} else if (isEnum(cls)) {
+} else if (cls.isEnum()) {
return convertToEnum(cls, value);
} else if (Color.class.equals(cls)) {
return toColor(value);
@@ -628,14 +628,7 @@ public final class PropertyConverter {
}
/**
- * Calls Class.isEnum() on Java 5, returns false on older JRE.
- */
-static boolean isEnum(final Class cls) {
-return cls.isEnum();
-}
-
-/**
- * Converts the specified value into a Java 5 enum.
+ * Converts the specified value into an {@link Enum}.
*
* @param value the value to convert
* @param cls the type of the enumeration
diff --git
a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
index 2cf89664..d08cc68e 100644
---
a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
+++
b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
@@ -163,7 +163,7 @@ public class CatalogResolver implements EntityResolver {
final String badFilePrefix = "file://";
final String correctFilePrefix = "file:///";
-// Java 5 has a bug when constructing file URLS
+// Java 5 has a bug when constructing file URLs
if (resolved.startsWith(badFilePrefix) &&
!resolved.startsWith(correctFilePrefix)) {
resolved = correctFilePrefix +
resolved.substring(badFilePrefix.length());
}
(commons-configuration) 01/03: Better internal name
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
commit 82bb3ac7ad432e0b839cd86279ecd88b51d6dec1
Author: Gary Gregory
AuthorDate: Sun Mar 17 15:44:21 2024 -0400
Better internal name
---
.../commons/configuration2/AbstractHierarchicalConfiguration.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
index 12f0fcc8..bcfc07f3 100644
---
a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
@@ -155,7 +155,7 @@ public abstract class AbstractHierarchicalConfiguration
extends AbstractConfi
implements Cloneable, NodeKeyResolver, HierarchicalConfiguration {
/** The model for managing the data stored in this configuration. */
-private NodeModel model;
+private NodeModel nodeModel;
/** Stores the expression engine for this instance. */
private ExpressionEngine expressionEngine;
@@ -166,7 +166,7 @@ public abstract class AbstractHierarchicalConfiguration
extends AbstractConfi
* @param nodeModel the {@code NodeModel}
*/
protected AbstractHierarchicalConfiguration(final NodeModel nodeModel) {
-model = nodeModel;
+this.nodeModel = nodeModel;
}
/**
@@ -605,7 +605,7 @@ public abstract class AbstractHierarchicalConfiguration
extends AbstractConfi
copy.setSynchronizer(NoOpSynchronizer.INSTANCE);
copy.cloneInterpolator(this);
copy.setSynchronizer(ConfigurationUtils.cloneSynchronizer(getSynchronizer()));
-copy.model = cloneNodeModel();
+copy.nodeModel = cloneNodeModel();
return copy;
} catch (final CloneNotSupportedException cex) {
@@ -655,7 +655,7 @@ public abstract class AbstractHierarchicalConfiguration
extends AbstractConfi
* @return the node model
*/
protected NodeModel getModel() {
-return model;
+return nodeModel;
}
/**
(commons-configuration) branch master updated (033d50d9 -> 860d17b6)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 033d50d9 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration new 82bb3ac7 Better internal name new 46e54950 Javadoc new 860d17b6 Inline pre-Java 5 internal utility method The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../AbstractHierarchicalConfiguration.java | 8 +-- .../commons/configuration2/DataConfiguration.java | 2 +- .../configuration2/convert/PropertyConverter.java | 59 ++ .../configuration2/resolver/CatalogResolver.java | 2 +- 4 files changed, 32 insertions(+), 39 deletions(-)
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons Logging 1.3.1 RC2 Deployer properties:"userAgent" = "Apache-Maven/3.9.6 (Java 17.0.10; Mac OS X 14.3.1)""userId" = "ggregory""ip" = "98.180.73.170"Details:The following artifacts have been staged/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-api.jar(SHA1: c8395db010f14b2643d838c66703ad7c9325ff3c)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.jar.asc(SHA1: a37d61c385d6424f9bb9bdc07d0812bd65dc37e4)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.spdx.json.asc(SHA1: 7664440a262bf0ada25b968edebb41708bb62a00)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-test-sources.jar.asc(SHA1: bed849b75e8fffedbafb30775ffa585d034b1ac7)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-cyclonedx.xml.asc(SHA1: 221d2febaad1ebf026d4cc342b6f29f80e637f0e)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-javadoc.jar(SHA1: 5d9d9f7a11795f20003063169e150c7efbdcddfc)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-adapters.jar.asc(SHA1: 21d5249361a0d8dde87e739ebe54d6f0a830327c)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-adapters.jar(SHA1: 368f05573fbbca34bf18e3bd92a5caa0ca7a847b)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-cyclonedx.xml(SHA1: 237c8d6ea893daa3d153a74faddb9bcf89740ead)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-sources.jar.asc(SHA1: ef6e415fe5bc059e474db68d815e85a2ee6f9401)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-sources.jar(SHA1: ec6646cdc7db428403fcbc79345267d2f08fae1d)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.spdx.json(SHA1: 78e27c4f448bf7671ccac6770c387e557d8a1635)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-tests.jar(SHA1: b5860f29d394ccd35d9b1205c03881dfdcd12787)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-test-sources.jar(SHA1: 9921fecd57b86cf708ee2936bea2f882555bbb29)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-javadoc.jar.asc(SHA1: 78c8b2bb082807f8882063c0a0a0be2372990f0e)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.pom(SHA1: 4bfde82c8e291f8e31227a91e0c5e428ee113e2d)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-api.jar.asc(SHA1: f7234049e927669304ff50517d76d58fc0ff2e6a)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.jar(SHA1: 8cff7dc1e492911f3dd7640ebfb60d6206a1dd40)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.pom.asc(SHA1: d59f790a2687a10eaf4ef237c36b559462ca99f9)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-cyclonedx.json.asc(SHA1: d09b64dacc778439b1b3fed098ac0289cbdd6200)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-tests.jar.asc(SHA1: c4804042c9edbea5a84e15f1d6594c17f7755652)/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1-cyclonedx.json(SHA1: d7dec860afdfe973f4228d80e9a2374f32ee13c6)Action performed by Gary D. Gregory (ggregory)
svn commit: r67979 - in /dev/commons/logging/1.3.1-RC2: ./ binaries/ site/ site/apidocs/ site/apidocs/legal/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/apidocs/or
Author: ggregory Date: Sun Mar 17 15:40:30 2024 New Revision: 67979 Log: Staging release: commons-logging, version: 1.3.1 [This commit notification would consist of 68 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
(commons-logging) annotated tag commons-logging-1.3.1-RC2 created (now 332db15)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag commons-logging-1.3.1-RC2 in repository https://gitbox.apache.org/repos/asf/commons-logging.git at 332db15 (tag) tagging 558bb9cdd5fb06e313214d34ed5be7de5f000a5a (commit) replaces rel/commons-logging-1.3.0 by Gary Gregory on Sun Mar 17 15:35:57 2024 + - Log - Tag Apache Commons Logging release 1.3.1 RC2 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmX3Dd0ACgkQhv3H4qES Ysuobgf9GCtXDMlgEcnZrJS0ohdSFOzfa1sjM7+dmqHIuRqmdheROfAWbq90FGNE V4GssXlrpT98F5DuTD2HVyd4bzxiMEpCaAAf1oH3IMUkWoQi+XJggA38bzPOS8e2 iML7p8ht/b9s7F8BkrCeG9QKx7xxFURde5L1+HTqzaq3V1UaHGScpmiiMi7sxuBH nousulpVtH/H2jaP3DMYo4hPudJB7ikfj4wX0JM4KGT1sZVpFFAvZs4Jf0qe3G0p lMLqfFVrAxGI2BTHvqoiy+i+0wBK8hjxAUYJdYQMVVzHbI6Q6mtpItkST94jTdnQ iVM9kYN3Ygrhk4oWH6zQB2NO2R/xrA== =nwif -END PGP SIGNATURE- --- No new revisions were added by this update.
(commons-logging) branch release updated: Prepare for the next release candidate
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/commons-logging.git The following commit(s) were added to refs/heads/release by this push: new 558bb9c Prepare for the next release candidate 558bb9c is described below commit 558bb9cdd5fb06e313214d34ed5be7de5f000a5a Author: Gary Gregory AuthorDate: Sun Mar 17 15:35:32 2024 + Prepare for the next release candidate --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d230f67..04018ba 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ under the License. commons-logging commons-logging Apache Commons Logging - 1.3.1-SNAPSHOT + 1.3.1 Apache Commons Logging is a thin adapter allowing configurable bridging to other, well-known logging systems. https://commons.apache.org/proper/commons-logging/ @@ -677,7 +677,7 @@ under the License. org.slf4j;version="[1.7, 3)";resolution:=optional, org.slf4j.spi;version="[1.7, 3)";resolution:=optional - 2024-01-01T00:00:00Z + 2024-03-17T15:34:53Z
(commons-logging) branch release updated (a15fe62 -> 57d09eb)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/commons-logging.git from a15fe62 Complex test set up and run is done through the verify goal add 57d09eb [LOGGING-189] Add optional import for package org.slf4j.spi (#232) No new revisions were added by this update. Summary of changes: pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(commons-logging) branch master updated: [LOGGING-189] Add optional import for package org.slf4j.spi (#232)
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-logging.git The following commit(s) were added to refs/heads/master by this push: new 57d09eb [LOGGING-189] Add optional import for package org.slf4j.spi (#232) 57d09eb is described below commit 57d09eb9fccfd6bd11688ee3a55a161f55944e84 Author: Hannes Wellmann AuthorDate: Sun Mar 17 16:30:55 2024 +0100 [LOGGING-189] Add optional import for package org.slf4j.spi (#232) Co-authored-by: Hannes Wellmann --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1eda2fb..d230f67 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,8 @@ under the License. org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional, - org.slf4j;version="[1.7, 3)";resolution:=optional + org.slf4j;version="[1.7, 3)";resolution:=optional, + org.slf4j.spi;version="[1.7, 3)";resolution:=optional 2024-01-01T00:00:00Z
(commons-logging) branch release updated (ac55303 -> a15fe62)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/commons-logging.git omit ac55303 Prepare for the next release candidate add ad2f53a Bump logkit from 1.0.1 to 2.0 (#32) add 3fcbbb2 Bump logkit from 1.0.1 to 2.0 #32 add 446a642 Allow Servlet 4 in OSGi environment. (#191) add 9ee83d3 Allow Servlet 4 in OSGi environment #191 add 3b2daae cure generics warnings (#213) add 8967fcf Fix generics warnings #213 add 0f61b80 [LOGGING-189] Fix Import-Package entry for org.slf4j. (#188) add 7b2b00b Fix Import-Package entry for org.slf4j #188 add 53e06aa Prepare for a release candidate add 59e67f3 Try to get Codecov working. add a15fe62 Complex test set up and run is done through the verify goal This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ac55303) \ N -- N -- N refs/heads/release (a15fe62) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/coverage.yml | 13 --- README.md | 4 ++-- RELEASE-NOTES.txt | 9 ++-- pom.xml| 22 +- src/changes/changes.xml| 6 - .../commons/logging/impl/LogFactoryImpl.java | 23 ++- src/site/xdoc/download_logging.xml | 26 +++--- .../org/apache/commons/logging/LoadTestCase.java | 10 - 8 files changed, 59 insertions(+), 54 deletions(-)
(commons-logging) branch master updated: Complex test set up and run is done through the verify goal
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-logging.git
The following commit(s) were added to refs/heads/master by this push:
new a15fe62 Complex test set up and run is done through the verify goal
a15fe62 is described below
commit a15fe624635f7c6328511a9eeede8558d4817997
Author: Gary Gregory
AuthorDate: Sun Mar 17 10:44:29 2024 -0400
Complex test set up and run is done through the verify goal
---
.github/workflows/coverage.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index dadbe7e..00ddd57 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -39,7 +39,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: Build with Maven
- run: mvn --show-version --batch-mode --no-transfer-progress test
jacoco:report
+ run: mvn --show-version --batch-mode --no-transfer-progress verify
jacoco:report
- name: Upload coverage to Codecov
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab #
v3
(commons-logging) branch master updated: Try to get Codecov working.
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-logging.git
The following commit(s) were added to refs/heads/master by this push:
new 59e67f3 Try to get Codecov working.
59e67f3 is described below
commit 59e67f325e348c0335236a6e21b11387e1e1d190
Author: Gary Gregory
AuthorDate: Sun Mar 17 10:38:42 2024 -0400
Try to get Codecov working.
---
.github/workflows/coverage.yml | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 04dfcc5..dadbe7e 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,24 +29,19 @@ jobs:
java: [ 8 ]
steps:
-- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # 4.1.2
+- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
persist-credentials: false
-- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
- with:
-path: ~/.m2/repository
-key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-restore-keys: |
- ${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #
v4.2.1
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
+cache: 'maven'
- name: Build with Maven
run: mvn --show-version --batch-mode --no-transfer-progress test
jacoco:report
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab #
v4.1.0
+ uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab #
v3
with:
files: ./target/site/jacoco/jacoco.xml
(commons-logging) branch master updated: Prepare for a release candidate
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-logging.git
The following commit(s) were added to refs/heads/master by this push:
new 53e06aa Prepare for a release candidate
53e06aa is described below
commit 53e06aae74a701a6ae5545a1d0aa8eab4ef91ad5
Author: Gary Gregory
AuthorDate: Sun Mar 17 10:36:24 2024 -0400
Prepare for a release candidate
---
README.md | 4 ++--
RELEASE-NOTES.txt | 9 +++--
pom.xml| 8
src/site/xdoc/download_logging.xml | 26 +-
4 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index 880e97b..0730ab8 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Apache Commons Logging
[](https://github.com/apache/commons-logging/actions/workflows/maven.yml)
[](https://app.codecov.io/gh/apache/commons-logging)
[](https://maven-badges.herokuapp.com/maven-central/commons-logging/commons-logging/?gav=true)
-[](https://javadoc.io/doc/commons-logging/commons-logging/1.4.0)
+[](https://javadoc.io/doc/commons-logging/commons-logging/1.3.1)
[](https://github.com/apache/commons-logging/actions/workflows/codeql-analysis.yml)
[](https://api.securityscorecards.dev/projects/github.com/apache/commons-logging)
@@ -70,7 +70,7 @@ Alternatively, you can pull it from the central Maven
repositories:
commons-logging
commons-logging
- 1.4.0
+ 1.3.1
```
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d85ad92..4028541 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,8 +1,8 @@
Apache Commons Logging
-Version 1.4.0
+Version 1.3.1
RELEASE NOTES
-The Apache Commons Logging team is pleased to announce the release of Apache
Commons Logging 1.4.0
+The Apache Commons Logging team is pleased to announce the release of Apache
Commons Logging 1.3.1
Apache Commons Logging is a thin adapter allowing configurable bridging to
other,
well-known logging systems.
@@ -22,6 +22,9 @@ Fixed Bugs
* Remove references to very old JDK and Commons Logging versions
#201. Thanks to Elliotte Rusty Harold.
* Update from Logj 1 to the Log4j 2 API compatibility layer
#231. Thanks to Gary Gregory, Piotr P. Karwasz.
+* Allow Servlet 4 in OSGi environment #191. Thanks to V�clav
Haisman.
+* Fix generics warnings #213. Thanks to Elliotte Rusty Harold.
+* LOGGING-189: Fix Import-Package entry for org.slf4j #188. Thanks to V�clav
Haisman, Sebb, Hannes Wellmann, Gary Gregory, Piotr P. Karwasz.
Changes
---
@@ -32,6 +35,7 @@ Changes
* Bump ch.qos.logback:logback-classic from 1.3.11 to 1.3.14
#212. Thanks to Dependabot, Gary Gregory.
* Bump ch.qos.logback:logback-core from 1.3.11 to 1.3.14 #211.
Thanks to Dependabot, Gary Gregory.
* Bump com.h3xstream.findsecbugs:findsecbugs-plugin from 1.12.0
to 1.13.0. Thanks to Dependabot.
+* Bump logkit from 1.0.1 to 2.0 #32. Thanks to Dependabot.
Historical list of changes:
https://commons.apache.org/proper/commons-logging/changes-report.html
@@ -43,6 +47,7 @@ patches, or suggestions for improvement, see the Apache
Commons Logging website:
https://commons.apache.org/proper/commons-logging/
+
-
Apache Commons Logging
diff --git a/pom.xml b/pom.xml
index 8dc344b..1eda2fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ under the License.
commons-logging
commons-logging
Apache Commons Logging
- 1.4.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
Apache Commons Logging is a thin adapter allowing configurable
bridging to other,
well-known logging systems.
https://commons.apache.org/proper/commons-logging/
@@ -651,14 +651,14 @@ under the License.
${commons.logging.javaversion}
logging
org.apache.commons.logging
-1.4.0
-1.4.1
+1.3.1
+1.3.2
1.3.0
true
LOGGING
12310484
-RC1
+RC2
true
3.2.1
diff --git a/src/site/xdoc/download_logging.xml
b/src/site/xdoc/download_logging.xml
index beb10a7..7cebced 100644
---
(commons-configuration) 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration
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 commit 033d50d9ba4f308bbea7786ee33d73df72f53cb0 Merge: 380d52a3 e90cc549 Author: Gary Gregory AuthorDate: Sun Mar 17 10:28:11 2024 -0400 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration pom.xml | 2 +- src/changes/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc src/changes/changes.xml index ae5c6cc7,135ecf08..83aca3f7 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -31,8 -31,9 +31,9 @@@ Bump jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340, #378. Bump log4j.version from 2.23.0 to 2.23.1 #379. + Bump spring.version from 5.3.32 to 5.3.33 #380. - + [StepSecurity] ci: Harden GitHub Actions #307. ConfirgurationPropertySource doesn't supply resolved values #309.
(commons-configuration) 01/02: Describe where Java 8 is required in changes.xml
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 commit 380d52a352a2ba5227d868d67a38d1ec11dfdd2c Author: Gary Gregory AuthorDate: Sun Mar 17 10:28:02 2024 -0400 Describe where Java 8 is required in changes.xml --- src/changes/changes.xml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7645c202..ae5c6cc7 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -23,7 +23,7 @@ Apache Commons Community - + StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). java.lang.module.FindException: Module servlet.api not found. @@ -32,7 +32,7 @@ Bump jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340, #378. Bump log4j.version from 2.23.0 to 2.23.1 #379. - + [StepSecurity] ci: Harden GitHub Actions #307. ConfirgurationPropertySource doesn't supply resolved values #309. @@ -61,7 +61,7 @@ Bump org.apache.commons:commons-text from 1.10.0 to 1.11.0. Bump commons-logging:commons-logging from 1.2 to 1.3.0. - + CombinedConfiguration#getKeys() can throw NoSuchElementException. @@ -151,7 +151,7 @@ + description="Minor release with new features and updated dependencies; requires Java 8 or above."> Make interpolation of collections and arrays in ConfigurationInterpolator consistent with @@ -345,7 +345,7 @@ + description="Minor release with new features and updated dependencies; requires Java 8 or above."> Single argument DataConfiguration APIs always create empty arrays. @@ -406,7 +406,7 @@ + description="Minor release with new features and updated dependencies; requires Java 8 or above."> XMLPropertyListConfiguration cannot set arrays in the correct plist form. @@ -466,7 +466,7 @@ + description="Minor release with new features and updated dependencies; requires Java 8 or above."> Allow user to specify the comments and separator chars. @@ -499,7 +499,7 @@ + description="Minor release with new features and updated dependencies; requires Java 8 or above."> Fixed numerous typos in user guides. @@ -560,7 +560,7 @@ + description="Minor release with new features and updated dependencies; requires Java 7 or above."> Bump Spring from 4.3.14.RELEASE to 4.3.18.RELEASE.
(commons-configuration) branch master updated (e90cc549 -> 033d50d9)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from e90cc549 Typo in changes.xml new 380d52a3 Describe where Java 8 is required in changes.xml new 033d50d9 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/changes/changes.xml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-)
(commons-configuration) branch master updated: Typo in changes.xml
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 e90cc549 Typo in changes.xml e90cc549 is described below commit e90cc549ab87e1752dc0c710561f4d84a87a527e Author: Gary Gregory AuthorDate: Sun Mar 17 10:25:27 2024 -0400 Typo in changes.xml --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3e638c0c..135ecf08 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -31,7 +31,7 @@ Bump jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340, #378. Bump log4j.version from 2.23.0 to 2.23.1 #379. - BBump spring.version from 5.3.32 to 5.3.33 #380. + Bump spring.version from 5.3.32 to 5.3.33 #380.
(commons-configuration) branch master updated: Bump spring.version from 5.3.32 to 5.3.33 #380
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 66a896da Bump spring.version from 5.3.32 to 5.3.33 #380 66a896da is described below commit 66a896dadaf751933f2fb4811793ceefcc25ae2d Author: Gary Gregory AuthorDate: Sun Mar 17 10:25:10 2024 -0400 Bump spring.version from 5.3.32 to 5.3.33 #380 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7645c202..3e638c0c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -31,6 +31,7 @@ Bump jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340, #378. Bump log4j.version from 2.23.0 to 2.23.1 #379. + BBump spring.version from 5.3.32 to 5.3.33 #380.
(commons-configuration) branch dependabot/maven/spring.version-6.1.5 deleted (was 53c3d9e0)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch dependabot/maven/spring.version-6.1.5 in repository https://gitbox.apache.org/repos/asf/commons-configuration.git was 53c3d9e0 Update pom.xml The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(commons-configuration) branch master updated (43f4dab0 -> d28d992b)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 43f4dab0 [CONFIGURATION-841] StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree add d28d992b Bump spring.version from 5.3.32 to 5.3.33 (#380) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(commons-logging) branch master updated: Fix Import-Package entry for org.slf4j #188
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-logging.git The following commit(s) were added to refs/heads/master by this push: new 7b2b00b Fix Import-Package entry for org.slf4j #188 7b2b00b is described below commit 7b2b00b1448ddad8beff867e020d931991f8595a Author: Gary Gregory AuthorDate: Sun Mar 17 10:21:03 2024 -0400 Fix Import-Package entry for org.slf4j #188 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 5f2c6fa..246c115 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,6 +51,7 @@ The type attribute can be add,update,fix,remove. Update from Logj 1 to the Log4j 2 API compatibility layer #231. Allow Servlet 4 in OSGi environment #191. Fix generics warnings #213. + Fix Import-Package entry for org.slf4j #188. Bump org.apache.commons:commons-parent from 65 to 67. Bump log4j2.version from 2.21.1 to 2.23.1 #187, #230.
(commons-logging) branch master updated: [LOGGING-189] Fix Import-Package entry for org.slf4j. (#188)
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-logging.git The following commit(s) were added to refs/heads/master by this push: new 0f61b80 [LOGGING-189] Fix Import-Package entry for org.slf4j. (#188) 0f61b80 is described below commit 0f61b80588b088c37498e4d42a0c271d4dc7b052 Author: Václav Haisman AuthorDate: Sun Mar 17 15:17:39 2024 +0100 [LOGGING-189] Fix Import-Package entry for org.slf4j. (#188) * Fix Import-Package entry for org.slf4j. * Use same number of components in version range for org.slf4j. * Use versionmask macro to derive upper bound for SLF4J. * Update pom.xml Co-authored-by: Piotr P. Karwasz - Co-authored-by: Gary Gregory Co-authored-by: Piotr P. Karwasz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cba3934..8dc344b 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,7 @@ under the License. org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional, - org.slf4j;version="1.7.0, 3.0";resolution:=optional + org.slf4j;version="[1.7, 3)";resolution:=optional 2024-01-01T00:00:00Z
(commons-configuration) branch dependabot/maven/spring.version-6.1.5 updated (5be16dc8 -> 53c3d9e0)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch dependabot/maven/spring.version-6.1.5 in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 5be16dc8 Bump spring.version from 5.3.32 to 6.1.5 add 53c3d9e0 Update pom.xml No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDescription:Drop Apache Commons Logging 1.4.0 RC1 Deployer properties:"userAgent" = "Apache-Maven/3.9.6 (Java 17.0.10; Mac OS X 14.3.1)""userId" = "ggregory""ip" = "98.180.73.170"Details:The orgapachecommons-1703 staging repository has been dropped.Action performed by Gary D. Gregory (ggregory)
svn commit: r67978 - /dev/commons/logging/1.4.0-RC1/
Author: ggregory Date: Sun Mar 17 14:11:58 2024 New Revision: 67978 Log: Delete Apache Commons Logging 1.4.0-RC1 Removed: dev/commons/logging/1.4.0-RC1/
(commons-logging) branch master updated (3b2daae -> 8967fcf)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-logging.git from 3b2daae cure generics warnings (#213) add 8967fcf Fix generics warnings #213 No new revisions were added by this update. Summary of changes: src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+)
(commons-logging) branch master updated: cure generics warnings (#213)
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-logging.git
The following commit(s) were added to refs/heads/master by this push:
new 3b2daae cure generics warnings (#213)
3b2daae is described below
commit 3b2daae4836c8f8bd25b466000cead3fa34404d7
Author: Elliotte Rusty Harold
AuthorDate: Sun Mar 17 10:09:17 2024 -0400
cure generics warnings (#213)
---
.../commons/logging/impl/LogFactoryImpl.java | 23 +++---
.../org/apache/commons/logging/LoadTestCase.java | 10 +-
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 445d072..349b5fc 100644
--- a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -263,12 +263,12 @@ public class LogFactoryImpl extends LogFactory {
* This value is initialized by {@code getLogConstructor()},
* and then returned repeatedly.
*/
-protected Constructor logConstructor;
+protected Constructor logConstructor;
/**
* The signature of the Constructor to be used.
*/
-protected Class[] logConstructorSignature = { String.class };
+protected Class[] logConstructorSignature = { String.class };
/**
* The one-argument {@code setLogFactory} method of the selected
@@ -279,7 +279,7 @@ public class LogFactoryImpl extends LogFactory {
/**
* The signature of the {@code setLogFactory} method to be used.
*/
-protected Class[] logMethodSignature = { LogFactory.class };
+protected Class[] logMethodSignature = { LogFactory.class };
/**
* See getBaseClassLoader and initConfiguration.
@@ -331,9 +331,9 @@ public class LogFactoryImpl extends LogFactory {
final Object[] params = { logCategory };
Log logAdapter = null;
-Constructor constructor = null;
+Constructor constructor = null;
-Class logAdapterClass = null;
+Class logAdapterClass = null;
ClassLoader currentCL = getBaseClassLoader();
for(;;) {
@@ -361,7 +361,7 @@ public class LogFactoryImpl extends LogFactory {
}
}
-Class clazz;
+Class clazz;
try {
clazz = Class.forName(logAdapterClassName, true,
currentCL);
} catch (final ClassNotFoundException
originalClassNotFoundException) {
@@ -872,7 +872,7 @@ public class LogFactoryImpl extends LogFactory {
* @deprecated Never invoked by this class; subclasses should not assume
it will be.
*/
@Deprecated
-protected Constructor getLogConstructor()
+protected Constructor getLogConstructor()
throws LogConfigurationException {
// Return the previously identified Constructor (if any)
@@ -1023,13 +1023,13 @@ public class LogFactoryImpl extends LogFactory {
* @throws LogConfigurationException when the situation
* should not be recovered from.
*/
-private void handleFlawedHierarchy(final ClassLoader badClassLoader, final
Class badClass)
+private void handleFlawedHierarchy(final ClassLoader badClassLoader, final
Class badClass)
throws LogConfigurationException {
boolean implementsLog = false;
final String logInterfaceName = Log.class.getName();
-final Class[] interfaces = badClass.getInterfaces();
-for (final Class element : interfaces) {
+final Class[] interfaces = badClass.getInterfaces();
+for (final Class element : interfaces) {
if (logInterfaceName.equals(element.getName())) {
implementsLog = true;
break;
@@ -1157,7 +1157,8 @@ public class LogFactoryImpl extends LogFactory {
// the context it is intended to manage.
// Note that this prefix should be kept consistent with that
// in LogFactory.
-final Class clazz = this.getClass();
+@SuppressWarnings("unchecked")
+final Class clazz = (Class)
this.getClass();
final ClassLoader classLoader = getClassLoader(clazz);
String classLoaderName;
try {
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java
b/src/test/java/org/apache/commons/logging/LoadTestCase.java
index 17f14fb..0005202 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java
@@ -42,9 +42,9 @@ public class LoadTestCase extends TestCase {
super(parent);
}
-private Class def(final String name) throws ClassNotFoundException {
+private Class def(final String name) throws ClassNotFoundException {
-Class
(commons-logging) branch master updated: Allow Servlet 4 in OSGi environment #191
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-logging.git The following commit(s) were added to refs/heads/master by this push: new 9ee83d3 Allow Servlet 4 in OSGi environment #191 9ee83d3 is described below commit 9ee83d3932eef0be13d54024cece1f33f62bf00d Author: Gary Gregory AuthorDate: Sun Mar 17 10:08:35 2024 -0400 Allow Servlet 4 in OSGi environment #191 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c597f7d..1a54a1d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -49,6 +49,7 @@ The type attribute can be add,update,fix,remove. Remove references to very old JDK and Commons Logging versions #201. Update from Logj 1 to the Log4j 2 API compatibility layer #231. + Allow Servlet 4 in OSGi environment #191. Bump org.apache.commons:commons-parent from 65 to 67. Bump log4j2.version from 2.21.1 to 2.23.1 #187, #230.
(commons-logging) branch dependabot/maven/logback.version-1.5.3 updated (d467709 -> f6129c7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/logback.version-1.5.3 in repository https://gitbox.apache.org/repos/asf/commons-logging.git discard d467709 Bump logback.version from 1.3.12 to 1.5.3 add adc6ef8 Update versions add b0b9b71 Prepare for a release candidate add ad2f53a Bump logkit from 1.0.1 to 2.0 (#32) add 3fcbbb2 Bump logkit from 1.0.1 to 2.0 #32 add 446a642 Allow Servlet 4 in OSGi environment. (#191) add f6129c7 Bump logback.version from 1.3.12 to 1.5.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d467709) \ N -- N -- N refs/heads/dependabot/maven/logback.version-1.5.3 (f6129c7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CONTRIBUTING.md| 5 +- README.md | 7 +- RELEASE-NOTES.txt | 153 + pom.xml| 10 +-- src/changes/changes.xml| 3 +- src/changes/release-notes.vm | 20 +++-- src/conf/MANIFEST.MF | 14 ++-- src/site/xdoc/download_logging.xml | 26 +++ src/site/xdoc/index.xml| 4 + 9 files changed, 153 insertions(+), 89 deletions(-)
(commons-logging) branch master updated (3fcbbb2 -> 446a642)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-logging.git from 3fcbbb2 Bump logkit from 1.0.1 to 2.0 #32 add 446a642 Allow Servlet 4 in OSGi environment. (#191) No new revisions were added by this update. Summary of changes: pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
(commons-logging) branch master updated: Bump logkit from 1.0.1 to 2.0 #32
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-logging.git The following commit(s) were added to refs/heads/master by this push: new 3fcbbb2 Bump logkit from 1.0.1 to 2.0 #32 3fcbbb2 is described below commit 3fcbbb25d32b3d2a27511f661c6fed879e42aa46 Author: Gary Gregory AuthorDate: Sun Mar 17 10:00:18 2024 -0400 Bump logkit from 1.0.1 to 2.0 #32 --- src/changes/changes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index af7d6d4..c597f7d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,7 @@ The type attribute can be add,update,fix,remove. Release Notes - + Add Maven property project.build.outputTimestamp for build reproducibility. @@ -56,6 +56,7 @@ The type attribute can be add,update,fix,remove. Bump ch.qos.logback:logback-classic from 1.3.11 to 1.3.14 #212. Bump ch.qos.logback:logback-core from 1.3.11 to 1.3.14 #211. Bump com.h3xstream.findsecbugs:findsecbugs-plugin from 1.12.0 to 1.13.0. + Bump logkit from 1.0.1 to 2.0 #32.
(commons-logging) branch dependabot/maven/logkit-logkit-2.0 deleted (was 737badc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/logkit-logkit-2.0 in repository https://gitbox.apache.org/repos/asf/commons-logging.git was 737badc Bump logkit from 1.0.1 to 2.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(commons-logging) branch master updated: Bump logkit from 1.0.1 to 2.0 (#32)
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-logging.git The following commit(s) were added to refs/heads/master by this push: new ad2f53a Bump logkit from 1.0.1 to 2.0 (#32) ad2f53a is described below commit ad2f53a83813f941d2f08ccb5cb79b98f9aa32a8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Mar 17 09:59:23 2024 -0400 Bump logkit from 1.0.1 to 2.0 (#32) Bumps logkit from 1.0.1 to 2.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 346bcaa..36fafdb 100644 --- a/pom.xml +++ b/pom.xml @@ -539,7 +539,7 @@ under the License. logkit logkit - 1.0.1 + 2.0 true
(commons-configuration) 06/06: [CONFIGURATION-841] StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree
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
commit 43f4dab021e9acb8db390db2ae80aa0cee4f9ee4
Author: Gary Gregory
AuthorDate: Sun Mar 17 09:23:59 2024 -0400
[CONFIGURATION-841] StackOverflowError calling
ListDelimiterHandler.flatten(Object, int) with a cyclical object tree
---
src/changes/changes.xml| 3 +-
.../convert/ListDelimiterHandler.java | 5 +--
.../TestPropertiesConfiguration.java | 38 ++
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 82dfd261..7645c202 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,7 +26,8 @@
StackOverflowError adding property in
AbstractListDelimiterHandler.flattenIterator().
- Version 2.10.0 fails java.lang.module.FindException:
Module servlet.api not found.
+ java.lang.module.FindException: Module servlet.api not
found.
+ StackOverflowError calling ListDelimiterHandler.flatten(Object, int)
with a cyclical object tree.
Bump
jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340,
#378.
Bump
log4j.version from 2.23.0 to 2.23.1 #379.
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
index 902e9cd3..61b2407b 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
-import java.util.Set;
/**
*
@@ -94,9 +93,7 @@ public interface ListDelimiterHandler {
* @since 2.9.0
*/
default Collection flatten(final Object value, final int limit) {
-final Set dejaVu = Collections.newSetFromMap(new
IdentityHashMap<>());
-dejaVu.add(value);
-return AbstractListDelimiterHandler.flatten(this, value, limit,
dejaVu);
+return AbstractListDelimiterHandler.flatten(this, value, limit,
Collections.newSetFromMap(new IdentityHashMap<>()));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 40462bed..da85e4bb 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -466,6 +466,22 @@ public class TestPropertiesConfiguration {
assertEquals(object, result);
}
+@ParameterizedTest
+@ValueSource(ints = { 0, 2, 4, 8, 16 })
+public void testCompress840ArrayListCycle(final int size) {
+final ArrayList object = new ArrayList<>();
+for (int i = 0; i < size; i++) {
+object.add(i);
+object.add(object);
+object.add(new ArrayList<>(object));
+}
+final Collection result = testCompress840(object);
+assertNotNull(result);
+assertEquals(size, result.size());
+object.add(object);
+testCompress840(object);
+}
+
@Test
public void testCompress840BeanContextServicesSupport() {
testCompress840(new BeanContextServicesSupport());
@@ -492,6 +508,28 @@ public class TestPropertiesConfiguration {
testCompress840(bcs);
}
+@ParameterizedTest
+@ValueSource(ints = { 0, 2, 4, 8, 16 })
+public void testCompress840Exception(final int size) {
+final ArrayList object = new ArrayList<>();
+final Exception bottom = new Exception();
+object.add(bottom);
+Exception top = bottom;
+for (int i = 0; i < size; i++) {
+object.add(i);
+top = new Exception(top);
+object.add(top);
+}
+if (bottom != top) {
+// direct self-causation is not allowed.
+bottom.initCause(top);
+}
+final Collection result = testCompress840(object);
+assertNotNull(result);
+assertEquals(size * 2 + 1, result.size());
+assertEquals(object, result);
+}
+
@ParameterizedTest
@ValueSource(ints = { 0, 2, 4, 8, 16 })
public void testCompress840Path(final int size) {
(commons-configuration) 04/06: Use Apache in the doc
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 commit 06df1136d2d525daf00bc6bd4bd15f5ead217f46 Author: Gary Gregory AuthorDate: Sun Mar 17 08:16:03 2024 -0400 Use Apache in the doc --- src/conf/CommonsConfiguration.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/CommonsConfiguration.xsd b/src/conf/CommonsConfiguration.xsd index 1b881518..2e1cb344 100644 --- a/src/conf/CommonsConfiguration.xsd +++ b/src/conf/CommonsConfiguration.xsd @@ -24,7 +24,7 @@ http://www.w3.org/2001/XMLSchema; elementFormDefault="qualified" attributeFormDefault="unqualified"> - Commons Configuration v0.1 + Apache Commons Configuration
(commons-configuration) 02/06: [CONFIGURATION-840] More tests
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
commit 041094f820d1cfe0a2787c4ba194a3215d927b26
Author: Gary Gregory
AuthorDate: Sat Mar 16 18:29:08 2024 -0400
[CONFIGURATION-840] More tests
---
.../TestPropertiesConfiguration.java | 46 --
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index bfd415b7..40462bed 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -56,11 +56,10 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -88,6 +87,8 @@ import org.apache.commons.lang3.mutable.MutableObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
/**
* Test for loading and saving properties files.
@@ -439,7 +440,7 @@ public class TestPropertiesConfiguration {
assertFalse(conf.containsKey("!comment"));
}
-private void testCompress840(final Iterable object) {
+private Collection testCompress840(final Iterable object) {
final PropertiesConfiguration configuration = new
PropertiesConfiguration();
final ListDelimiterHandler listDelimiterHandler =
configuration.getListDelimiterHandler();
listDelimiterHandler.flatten(object, 0);
@@ -449,6 +450,20 @@ public class TestPropertiesConfiguration {
listDelimiterHandler.parse(object);
configuration.addProperty("foo", object);
configuration.toString();
+return listDelimiterHandler.flatten(object, Integer.MAX_VALUE);
+}
+
+@ParameterizedTest
+@ValueSource(ints = { 0, 2, 4, 8, 16 })
+public void testCompress840ArrayList(final int size) {
+final ArrayList object = new ArrayList<>();
+for (int i = 0; i < size; i++) {
+object.add(i);
+}
+final Collection result = testCompress840(object);
+assertNotNull(result);
+assertEquals(size, result.size());
+assertEquals(object, result);
}
@Test
@@ -477,16 +492,25 @@ public class TestPropertiesConfiguration {
testCompress840(bcs);
}
-@Test
-public void testCompress840Path() {
-testCompress840(FileSystems.getDefault().getPath("foo"));
-testCompress840(FileSystems.getDefault().getPath("foo", "bar"));
+@ParameterizedTest
+@ValueSource(ints = { 0, 2, 4, 8, 16 })
+public void testCompress840Path(final int size) {
+final PriorityQueue object = new PriorityQueue<>();
+for (int i = 0; i < size; i++) {
+object.add(FileSystems.getDefault().getPath("foo"));
+object.add(FileSystems.getDefault().getPath("foo", "bar"));
+}
+testCompress840(object);
}
-@Test
-public void testCompress840PriorityQueue() {
-testCompress840(new PriorityQueue<>());
-testCompress840(new
PriorityQueue<>(Arrays.asList(FileSystems.getDefault().getPath("foo";
+@ParameterizedTest
+@ValueSource(ints = { 0, 2, 4, 8, 16 })
+public void testCompress840PriorityQueue(final int size) {
+final PriorityQueue object = new PriorityQueue<>();
+for (int i = 0; i < size; i++) {
+object.add(FileSystems.getDefault().getPath("foo"));
+}
+testCompress840(object);
}
/**
(commons-configuration) 01/06: [CONFIGURATION-840] More tests
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
commit 7d7d399d0598cb0ca5f81891de34694178156dab
Author: Gary Gregory
AuthorDate: Sat Mar 16 18:16:32 2024 -0400
[CONFIGURATION-840] More tests
---
.../convert/AbstractListDelimiterHandler.java | 40 +--
.../convert/ListDelimiterHandler.java | 31 +++-
.../TestPropertiesConfiguration.java | 58 ++
3 files changed, 92 insertions(+), 37 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
index 5fbcd7f9..e4ab1554 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
@@ -16,9 +16,13 @@
*/
package org.apache.commons.configuration2.convert;
+import java.lang.reflect.Array;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Set;
/**
*
@@ -42,15 +46,45 @@ public abstract class AbstractListDelimiterHandler
implements ListDelimiterHandl
* @param target the target collection
* @param iterator the iterator to process
* @param limit a limit for the number of elements to extract
+ * @param dejaVue Previously visited objects.
*/
-static void flattenIterator(final ListDelimiterHandler handler, final
Collection target, final Iterator iterator, final int limit) {
+static void flattenIterator(final ListDelimiterHandler handler, final
Collection target, final Iterator iterator, final int limit,
+Set dejaVue) {
int size = target.size();
while (size < limit && iterator.hasNext()) {
-target.addAll(handler.flatten(iterator.next(), limit - size));
-size = target.size();
+final Object next = iterator.next();
+if (!dejaVue.contains(next)) {
+target.addAll(flatten(handler, next, limit - size, dejaVue));
+size = target.size();
+}
}
}
+static Collection flatten(final ListDelimiterHandler handler, final
Object value, final int limit, final Set dejaVu) {
+dejaVu.add(value);
+if (value instanceof String) {
+return handler.split((String) value, true);
+}
+final Collection result = new LinkedList<>();
+if (value instanceof Path) {
+// Don't handle as an Iterable.
+result.add(value);
+} else if (value instanceof Iterable) {
+AbstractListDelimiterHandler.flattenIterator(handler, result,
((Iterable) value).iterator(), limit, dejaVu);
+} else if (value instanceof Iterator) {
+AbstractListDelimiterHandler.flattenIterator(handler, result,
(Iterator) value, limit, dejaVu);
+} else if (value != null) {
+if (value.getClass().isArray()) {
+for (int len = Array.getLength(value), idx = 0, size = 0; idx
< len && size < limit; idx++, size = result.size()) {
+result.addAll(handler.flatten(Array.get(value, idx), limit
- size));
+}
+} else {
+result.add(value);
+}
+}
+return result;
+}
+
/**
* {@inheritDoc} This implementation checks whether the object to be
escaped is a string. If yes, it delegates to
* {@link #escapeString(String)}, otherwise no escaping is performed.
Eventually, the passed in transformer is invoked
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
index d0fc1ef0..fb194049 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
@@ -16,12 +16,11 @@
*/
package org.apache.commons.configuration2.convert;
-import java.lang.reflect.Array;
-import java.nio.file.Path;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
import java.util.List;
+import java.util.Set;
/**
*
@@ -118,27 +117,9 @@ public interface ListDelimiterHandler {
* @since 2.9.0
*/
default Collection flatten(final Object value, final int limit) {
-if (value instanceof String) {
-return split((String) value, true);
-}
-final Collection result = new LinkedList<>();
-if (value instanceof Path) {
-// Don't handle as
(commons-configuration) 05/06: Remove unnecessary file
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 commit a17775880e6adca1a4d616519d66a395d7d21c03 Author: Gary Gregory AuthorDate: Sun Mar 17 08:16:52 2024 -0400 Remove unnecessary file --- src/conf/README | 4 1 file changed, 4 deletions(-) diff --git a/src/conf/README b/src/conf/README deleted file mode 100644 index bd219a8a.. --- a/src/conf/README +++ /dev/null @@ -1,4 +0,0 @@ -DO NOT DELETE THESE FILES! - -They're used by the unit tests for testing various Configuration implementations. -
(commons-configuration) 03/06: Sort interface members
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
commit aeba79ef834e98ae09b8723f4960ae590746a931
Author: Gary Gregory
AuthorDate: Sun Mar 17 08:13:16 2024 -0400
Sort interface members
Sort enum members
---
.../commons/configuration2/Configuration.java | 104 +-
.../configuration2/HierarchicalConfiguration.java | 90
.../ImmutableHierarchicalConfiguration.java| 42
.../beanutils/BeanCreationContext.java | 18 ++--
.../configuration2/beanutils/BeanDeclaration.java | 34 +++---
.../builder/BasicBuilderProperties.java| 118 ++---
.../builder/DatabaseBuilderProperties.java | 56 +-
.../builder/PropertiesBuilderProperties.java | 18 ++--
.../builder/XMLBuilderProperties.java | 16 +--
.../combined/CombinedBuilderProperties.java| 76 ++---
.../convert/ListDelimiterHandler.java | 36 +++
.../configuration2/io/FileHandlerListener.java | 20 ++--
.../configuration2/resolver/EntityRegistry.java| 14 +--
.../configuration2/sync/NoOpSynchronizer.java | 4 +-
.../commons/configuration2/sync/Synchronizer.java | 12 +--
.../configuration2/sync/SynchronizerSupport.java | 18 ++--
.../tree/ConfigurationNodeVisitor.java | 20 ++--
.../configuration2/tree/ExpressionEngine.java | 56 +-
.../commons/configuration2/tree/NodeHandler.java | 108 +--
.../configuration2/tree/NodeKeyResolver.java | 50 -
.../commons/configuration2/tree/NodeModel.java | 76 ++---
21 files changed, 493 insertions(+), 493 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/Configuration.java
b/src/main/java/org/apache/commons/configuration2/Configuration.java
index 32f3b1ca..76e4fe11 100644
--- a/src/main/java/org/apache/commons/configuration2/Configuration.java
+++ b/src/main/java/org/apache/commons/configuration2/Configuration.java
@@ -52,38 +52,6 @@ import
org.apache.commons.configuration2.sync.SynchronizerSupport;
*
*/
public interface Configuration extends ImmutableConfiguration,
SynchronizerSupport {
-/**
- * Return a decorator Configuration containing every key from the current
Configuration that starts with the specified
- * prefix. The prefix is removed from the keys in the subset. For example,
if the configuration contains the following
- * properties:
- *
- *
- *prefix.number = 1
- *prefix.string = Apache
- *prefixed.foo = bar
- *prefix = Jakarta
- *
- *
- * the Configuration returned by {@code subset("prefix")} will contain the
properties:
- *
- *
- *number = 1
- *string = Apache
- *= Jakarta
- *
- *
- * (The key for the value "Jakarta" is an empty string)
- *
- * Since the subset is a decorator and not a modified copy of the initial
Configuration, any change made to the subset
- * is available to the Configuration, and reciprocally.
- *
- * @param prefix The prefix used to select the properties.
- * @return a subset configuration
- *
- * @see SubsetConfiguration
- */
-Configuration subset(String prefix);
-
/**
* Add a property to the configuration. If it already exists then the
value stated here will be added to the
* configuration entry. For example, if the property:
@@ -110,13 +78,9 @@ public interface Configuration extends
ImmutableConfiguration, SynchronizerSuppo
void addProperty(String key, Object value);
/**
- * Sets a property, this will replace any previously set values. Set
values is implicitly a call to clearProperty(key),
- * addProperty(key, value).
- *
- * @param key The key of the property to change
- * @param value The new value
+ * Remove all properties from the configuration.
*/
-void setProperty(String key, Object value);
+void clear();
/**
* Remove a property from the configuration.
@@ -125,11 +89,6 @@ public interface Configuration extends
ImmutableConfiguration, SynchronizerSuppo
*/
void clearProperty(String key);
-/**
- * Remove all properties from the configuration.
- */
-void clear();
-
/**
* Gets the {@code ConfigurationInterpolator} object used by this {@code
Configuration}. This object is responsible
* for variable substitution.
@@ -138,15 +97,6 @@ public interface Configuration extends
ImmutableConfiguration, SynchronizerSuppo
*/
ConfigurationInterpolator getInterpolator();
-/**
- * Sets the {@code ConfigurationInterpolator} object to be used by this
{@code Configuration}. This object is invoked
- * for each access of a string property in order to
(commons-configuration) branch master updated (15b07437 -> 43f4dab0)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 15b07437 Better description new 7d7d399d [CONFIGURATION-840] More tests new 041094f8 [CONFIGURATION-840] More tests new aeba79ef Sort interface members new 06df1136 Use Apache in the doc new a1777588 Remove unnecessary file new 43f4dab0 [CONFIGURATION-841] StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/changes/changes.xml| 3 +- src/conf/CommonsConfiguration.xsd | 2 +- src/conf/README| 4 - .../commons/configuration2/Configuration.java | 104 +- .../configuration2/HierarchicalConfiguration.java | 90 .../ImmutableHierarchicalConfiguration.java| 42 .../beanutils/BeanCreationContext.java | 18 ++-- .../configuration2/beanutils/BeanDeclaration.java | 34 +++--- .../builder/BasicBuilderProperties.java| 118 ++-- .../builder/DatabaseBuilderProperties.java | 56 +- .../builder/PropertiesBuilderProperties.java | 18 ++-- .../builder/XMLBuilderProperties.java | 16 +-- .../combined/CombinedBuilderProperties.java| 76 ++--- .../convert/AbstractListDelimiterHandler.java | 40 ++- .../convert/ListDelimiterHandler.java | 58 -- .../configuration2/io/FileHandlerListener.java | 20 ++-- .../configuration2/resolver/EntityRegistry.java| 14 +-- .../configuration2/sync/NoOpSynchronizer.java | 4 +- .../commons/configuration2/sync/Synchronizer.java | 12 +-- .../configuration2/sync/SynchronizerSupport.java | 18 ++-- .../tree/ConfigurationNodeVisitor.java | 20 ++-- .../configuration2/tree/ExpressionEngine.java | 56 +- .../commons/configuration2/tree/NodeHandler.java | 108 +-- .../configuration2/tree/NodeKeyResolver.java | 50 - .../commons/configuration2/tree/NodeModel.java | 76 ++--- .../TestPropertiesConfiguration.java | 120 +++-- 26 files changed, 644 insertions(+), 533 deletions(-) delete mode 100644 src/conf/README
(commons-logging) branch dependabot/maven/logkit-logkit-2.0 updated (bac29ce -> 737badc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/logkit-logkit-2.0 in repository https://gitbox.apache.org/repos/asf/commons-logging.git omit bac29ce Bump logkit from 1.0.1 to 2.0 add c804b66 Add Java 17-EA to the GitHub build. add 5964482 Remove unused import. add 1b97e70 Fix Checkstyle configuration DTD link. add 4d48e43 Bump spotbugs-maven-plugin from 4.1.4 to 4.2.0 (#33) add 2c16ebb Bump spotbugs-maven-plugin from 4.1.4 to 4.2.0 #33. add c9818fa Minor Improvement: (#34) add f4fdecd Minor Improvements #34. add 610117a Normalize to US English spelling. add a3661dd Normalize to US English spelling. add c2afed5 Raise embedded if into parent if. add 7bd8617 Use varargs. add 34ea3d6 Use primitive parsing. add 1642a1b No need to nest in else. add 1ae5c50 license-* files confuse GH license detection add fb50a0a Dummy change to be reverted add 677bc46 Revert change add 242bd72 Replace GitHub build for Java 15 with Java 16 and drop Java 16-ea. add 60343ea Update `actions/setup-java` to v2. add 3410150 Add GitHub code of conduct page that points to the Apache page. add d2a0dc8 Simplify expressions. add 5b281b1 AdoptOpenJDK is moving to the Eclipse Foundation and rebranding as Eclipse Temurin. add f868bd2 Update GitHub build from Java 16 to 17. add 5660a6f Use Javadoc code tags instead of HTML (except when code blocks use tag delimiters). add f4949c5 Bump spotbugs from 4.2.0 to 4.5.2 (#67) add 81f7277 Bump spotbugs-maven-plugin from 4.2.0 to 4.5.0.0 (#65) add 74a577a Bump maven-pmd-plugin from 3.14.0 to 3.15.0 (#68) add 88b6a67 Bump maven-dependency-plugin from 3.1.2 to 3.2.0 (#69) add 54f2273 Bump spotbugs-maven-plugin from 4.5.0.0 to 4.5.2.0 (#70) add ab3cf1f Bump spotbugs-maven-plugin from 4.5.0.0 to 4.5.2.0 #70. add 12d84a7 Drop obsolete .travis.yaml. add 76cc608 Run dependabot once a week. add bfae7e5 Bump actions/cache from 2 to 2.1.5 #50 . add 41c15f1 Bump actions/checkout from 2.3.4 to 2.4.0 #63. add 88eace0 Bump actions/cache from 2 to 2.1.5 (#50) add 040946b Bump actions/checkout from 2.3.4 to 2.4.0 (#63) add c2bf8a2 Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 (#35) add 25781da Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-logging add 828a850 Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 #35. add b25bf49 Bump junit from 4.13.1 to 4.13.2 (#38) add c0ad013 Bump junit from 4.13.1 to 4.13.2 #38. add ddda30a LOGGING-177 - Remove redundant initializer (#46) add 9466284 LOGGING-177 - Remove redundant initializer #46 add e7b328d Use a weak reference for the cached class loader (#71) add 66148e2 Use a weak reference for the cached class loader #71. add 1e55e8f Bump spotbugs-surefire-plugin from 2.22.2 to 3.0.0-M5. add 391df55 Add CodeQL GitHub workflow. add 8dd4849 Bump actions/cache from 2.1.5 to 2.1.7 (#72) add a601212 Bump spotbugs-maven-plugin from 4.5.2.0 to 4.5.3.0 (#73) add dc447c6 Bump spotbugs from 4.5.2 to 4.5.3 (#74) add c578482 Bump actions/checkout from 2 to 3 (#75) add d9c4306 Bump actions/checkout from 2 to 3 #75 add bc4af18 Delete "@version $Id$" from Subversion days. add ab9acce Bump maven-pmd-plugin from 3.15.0 to 3.16.0 (#76) add d1509eb Bump maven-pmd-plugin from 3.15.0 to 3.16.0 #76 add 013669a Bump actions/cache from 2.1.7 to 3 (#77) add 66abc6f Bump actions/cache from 2.1.7 to 3 #77 add ad9d634 Bump spotbugs-maven-plugin from 4.5.3.0 to 4.6.0.0 (#78) add dbc91cc Bump spotbugs-maven-plugin from 4.5.3.0 to 4.6.0.0 #78 add 96ac117 Bump maven-dependency-plugin from 3.2.0 to 3.3.0 (#79) add ac9569c Bump maven-dependency-plugin from 3.2.0 to 3.3.0 #79 add 440969e Bump spotbugs from 4.5.3 to 4.6.0 (#81) add 3e39f08 Bump spotbugs from 4.5.3 to 4.6.0 #81 add b1471be Bump commons-parent from 52 to 53 add c7e8090 Merge pull request #82 from apache/dependabot/maven/org.apache.commons-commons-parent-53 add d95f978 Group some updates. add 8b06bb0 Bump actions/cache from 3 to 3.0.2 add e511c56 Bump actions/setup-java from 2 to 3 add 073350e Simplify assert with simpler and equivalent calls. add b04cdc7 Merge pull request #84 from arturobernalg/feature/simplify_assert add 475b832 Replace comparisons String.indexOf() with String.contains() method. (#85) add f85b9c6 Bump github/codeql-action from 1 to 2 add 0d4f260 Merge pull request #86 from apache/dependabot/github_actions/github/codeql-action-2 add 574c819 Bump spotbugs from 4.6.0 to 4.7.0 (#87) add 9d4b75c Bump spotbugs from 4.6.0 to 4.7.0 #87 add 6b34f4e Reorg add 0b27941 Bump Java
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons Logging 1.4.0 RC1 Deployer properties:"userAgent" = "Apache-Maven/3.9.6 (Java 17.0.10; Mac OS X 14.3.1)""userId" = "ggregory""ip" = "98.180.73.170"Details:The following artifacts have been staged/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-test-sources.jar(SHA1: ea3037162d550ee35a6e9965593627d430add2a8)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-cyclonedx.xml(SHA1: d11016b58e45bf8db81ea765c0cc40a64f169671)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-api.jar.asc(SHA1: 249e81996317ab712ff883d69a2bd8e216fe0c18)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.spdx.json.asc(SHA1: b93bf469d72a109df0b04642afdd20ed4e624053)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-cyclonedx.xml.asc(SHA1: 50d560a296c425bea145e85bf4dba322cfbb6c07)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-tests.jar.asc(SHA1: 6ab93b8caa48a0e864eca80a856377d918a89c0d)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.jar.asc(SHA1: f0c2543efc1d686f2388db9d2d1fe51b8d1662d2)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-adapters.jar.asc(SHA1: 4f0a1e5fa5ffe16cc1804326485fe0376c63e254)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.spdx.json(SHA1: c7055043150f712cf1eb2694df6e3f101995d086)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-sources.jar(SHA1: ced9d8ad61bce5baf4b52fdba9f11417d2045d7a)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-javadoc.jar.asc(SHA1: 45123286cfdccd3742a2e00b9dc1cce278d6b7c2)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-tests.jar(SHA1: fff78db96924822a1a6034277c306705a6f1006a)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-cyclonedx.json.asc(SHA1: 16712ce3a8bb70d6e0a9d8e08bdc8daa5f99318d)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-sources.jar.asc(SHA1: 56ada7ce314e91be0352e0bcb796be80180aebd2)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-cyclonedx.json(SHA1: 157796ef700dd7350c84fa6bfd81476a4ea2aaf4)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.pom(SHA1: 8331a6e9e7ae1e9ac29d35f65396225e93f47397)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-test-sources.jar.asc(SHA1: 83639288383d229dd95a0ad5058d69e4a406119d)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-api.jar(SHA1: 9549869ec232d7cf0a3a9b02270f3c313bfbbc7a)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.pom.asc(SHA1: b51332623249bc04ab1f9f7521d028b96a39a821)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0.jar(SHA1: faa6e34d345afcf9c27589fbb4ba53c50c7e7f30)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-javadoc.jar(SHA1: 4eddba65f1180f45b812a771141cec5263abf38a)/commons-logging/commons-logging/1.4.0/commons-logging-1.4.0-adapters.jar(SHA1: 31b2f65de7ccf92b4bb52a19c9b78bf74cbd1330)Action performed by Gary D. Gregory (ggregory)
svn commit: r67977 - in /dev/commons/logging/1.4.0-RC1: ./ binaries/ site/ site/apidocs/ site/apidocs/legal/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/apidocs/or
Author: ggregory Date: Sun Mar 17 11:42:28 2024 New Revision: 67977 Log: Staging release: commons-logging, version: 1.4.0 [This commit notification would consist of 68 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
(commons-logging) annotated tag commons-logging-1.4.0-RC1 created (now 4bbc6f1)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag commons-logging-1.4.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-logging.git at 4bbc6f1 (tag) tagging ac55303ba66dc0046f6118f74eecd46c74eeeb4a (commit) replaces rel/commons-logging-1.3.0 by Gary Gregory on Sun Mar 17 11:38:45 2024 + - Log - Tag Apache Commons Logging release 1.4.0 RC1 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmX21kUACgkQhv3H4qES YssUugf/e8/S0TXh/01ypfQhVMiL6EPCDY+/znEFGNWEKidWxLxL5guvOv2OEwzN gy42Kk62qbZTp+9N4GFaeTEzov+E+lPuFgNNpgFDmFvtJvd7QomepwrjgIEj8qAl kFvt0Ib9hyPqFoW7whNv1ArRuYsG4TR+YBWB3quM7SRocGNTG3PbFI44axwGPMud ALVnP5ulXYsW4CnuUYWdZrv3d2QrujuBTmGSZ+J6NpH9AP3RvMXTqhVFZBpjkd5z Srv3K7AMZB6dcKYI3ZZjpe3sSymA1/eNW8OSiWIK8xbwSoog+TMknvL9h/ejkzET 57SHnmmZnseWJD/lQq06dUpunNG1zQ== =PS6v -END PGP SIGNATURE- --- No new revisions were added by this update.
(commons-logging) branch release updated: Prepare for the next release candidate
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/commons-logging.git The following commit(s) were added to refs/heads/release by this push: new ac55303 Prepare for the next release candidate ac55303 is described below commit ac55303ba66dc0046f6118f74eecd46c74eeeb4a Author: Gary Gregory AuthorDate: Sun Mar 17 11:38:24 2024 + Prepare for the next release candidate --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 346bcaa..e97a080 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ under the License. commons-logging commons-logging Apache Commons Logging - 1.4.0-SNAPSHOT + 1.4.0 Apache Commons Logging is a thin adapter allowing configurable bridging to other, well-known logging systems. https://commons.apache.org/proper/commons-logging/ @@ -676,7 +676,7 @@ under the License. org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional, org.slf4j;version="1.7.0, 3.0";resolution:=optional - 2024-01-01T00:00:00Z + 2024-03-16T23:10:36Z
