(commons-validator) branch master updated: [VALIDATOR-492] ValidatorUtils.copyFastHashMap is broken
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-validator.git
The following commit(s) were added to refs/heads/master by this push:
new 4015f7e0 [VALIDATOR-492] ValidatorUtils.copyFastHashMap is broken
4015f7e0 is described below
commit 4015f7e05f3e08103000b8e2c50bf3f31d76e592
Author: Gary Gregory
AuthorDate: Wed Mar 20 22:40:02 2024 -0400
[VALIDATOR-492] ValidatorUtils.copyFastHashMap is broken
---
src/changes/changes.xml| 2 ++
.../commons/validator/util/ValidatorUtils.java | 15 +---
.../commons/validator/util/ValidatorUtilsTest.java | 41 ++
3 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f935f0a..1a6409a8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -65,6 +65,8 @@ The type attribute can be add,update,fix,remove.
+
+ValidatorUtils.copyFastHashMap is broken.
Bump
org.apache.commons:commons-parent from 65 to 67.
diff --git
a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
index cc8a2b99..552b3da6 100644
--- a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
+++ b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
@@ -18,7 +18,9 @@ package org.apache.commons.validator.util;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.collections.FastHashMap; // DEPRECATED
@@ -53,10 +55,13 @@ public class ValidatorUtils {
*/
@Deprecated
public static FastHashMap copyFastHashMap(final FastHashMap fastHashMap) {
-final FastHashMap results = new FastHashMap();
+FastHashMap results = new FastHashMap();
@SuppressWarnings("unchecked") // FastHashMap is not generic
-final HashMap map = fastHashMap;
-map.forEach((key, value) -> {
+Iterator> iterator =
fastHashMap.entrySet().iterator();
+while (iterator.hasNext()) {
+Entry entry = iterator.next();
+String key = entry.getKey();
+Object value = entry.getValue();
if (value instanceof Msg) {
results.put(key, ((Msg) value).clone());
} else if (value instanceof Arg) {
@@ -66,7 +71,7 @@ public class ValidatorUtils {
} else {
results.put(key, value);
}
-});
+}
results.setFast(true);
return results;
}
@@ -81,7 +86,7 @@ public class ValidatorUtils {
* @return A copy of the Map that was passed in.
*/
public static Map copyMap(final Map map) {
-final Map results = new HashMap<>();
+final Map results = new HashMap<>(map.size());
map.forEach((key, value) -> {
if (value instanceof Msg) {
results.put(key, ((Msg) value).clone());
diff --git
a/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
b/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
new file mode 100644
index ..d64414f5
--- /dev/null
+++ b/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.validator.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.commons.collections.FastHashMap;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link ValidatorUtilsTest}.
+ */
+public class ValidatorUtilsTest {
+
+@Test
+public void testCopyFastHashMap() {
+final FastHashMap original = new FastHashMap();
+original.put("key1", "value1");
+original.put("key2", "value2");
+original.put("key3", "value3");
+original.setFast(true);
+final FastHashMap copy = ValidatorUtils.copyFastHashMap(original);
+
(commons-compress) branch master updated: [COMPRESS-674] Validate TarArchiveEntry checksums #500
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-compress.git The following commit(s) were added to refs/heads/master by this push: new 2349568ef [COMPRESS-674] Validate TarArchiveEntry checksums #500 2349568ef is described below commit 2349568efe912e42dca366e803b8cb3b90d64558 Author: Gary Gregory AuthorDate: Wed Mar 20 21:02:00 2024 -0400 [COMPRESS-674] Validate TarArchiveEntry checksums #500 --- 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 d3a392e38..14f7c79d4 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,7 +46,8 @@ The type attribute can be add,update,fix,remove. - Deprecate org.apache.commons.compress.utils.CharsetNames in favor or java.nio.charset.StandardCharsets. + Deprecate org.apache.commons.compress.utils.CharsetNames in favor or java.nio.charset.StandardCharsets. + Validate TarArchiveEntry checksums #500. Bump org.apache.commons:commons-parent from 66 to 67 #495.
(commons-compress) branch master updated: [COMPRESS-674] Validate TarArchiveEntry checksums (#500)
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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new a51d4f47c [COMPRESS-674] Validate TarArchiveEntry checksums (#500)
a51d4f47c is described below
commit a51d4f47c862d89a6d30fe03988af4b28a27a657
Author: Gren Elliot
AuthorDate: Thu Mar 21 00:59:30 2024 +
[COMPRESS-674] Validate TarArchiveEntry checksums (#500)
* [COMPRESS-674] validate TarArchiveEntry checksums
For test file, thought it had 1 (corrupt) directory entry only
but still thought it was a tar file
* [COMPRESS-674] couple more tar tests
Make sure identifies a couple of real tar files as such
-
Co-authored-by: Gren Elliot
---
.../compress/archivers/ArchiveStreamFactory.java| 2 +-
.../archivers/ArchiveStreamFactoryTest.java | 20
src/test/resources/dirWith1TxtFile.tar | Bin 0 -> 4608 bytes
src/test/resources/emptyDir.tar | Bin 0 -> 2560 bytes
src/test/resources/utf16-text.txt | Bin 0 -> 512 bytes
5 files changed, 21 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index 9c13316aa..99ea2acf0 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -282,7 +282,7 @@ public class ArchiveStreamFactory implements
ArchiveStreamProvider {
TarArchiveEntry entry = inputStream.getNextEntry();
// try to find the first non-directory entry within the first
10 entries.
int count = 0;
-while (entry != null && entry.isDirectory() && count++ <
TAR_TEST_ENTRY_COUNT) {
+while (entry != null && entry.isDirectory() &&
entry.isCheckSumOK() && count++ < TAR_TEST_ENTRY_COUNT) {
entry = inputStream.getNextEntry();
}
if (entry != null && entry.isCheckSumOK() &&
!entry.isDirectory() && entry.getSize() > 0 || count > 0) {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
index f2a172273..65f879364 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
@@ -282,6 +282,26 @@ public class ArchiveStreamFactoryTest extends AbstractTest
{
assertEquals("IOException while reading signature.", e3.getMessage());
}
+/**
+ * Test case for https://issues.apache.org/jira/browse/COMPRESS-674; >COMPRESS-674.
+ */
+@Test
+void testUtf16TextIsNotTAR() {
+final ArchiveException archiveException =
assertThrows(ArchiveException.class,
+() -> detect("utf16-text.txt"));
+assertEquals("No Archiver found for the stream signature",
archiveException.getMessage());
+}
+
+@Test
+void testTarContainingEmptyDirIsTAR() throws IOException, ArchiveException
{
+assertEquals(ArchiveStreamFactory.TAR, detect("emptyDir.tar"));
+}
+
+@Test
+void testTarContainingDirWith1TxtFileIsTAR() throws IOException,
ArchiveException {
+assertEquals(ArchiveStreamFactory.TAR, detect("dirWith1TxtFile.tar"));
+}
+
/**
* Test case for https://issues.apache.org/jira/browse/COMPRESS-267; >COMPRESS-267.
*/
diff --git a/src/test/resources/dirWith1TxtFile.tar
b/src/test/resources/dirWith1TxtFile.tar
new file mode 100644
index 0..e38d8e595
Binary files /dev/null and b/src/test/resources/dirWith1TxtFile.tar differ
diff --git a/src/test/resources/emptyDir.tar b/src/test/resources/emptyDir.tar
new file mode 100644
index 0..86c0bc961
Binary files /dev/null and b/src/test/resources/emptyDir.tar differ
diff --git a/src/test/resources/utf16-text.txt
b/src/test/resources/utf16-text.txt
new file mode 100644
index 0..c45e48e74
Binary files /dev/null and b/src/test/resources/utf16-text.txt differ
(commons-configuration) branch release updated (dde0d071 -> ee8410a4)
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 dde0d071 Fix changes.xml decription add 945efe95 this in ctors add a536e716 Update SNAPSHOT label add ccd7c07a Fail fast with a NullPointerException if DataConfiguration.DataConfiguration(Configuration) is called with null add 9f934634 Format tweak add 2cb2d627 Fail-fast with a NullPointerException if XMLPropertiesConfiguration.XMLPropertiesConfiguration(Element) is called with null add 2b5ae77e Format tweak add 45294cb1 Fail-fast with a NullPointerException if a SubsetConfiguration constructor is called with a null Configuration add 1e284ae8 Better internal name add 9c21b67a Refactor x6 code pattern add 0572d2c1 Merge branch 'release' add a005929e Merge branch 'release' add ee8410a4 Document the two CVEs fixed in 2.10.1 on the Security page No new revisions were added by this update. Summary of changes: src/changes/changes.xml| 6 + .../configuration2/CompositeConfiguration.java | 5 +- .../commons/configuration2/DataConfiguration.java | 57 +++-- .../commons/configuration2/MapConfiguration.java | 4 +- .../configuration2/SubsetConfiguration.java| 9 +- .../configuration2/XMLPropertiesConfiguration.java | 9 +- src/site/xdoc/security.xml | 22 .../configuration2/NonCloneableConfiguration.java | 3 + .../configuration2/TestDataConfiguration.java | 7 +- .../configuration2/TestSubsetConfiguration.java| 130 ++--- .../TestXMLPropertiesConfiguration.java| 4 + 11 files changed, 137 insertions(+), 119 deletions(-)
(commons-configuration) branch master updated: Document the two CVEs fixed in 2.10.1 on the Security page
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 ee8410a4 Document the two CVEs fixed in 2.10.1 on the Security page ee8410a4 is described below commit ee8410a4cc7d1326391b575504fd5bc4a8f0a6bf Author: Gary Gregory AuthorDate: Wed Mar 20 18:15:30 2024 -0400 Document the two CVEs fixed in 2.10.1 on the Security page - CVE-2024-29131 prior to 2.10.1, Out-of-bounds Write vulnerability - CVE-2024-29133 prior to 2.10.1, Out-of-bounds Write vulnerability --- src/site/xdoc/security.xml | 22 ++ 1 file changed, 22 insertions(+) diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml index 366a7dc5..fa242b8b 100644 --- a/src/site/xdoc/security.xml +++ b/src/site/xdoc/security.xml @@ -110,6 +110,28 @@ + + + On 2024-03-20, the Apache Commons Configuration team disclosed https://www.cve.org/CVERecord?id=CVE-2024-29131;>CVE-2024-29131. + + + This Out-of-bounds Write vulnerability in Apache Commons Configuration affects Apache Commons Configuration: from 2.0 before 2.10.1. + USer can see this as a StackOverflowError when adding a property in AbstractListDelimiterHandler.flattenIterator(). + Users are recommended to upgrade to version 2.10.1, which fixes the issue. + The details are in https://issues.apache.org/jira/browse/CONFIGURATION-840;>CONFIGURATION-840. + + + + + On 2024-03-20, the Apache Commons Configuration team disclosed https://www.cve.org/CVERecord?id=CVE-2024-29133;>CVE-2024-29133. + + + This Out-of-bounds Write vulnerability in Apache Commons Configuration affects Apache Commons Configuration: from 2.0 before 2.10.1. + USer can see this as a StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree. + Users are recommended to upgrade to version 2.10.1, which fixes the issue. + The details are in https://issues.apache.org/jira/browse/CONFIGURATION-840;>CONFIGURATION-841. + +
(commons-configuration) branch master updated (0572d2c1 -> a005929e)
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 0572d2c1 Merge branch 'release' add 5eca1fbc [CONFIGURATION-840] Update due-to for Bob Marinier add 2db2b889 Update changes.xml for 2.10.1 add 15d1ed22 Fix changes.xml decription add dde0d071 Fix changes.xml decription new a005929e Merge branch 'release' The 1 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: RELEASE-NOTES.txt | 6 +++--- src/changes/changes.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
(commons-configuration) 01/01: Merge branch 'release'
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 a005929e73119f2d035a3521a7b052c14003660e Merge: 0572d2c1 dde0d071 Author: Gary Gregory AuthorDate: Wed Mar 20 21:48:46 2024 + Merge branch 'release' RELEASE-NOTES.txt | 6 +++--- src/changes/changes.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --cc src/changes/changes.xml index 83c218d6,1fae428d..ed98e606 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -23,19 -23,13 +23,19 @@@ Apache Commons Community + + + Fail-fast with a NullPointerException if DataConfiguration.DataConfiguration(Configuration) is called with null. + Fail-fast with a NullPointerException if XMLPropertiesConfiguration.XMLPropertiesConfiguration(Element) is called with null. + Fail-fast with a NullPointerException if a SubsetConfiguration constructor is called with a null Configuration. + - StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). - java.lang.module.FindException: Module servlet.api not found. + java.lang.module.FindException: Module servlet.api not found. + StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). 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 jackson-databind from 2.16.1 to 2.17.0 #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.
(commons-configuration) branch release updated: Fix changes.xml decription
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 dde0d071 Fix changes.xml decription dde0d071 is described below commit dde0d07143ccc6a512027ef9a37a26b925315313 Author: Gary Gregory AuthorDate: Wed Mar 20 17:42:36 2024 -0400 Fix changes.xml decription --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index f5083c1b..32865a2e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -28,7 +28,7 @@ Fixed Bugs Changes --- -* Bump jackson-databind from 2.16.1 to 2.17.0 #297, #303, #326, #331, #340, #378. Thanks to Dependabot. +* Bump jackson-databind from 2.16.1 to 2.17.0 #378. Thanks to Dependabot. * Bump log4j.version from 2.23.0 to 2.23.1 #379. Thanks to Dependabot. * Bump spring.version from 5.3.32 to 5.3.33 #380. Thanks to Dependabot, Gary Gregory.
(commons-configuration) branch release updated: Fix changes.xml decription
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 15d1ed22 Fix changes.xml decription 15d1ed22 is described below commit 15d1ed22d8f48ddf2ac7a910af7ad06b6bb39f1e Author: Gary Gregory AuthorDate: Wed Mar 20 17:42:12 2024 -0400 Fix changes.xml decription --- 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 548015d0..1fae428d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -29,7 +29,7 @@ StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). 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 jackson-databind from 2.16.1 to 2.17.0 #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.
(commons-configuration) 01/02: [CONFIGURATION-840] Update due-to for Bob Marinier
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 commit 5eca1fbcac42dd05ea114e36e96963acb88f9a89 Author: Gary Gregory AuthorDate: Wed Mar 20 17:36:41 2024 -0400 [CONFIGURATION-840] Update due-to for Bob Marinier --- RELEASE-NOTES.txt | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d3449696..a91226d1 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -21,7 +21,7 @@ Changes in this version include: Fixed Bugs -- -* CONFIGURATION-840: StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). Thanks to Gary Gregory. +* CONFIGURATION-840: StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). Thanks to Bob Marinier, Gary Gregory. * CONFIGURATION-840: java.lang.module.FindException: Module servlet.api not found. Thanks to Bob Marinier, Gary Gregory. * CONFIGURATION-841: StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree. Thanks to Gary Gregory. diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 349cd193..162e8f9f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -25,7 +25,7 @@ - StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). + StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). java.lang.module.FindException: Module servlet.api not found. StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree.
(commons-configuration) branch release updated (ea1b3dc3 -> 2db2b889)
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 ea1b3dc3 Bump to next development version new 5eca1fbc [CONFIGURATION-840] Update due-to for Bob Marinier new 2db2b889 Update changes.xml for 2.10.1 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: RELEASE-NOTES.txt | 4 ++-- src/changes/changes.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
(commons-configuration) 02/02: Update changes.xml for 2.10.1
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 commit 2db2b8894c2ba8fa9fe24ca413dbb034608cf5a8 Author: Gary Gregory AuthorDate: Wed Mar 20 17:40:23 2024 -0400 Update changes.xml for 2.10.1 --- RELEASE-NOTES.txt | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index a91226d1..f5083c1b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -21,8 +21,8 @@ Changes in this version include: Fixed Bugs -- +* CONFIGURATION-839: java.lang.module.FindException: Module servlet.api not found. Thanks to Bob Marinier, Gary Gregory. * CONFIGURATION-840: StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). Thanks to Bob Marinier, Gary Gregory. -* CONFIGURATION-840: java.lang.module.FindException: Module servlet.api not found. Thanks to Bob Marinier, Gary Gregory. * CONFIGURATION-841: StackOverflowError calling ListDelimiterHandler.flatten(Object, int) with a cyclical object tree. Thanks to Gary Gregory. Changes diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 162e8f9f..548015d0 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -25,8 +25,8 @@ + java.lang.module.FindException: Module servlet.api not found. StackOverflowError adding property in AbstractListDelimiterHandler.flattenIterator(). - 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.
svn commit: r68031 - /dev/commons/configuration/2.10.1-RC1/
Author: ggregory Date: Wed Mar 20 20:54:37 2024 New Revision: 68031 Log: Apache Commons Configuration 2.10.1-RC1 Removed: dev/commons/configuration/2.10.1-RC1/
(commons-configuration) branch release updated (81573fa3 -> ea1b3dc3)
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 81573fa3 Prepare for the next release candidate add ea1b3dc3 Bump to next development version No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(commons-configuration) branch master updated: Bump to next development version
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 ea1b3dc3 Bump to next development version
new 0572d2c1 Merge branch 'release'
ea1b3dc3 is described below
commit ea1b3dc3d4949c7c1861118b7c20fba71db6fa02
Author: Gary Gregory
AuthorDate: Wed Mar 20 20:54:13 2024 +
Bump to next development version
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 428eb245..7b003ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
4.0.0
commons-configuration2
- 2.10.1
+ 2.10.2-SNAPSHOT
Apache Commons Configuration
2001
@@ -70,7 +70,7 @@
RC1
true
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
-
2024-03-17T20:14:52Z
+
2024-03-20T20:54:04Z
https://commons.apache.org/proper/commons-configuration/
svn commit: r1916447 - /commons/cms-site/trunk/conf/component_releases.properties
Author: ggregory Date: Wed Mar 20 20:53:52 2024 New Revision: 1916447 URL: http://svn.apache.org/viewvc?rev=1916447=rev Log: Document releasing Apache Commons Configuration 2.10.1. Modified: commons/cms-site/trunk/conf/component_releases.properties Modified: commons/cms-site/trunk/conf/component_releases.properties URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/conf/component_releases.properties?rev=1916447=1916446=1916447=diff == --- commons/cms-site/trunk/conf/component_releases.properties (original) +++ commons/cms-site/trunk/conf/component_releases.properties Wed Mar 20 20:53:52 2024 @@ -15,8 +15,8 @@ collectionsVersion=4.4 collectionsReleased=2019-07-05 compressVersion=1.26.1 compressReleased=2024-03-08 -configurationVersion=2.10.0 -configurationReleased=2024-03-12 +configurationVersion=2.10.1 +configurationReleased=2024-03-20 cryptoVersion=1.2.0 cryptoReleased=2023-01-23 csvVersion=1.10.0
(commons-configuration) annotated tag rel/commons-configuration-2.10.1 created (now dde73494)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag rel/commons-configuration-2.10.1 in repository https://gitbox.apache.org/repos/asf/commons-configuration.git at dde73494 (tag) tagging 81573fa387435e985cc05356c33c49273fc4a018 (commit) replaces rel/commons-configuration-2.10.0 by Gary Gregory on Wed Mar 20 20:52:43 2024 + - Log - Create release tag for Apache Commons Configuration release 2.10.1. -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmX7TJsACgkQhv3H4qES YsuPXwf/eWn2iw8RV1o6maG9rym9D6xss3/N4sHMl6ozCcBq43YOKrnay5kjEzEr tMNF+hFA7RgfI0hUCSg/xX8f5RsQKN0WGT9BTvTB6n2m754CbkTZFuba3b1dPX6p eARrzIZM6i/L9Das3bcUDLXKTFnf6k3svnfkOGgg+IEh3kwZgNsrzw4P0JYjAzk6 T2HAAzcXh7JHI8CmctAbDEEX1Q8S4iuS47We/OFLAgDh7H1/Nrbj2omxjba2xAA6 5ubspw4zQ6Eoai+e7mfYzALHFXLOi5g+0Y5hHkvgsQQc7k3YCNFzeyouMOjiqLit QG9iMXU6+vpOujK74VWvdioX5Eoy+w== =j+g2 -END PGP SIGNATURE- --- No new revisions were added by this update.
Nexus: Promotion Completed
Message from: https://repository.apache.orgDescription:Release Apache Commons Configuration 2.10.1 from 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 promoted to the "Releases" [id=releases] repository/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: r68030 - in /release/commons/configuration: binaries/ source/
Author: ggregory Date: Wed Mar 20 20:51:22 2024 New Revision: 68030 Log: Drop previous release 2.10.0 Removed: release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz.asc release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.tar.gz.sha512 release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip.asc release/commons/configuration/binaries/commons-configuration2-2.10.0-bin.zip.sha512 release/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz release/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz.asc release/commons/configuration/source/commons-configuration2-2.10.0-src.tar.gz.sha512 release/commons/configuration/source/commons-configuration2-2.10.0-src.zip release/commons/configuration/source/commons-configuration2-2.10.0-src.zip.asc release/commons/configuration/source/commons-configuration2-2.10.0-src.zip.sha512
svn commit: r68029 - /release/commons/configuration/README.html
Author: ggregory Date: Wed Mar 20 20:50:59 2024 New Revision: 68029 Log: Bump version from 2.10.0 to 2.10.1 Modified: release/commons/configuration/README.html Modified: release/commons/configuration/README.html == --- release/commons/configuration/README.html (original) +++ release/commons/configuration/README.html Wed Mar 20 20:50:59 2024 @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -Commons-CONFIGURATION v2.10.0. +Commons-CONFIGURATION v2.10.1. -This is the 2.10.0 version of commons-configuration2. It is available in both binary and source distributions. +This is the 2.10.1 version of commons-configuration2. It is available in both binary and source distributions. Note: @@ -55,12 +55,12 @@ Always test available signatures, e.g., $ pgpk -a KEYS -$ pgpv commons-configuration2-2.10.0-bin.tar.gz.asc +$ pgpv commons-configuration2-2.10.1-bin.tar.gz.asc or, $ pgp -ka KEYS -$ pgp commons-configuration2-2.10.0-bin.tar.gz.asc +$ pgp commons-configuration2-2.10.1-bin.tar.gz.asc or, $ gpg --import KEYS -$ gpg --verify commons-configuration2-2.10.0-bin.tar.gz.asc +$ gpg --verify commons-configuration2-2.10.1-bin.tar.gz.asc \ No newline at end of file
svn commit: r68028 - /dev/commons/configuration/2.10.1-RC1/ /dev/commons/configuration/2.10.1-RC1/binaries/ /dev/commons/configuration/2.10.1-RC1/source/ /release/commons/configuration/ /release/commo
Author: ggregory Date: Wed Mar 20 20:50:15 2024 New Revision: 68028 Log: Publish commons-configuration2 2.10.1 Release Added: release/commons/configuration/RELEASE-NOTES.txt - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/RELEASE-NOTES.txt release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz.asc - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz.asc release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.tar.gz.sha512 - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz.sha512 release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip.asc - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip.asc release/commons/configuration/binaries/commons-configuration2-2.10.1-bin.zip.sha512 - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip.sha512 release/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz release/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz.asc - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz.asc release/commons/configuration/source/commons-configuration2-2.10.1-src.tar.gz.sha512 - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz.sha512 release/commons/configuration/source/commons-configuration2-2.10.1-src.zip - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip release/commons/configuration/source/commons-configuration2-2.10.1-src.zip.asc - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip.asc release/commons/configuration/source/commons-configuration2-2.10.1-src.zip.sha512 - copied unchanged from r68027, dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip.sha512 Removed: dev/commons/configuration/2.10.1-RC1/RELEASE-NOTES.txt dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz.asc dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.tar.gz.sha512 dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip.asc dev/commons/configuration/2.10.1-RC1/binaries/commons-configuration2-2.10.1-bin.zip.sha512 dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz.asc dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.tar.gz.sha512 dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip.asc dev/commons/configuration/2.10.1-RC1/source/commons-configuration2-2.10.1-src.zip.sha512
(commons-text) branch master updated: 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-text.git
The following commit(s) were added to refs/heads/master by this push:
new ddea4e0b Javadoc
ddea4e0b is described below
commit ddea4e0bfcf2eccf78b2e6bf8192d31138f065d7
Author: Gary Gregory
AuthorDate: Wed Mar 20 09:31:38 2024 -0400
Javadoc
---
.../java/org/apache/commons/text/lookup/FileStringLookup.java| 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/lookup/FileStringLookup.java
b/src/main/java/org/apache/commons/text/lookup/FileStringLookup.java
index e430ea20..51297faa 100644
--- a/src/main/java/org/apache/commons/text/lookup/FileStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/FileStringLookup.java
@@ -24,15 +24,18 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringSubstitutor;
/**
- * Looks up keys from a file.
+ * Looks up file contents.
*
* Using a {@link StringLookup} from the {@link StringLookupFactory}:
*
*
*
- *
StringLookupFactory.INSTANCE.fileStringLookup().lookup(UTF-8:com/domain/document.properties");
+ *
StringLookupFactory.INSTANCE.fileStringLookup().lookup("UTF-8:com/domain/document.properties");
*
*
+ * The above example converts {@code "UTF-8:com/domain/document.properties"}
to the UTF-8 contents of the file at {@code com/domain/document.properties}.
+ *
+ *
* Using a {@link StringSubstitutor}:
*
*
@@ -40,7 +43,7 @@ import org.apache.commons.text.StringSubstitutor;
* StringSubstitutor.createInterpolator().replace("...
${file:UTF-8:com/domain/document.properties} ..."));
*
*
- * The above examples convert {@code "UTF-8:SomePath"} to the contents of the
file.
+ * The above example converts {@code "UTF-8:SomePath"} to the UTF-8 contents
of the file at {@code SomePath}.
*
*
* @since 1.5
