From ae1137b231a3d54e3cf40f56e98f4db7857d7b14 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Mon, 18 Nov 2024 21:27:38 +0100
Subject: [PATCH] Prepare release notes for version `2.24.2`

---
 pom.xml                                       |  8 ++---
 src/changelog/2.24.1/.release-notes.adoc.ftl  | 11 ++++++-
 src/changelog/2.24.2/.release-notes.adoc.ftl  | 29 +++++++++++++++++++
 src/changelog/2.24.2/.release.xml             | 21 ++++++++++++++
 .../3048_fix_ThreadContext_remove.xml         |  0
 .../3143_logger_registry.xml                  |  2 +-
 .../3216_fix_JTL_StackTraceStringResolver.xml |  0
 7 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 src/changelog/2.24.2/.release-notes.adoc.ftl
 create mode 100644 src/changelog/2.24.2/.release.xml
 rename src/changelog/{.2.x.x => 2.24.2}/3048_fix_ThreadContext_remove.xml (100%)
 rename src/changelog/{.2.x.x => 2.24.2}/3143_logger_registry.xml (87%)
 rename src/changelog/{.2.x.x => 2.24.2}/3216_fix_JTL_StackTraceStringResolver.xml (100%)

diff --git a/pom.xml b/pom.xml
index 9e5b6cf5f28..92e0921dfa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,11 +302,11 @@
   <properties>
 
     <!-- project version -->
-    <revision>2.24.2-SNAPSHOT</revision>
+    <revision>2.24.2</revision>
     <!-- Versions used on the site: no snapshots! -->
-    <site-log4j-api.version>2.24.1</site-log4j-api.version>
-    <site-log4j-core.version>2.24.1</site-log4j-core.version>
-    <site-log4j-layout-template-json.version>2.24.1</site-log4j-layout-template-json.version>
+    <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>
 
     <!-- =================
          Common properties
diff --git a/src/changelog/2.24.1/.release-notes.adoc.ftl b/src/changelog/2.24.1/.release-notes.adoc.ftl
index 81f6635324d..4fc8a69381d 100644
--- a/src/changelog/2.24.1/.release-notes.adoc.ftl
+++ b/src/changelog/2.24.1/.release-notes.adoc.ftl
@@ -14,12 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 ////
-
+<#-- @ftlvariable name="release.date" type="java.lang.String" -->
+<#-- @ftlvariable name="release.version" type="java.lang.String" -->
 [#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
 == ${release.version}
 
 <#if release.date?has_content>Release date:: ${release.date}</#if>
 
+[WARNING]
+====
+Due to a critical bug affecting this release (see
+https://github.com/apache/logging-log4j2/issues/3143[#3143])
+users are encouraged to upgrade to
+${'<<release-notes-2-24-2, version `2.24.2`>>'}.
+====
+
 This release contains mainly bug fixes of problems encountered with the thread context map, logger registry and configuration reloading.
 
 It also enhances integration tests to use Docker images of the most recent releases of MongoDB and Elastic Search.
diff --git a/src/changelog/2.24.2/.release-notes.adoc.ftl b/src/changelog/2.24.2/.release-notes.adoc.ftl
new file mode 100644
index 00000000000..70aba0a62d8
--- /dev/null
+++ b/src/changelog/2.24.2/.release-notes.adoc.ftl
@@ -0,0 +1,29 @@
+////
+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.
+////
+<#-- @ftlvariable name="release.date" type="java.lang.String" -->
+<#-- @ftlvariable name="release.version" type="java.lang.String" -->
+[#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 a critical bug in Log4j API initialization code, which can cause `LogManager.getLogger()` to return `null` under certain conditions.
+See
+https://github.com/apache/logging-log4j2/issues/3143[#3143]
+for details.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.24.2/.release.xml b/src/changelog/2.24.2/.release.xml
new file mode 100644
index 00000000000..d011d5bf83d
--- /dev/null
+++ b/src/changelog/2.24.2/.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-11-18" version="2.24.2"/>
diff --git a/src/changelog/.2.x.x/3048_fix_ThreadContext_remove.xml b/src/changelog/2.24.2/3048_fix_ThreadContext_remove.xml
similarity index 100%
rename from src/changelog/.2.x.x/3048_fix_ThreadContext_remove.xml
rename to src/changelog/2.24.2/3048_fix_ThreadContext_remove.xml
diff --git a/src/changelog/.2.x.x/3143_logger_registry.xml b/src/changelog/2.24.2/3143_logger_registry.xml
similarity index 87%
rename from src/changelog/.2.x.x/3143_logger_registry.xml
rename to src/changelog/2.24.2/3143_logger_registry.xml
index 39691cf8c8c..f30a9be7297 100644
--- a/src/changelog/.2.x.x/3143_logger_registry.xml
+++ b/src/changelog/2.24.2/3143_logger_registry.xml
@@ -5,6 +5,6 @@
        type="fixed">
   <issue id="3143" link="https://github.com/apache/logging-log4j2/issues/3143"/>
   <description format="asciidoc">
-    Use hard references to `Logger`s in `LoggerRegistry`.
+    Use hard references to ``Logger``s in `LoggerRegistry`.
   </description>
 </entry>
diff --git a/src/changelog/.2.x.x/3216_fix_JTL_StackTraceStringResolver.xml b/src/changelog/2.24.2/3216_fix_JTL_StackTraceStringResolver.xml
similarity index 100%
rename from src/changelog/.2.x.x/3216_fix_JTL_StackTraceStringResolver.xml
rename to src/changelog/2.24.2/3216_fix_JTL_StackTraceStringResolver.xml