From e635ea361c17e788c1792dfe208b05801ad884c9 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Tue, 10 Dec 2024 11:15:05 +0100
Subject: [PATCH] Prepare release notes for `2.24.3`

---
 pom.xml                                       |  8 +++---
 src/changelog/2.24.3/.release-notes.adoc.ftl  | 25 +++++++++++++++++++
 src/changelog/2.24.3/.release.xml             | 21 ++++++++++++++++
 .../3234_concurrent-logger-modification.xml   | 11 ++++++++
 .../3252_recursive_property_sources.xml       | 11 ++++++++
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 src/changelog/2.24.3/.release-notes.adoc.ftl
 create mode 100644 src/changelog/2.24.3/.release.xml
 create mode 100644 src/changelog/2.24.3/3234_concurrent-logger-modification.xml
 create mode 100644 src/changelog/2.24.3/3252_recursive_property_sources.xml

diff --git a/pom.xml b/pom.xml
index 5cd3ca5de9e..0a264099543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,11 +306,11 @@
   <properties>
 
     <!-- project version -->
-    <revision>2.24.2</revision>
+    <revision>2.24.3</revision>
     <!-- Versions used on the site: no snapshots! -->
-    <site-log4j-api.version>2.24.2</site-log4j-api.version>
-    <site-log4j-core.version>2.24.2</site-log4j-core.version>
-    <site-log4j-layout-template-json.version>2.24.2</site-log4j-layout-template-json.version>
+    <site-log4j-api.version>2.24.3</site-log4j-api.version>
+    <site-log4j-core.version>2.24.3</site-log4j-core.version>
+    <site-log4j-layout-template-json.version>2.24.3</site-log4j-layout-template-json.version>
 
     <!-- =================
          Common properties
diff --git a/src/changelog/2.24.3/.release-notes.adoc.ftl b/src/changelog/2.24.3/.release-notes.adoc.ftl
new file mode 100644
index 00000000000..ec50b079508
--- /dev/null
+++ b/src/changelog/2.24.3/.release-notes.adoc.ftl
@@ -0,0 +1,25 @@
+////
+    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
+
+         https://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.
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This release fixes two minor bugs.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.24.3/.release.xml b/src/changelog/2.24.3/.release.xml
new file mode 100644
index 00000000000..9197b07d3ea
--- /dev/null
+++ b/src/changelog/2.24.3/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<release xmlns="https://logging.apache.org/xml/ns"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+         date="2024-12-10" version="2.24.3"/>
diff --git a/src/changelog/2.24.3/3234_concurrent-logger-modification.xml b/src/changelog/2.24.3/3234_concurrent-logger-modification.xml
new file mode 100644
index 00000000000..ca18530a555
--- /dev/null
+++ b/src/changelog/2.24.3/3234_concurrent-logger-modification.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3234" link="https://github.com/apache/logging-log4j2/issues/3234"/>
+  <description format="asciidoc">
+    Fix `ConcurrentModificationException`, if multiple threads modify loggers concurrently.
+    This bug affects users that modify logger levels programmatically.
+  </description>
+</entry>
diff --git a/src/changelog/2.24.3/3252_recursive_property_sources.xml b/src/changelog/2.24.3/3252_recursive_property_sources.xml
new file mode 100644
index 00000000000..1a04019af18
--- /dev/null
+++ b/src/changelog/2.24.3/3252_recursive_property_sources.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3252" link="https://github.com/apache/logging-log4j2/issues/3252"/>
+  <description format="asciidoc">
+    Protects `PropertiesUtil` against property sources that call `PropertiesUtil` recursively.
+    In some cases such a property source can even cause deadlocks.
+  </description>
+</entry>