From ed8a93664f2ce6bdd7cc5043c02ad143558e0e40d31a888aabbed5b6c4dab88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 14:27:35 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-configuration2
 revision ecf889dde807f9435f293655a0125d70

---
 apache-commons-configuration2-build.xml  |  4 +--
 apache-commons-configuration2.changes    | 38 ++++++++++++++++++++++++
 apache-commons-configuration2.spec       |  4 +--
 commons-configuration2-2.10.1-src.tar.gz |  3 ++
 commons-configuration2-2.9.0-src.tar.gz  |  3 --
 5 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 commons-configuration2-2.10.1-src.tar.gz
 delete mode 100644 commons-configuration2-2.9.0-src.tar.gz

diff --git a/apache-commons-configuration2-build.xml b/apache-commons-configuration2-build.xml
index 98983be..f5134f8 100644
--- a/apache-commons-configuration2-build.xml
+++ b/apache-commons-configuration2-build.xml
@@ -17,8 +17,8 @@
   <property name="project.groupId" value="org.apache.commons"/>
   <property name="project.artifactId" value="commons-configuration2"/>
 
-  <property name="spec.version" value="2.9"/>
-  <property name="project.version" value="${spec.version}.0"/>
+  <property name="spec.version" value="2.10"/>
+  <property name="project.version" value="${spec.version}.1"/>
   <property name="bundle.version" value="${project.version}"/>
 
   <property name="project.name" value="Apache Commons Configuration"/>
diff --git a/apache-commons-configuration2.changes b/apache-commons-configuration2.changes
index d137b8d..d81caa1 100644
--- a/apache-commons-configuration2.changes
+++ b/apache-commons-configuration2.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Fri Mar 22 11:28:25 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Upgrade to version 2.10.1
+  * Fixed Bugs:
+    + java.lang.module.FindException: Module servlet.api not found.
+      Fixes CONFIGURATION-839.
+    + StackOverflowError adding property in
+      AbstractListDelimiterHandler.flattenIterator(). Fixes
+      CONFIGURATION-840. (bsc#1221797, CVE-2024-29131)
+    + StackOverflowError calling
+      ListDelimiterHandler.flatten(Object, int) with a cyclical
+      object tree. Fixes CONFIGURATION-841. (bsc#1221793,
+      CVE-2024-29133)
+- Incldes changes from version 2.10.0
+  * New features:
+    +  [StepSecurity] ci: Harden GitHub Actions #307.
+    +  ConfirgurationPropertySource doesn't supply resolved values
+       #309. Fixes CONFIGURATION-834.
+    +  Take prefix delimiter into account when
+       SubsetConfiguration.getKeysInternal() is called #300.
+    +  Guard ConfigurationMap against null configuration #355.
+    +  Properties parser stack overflows on large single-key inputs
+       #369. Fixes CONFIGURATION-838.
+    +  DatabaseConfiguration.AbstractJdbcOperation.execute() throws
+       NullPointerException when no data source is set #368.
+  * Fixed Bugs:
+    +  Add AbstractConfiguration.getKeysInternal(String, String)
+       #300.
+    +  Add ImmutableConfiguration.getKeys(String, String) #300.
+    +  Add
+       PrefixedKeysIterator.PrefixedKeysIterator(Iterator<String%gt;,
+       String, String) #300.
+    +  Add Maven property project.build.outputTimestamp for build
+       reproducibility.
+    +  Guard PatternSubtreeConfigurationWrapper constructor against
+       null #365.
+
 -------------------------------------------------------------------
 Sat Sep 23 17:19:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-configuration2.spec b/apache-commons-configuration2.spec
index 60e3628..8f2c5ee 100644
--- a/apache-commons-configuration2.spec
+++ b/apache-commons-configuration2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-configuration2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %global base_name       configuration2
 %global short_name      commons-%{base_name}
 Name:           apache-commons-configuration2
-Version:        2.9.0
+Version:        2.10.1
 Release:        0
 Summary:        Java library providing a generic Configuration interface
 License:        Apache-2.0
diff --git a/commons-configuration2-2.10.1-src.tar.gz b/commons-configuration2-2.10.1-src.tar.gz
new file mode 100644
index 0000000..42d8f4e
--- /dev/null
+++ b/commons-configuration2-2.10.1-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5194b5149dff562e1d0d8acb07388620c4653d5fad413347d2d3e97092e9bc07
+size 1018617
diff --git a/commons-configuration2-2.9.0-src.tar.gz b/commons-configuration2-2.9.0-src.tar.gz
deleted file mode 100644
index 044c791..0000000
--- a/commons-configuration2-2.9.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fc47f654646bd7f6e43974f58d55c871e6e7010cd1f3d3bbba11261ca770700
-size 1015992