This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new aaf04c0f67 Merge `2.26.0` release changes back into `2.x` (#4117)
aaf04c0f67 is described below
commit aaf04c0f67fc0f08a9b94c60ea87998c3a14a88e
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu May 7 14:51:38 2026 +0200
Merge `2.26.0` release changes back into `2.x` (#4117)
---
pom.xml | 10 ++++-----
.../.2.x.x/3819_logback-builder-reuse.xml | 12 -----------
.../.2.x.x/3828_fix_log_placeholder_mismatch.xml | 12 -----------
src/changelog/.2.x.x/3835-default-layout.xml | 12 -----------
src/changelog/.2.x.x/3852-default-target.xml | 12 -----------
src/changelog/.2.x.x/3871_graalvm_binary_name.xml | 13 -----------
.../3872_fix_RollingFileManager_initialTime.xml | 13 -----------
.../.2.x.x/3873_throwable_converter_new_line.xml | 13 -----------
src/changelog/.2.x.x/3905_fix_error_prone_dep.xml | 14 ------------
src/changelog/.2.x.x/3920-nested-throwables.xml | 12 -----------
src/changelog/.2.x.x/3930_date-converter.xml | 12 -----------
...35_optimize_DefaultThreadContextMap_getCopy.xml | 13 -----------
.../3947_fix_SslSocketManager_null_keystore.xml | 13 -----------
...3975_prevent_warning_for_last_null_argument.xml | 14 ------------
.../.2.x.x/3985_remove_spotbugs_annotations.xml | 13 -----------
.../4002_fix_SslSocketAppender_verifyHostName.xml | 12 -----------
.../.2.x.x/4033_fix_custom_throwable_to_sting.xml | 13 -----------
..._debug_logs_for_successful_resource_loading.xml | 13 -----------
...pdate_co_elastic_clients_elasticsearch_java.xml | 8 -------
.../update_org_apache_commons_commons_lang3.xml | 8 -------
...gradlex_gradle_module_metadata_maven_plugin.xml | 8 -------
src/changelog/2.26.0/.release-notes.adoc.ftl | 25 ++++++++++++++++++++++
src/changelog/2.26.0/.release.xml | 21 ++++++++++++++++++
.../3176_validate_scripts_in_ScriptsPlugin.xml | 3 +--
.../3336_script_resolution_order_fix.xml | 0
.../{.2.x.x => 2.26.0}/3750_deprecate_withers.xml | 3 ++-
.../3874_remove_jvmrunargs_lookup.xml | 3 +--
...raceRenderer_ArrayIndexOutOfBoundsException.xml | 2 +-
.../3968_refactor_manager_factories.xml | 0
.../4068_fix_SLF4JLogger_atFatal_wrong_level.xml | 3 ++-
.../{.2.x.x => 2.26.0}/4099_javadoc-cross-link.xml | 2 +-
..._getConfiguration_method_for_mulitiple_URIs.xml | 6 +++---
.../exported_named_patterns_into_public_enum.xml | 0
..._RollingRandomAccessFileManager_writeHeader.xml | 2 +-
.../plugin_processor_min_allowed_message_kind.xml | 0
.../prevent_configexception_non_used_config.xml | 4 ++--
.../{.2.x.x => 2.26.0}/rfc5424-setters.xml | 2 +-
.../update_org_junit_junit_bom.xml | 0
.../{.2.x.x => 2.26.0}/update_org_mongodb_bson.xml | 0
.../update_org_xerial_snappy_snappy_java.xml | 0
40 files changed, 66 insertions(+), 260 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4020b4b427..23b6eb7bcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,11 +307,11 @@
<properties>
<!-- project version -->
- <revision>2.26.0-SNAPSHOT</revision>
+ <revision>2.27.0-SNAPSHOT</revision>
<!-- Versions used on the site: no snapshots! -->
- <site-log4j-api.version>2.25.4</site-log4j-api.version>
- <site-log4j-core.version>2.25.4</site-log4j-core.version>
-
<site-log4j-layout-template-json.version>2.25.4</site-log4j-layout-template-json.version>
+ <site-log4j-api.version>2.26.0</site-log4j-api.version>
+ <site-log4j-core.version>2.26.0</site-log4j-core.version>
+
<site-log4j-layout-template-json.version>2.26.0</site-log4j-layout-template-json.version>
<!-- =================
Common properties
@@ -325,7 +325,7 @@
2. This value is employed in various places while creating the
distribution
To mitigate these, we define a *dummy* value here and let the CI
replace it during a release.
Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-
<project.build.outputTimestamp>2026-03-25T07:52:12Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2026-05-02T19:54:56Z</project.build.outputTimestamp>
<!-- ========================
Site-specific properties
diff --git a/src/changelog/.2.x.x/3819_logback-builder-reuse.xml
b/src/changelog/.2.x.x/3819_logback-builder-reuse.xml
deleted file mode 100644
index ea67aa50d0..0000000000
--- a/src/changelog/.2.x.x/3819_logback-builder-reuse.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3819"
link="https://github.com/apache/logging-log4j2/issues/3819"/>
- <description format="asciidoc">
- Fix potential memory leak involving `LogBuilder` in Log4j API to Logback
bridge.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3828_fix_log_placeholder_mismatch.xml
b/src/changelog/.2.x.x/3828_fix_log_placeholder_mismatch.xml
deleted file mode 100644
index 884b93985d..0000000000
--- a/src/changelog/.2.x.x/3828_fix_log_placeholder_mismatch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3828"
link="https://github.com/apache/logging-log4j2/issues/3828"/>
- <description format="asciidoc">
- Corrected an incorrect placeholder count in the
AbstractDriverManagerConnectionSource debug log message to prevent unnecessary
warnings.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3835-default-layout.xml
b/src/changelog/.2.x.x/3835-default-layout.xml
deleted file mode 100644
index 877631c902..0000000000
--- a/src/changelog/.2.x.x/3835-default-layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3835"
link="https://github.com/apache/logging-log4j2/issues/3835"/>
- <description format="asciidoc">
- Fix missing newlines in default logging configuration for log4j-core.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3852-default-target.xml
b/src/changelog/.2.x.x/3852-default-target.xml
deleted file mode 100644
index ec4c28297d..0000000000
--- a/src/changelog/.2.x.x/3852-default-target.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3852" link="https://github.com/apache/logging-log4j2/pull/3852"/>
- <description format="asciidoc">
- Fix missing default `Target` value in Console Appender.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3871_graalvm_binary_name.xml
b/src/changelog/.2.x.x/3871_graalvm_binary_name.xml
deleted file mode 100644
index a6a5e8c257..0000000000
--- a/src/changelog/.2.x.x/3871_graalvm_binary_name.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3871"
link="https://github.com/apache/logging-log4j2/issues/3871"/>
- <issue id="3996"
link="https://github.com/apache/logging-log4j2/pull/3996"/>
- <description format="asciidoc">
- Fix GraalVM metadata for nested classes to use binary names instead of
canonical names.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3872_fix_RollingFileManager_initialTime.xml
b/src/changelog/.2.x.x/3872_fix_RollingFileManager_initialTime.xml
deleted file mode 100644
index ba6fbd9129..0000000000
--- a/src/changelog/.2.x.x/3872_fix_RollingFileManager_initialTime.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3068"
link="https://github.com/apache/logging-log4j2/issues/3068"/>
- <issue id="3872"
link="https://github.com/apache/logging-log4j2/pull/3872"/>
- <description format="asciidoc">
- Discard the sub-second part while obtaining the initial time (i.e.,
creation time) of a file in `RollingFileManager`
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3873_throwable_converter_new_line.xml
b/src/changelog/.2.x.x/3873_throwable_converter_new_line.xml
deleted file mode 100644
index 30011263e5..0000000000
--- a/src/changelog/.2.x.x/3873_throwable_converter_new_line.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3873"
link="https://github.com/apache/logging-log4j2/issues/3873"/>
- <issue id="3919"
link="https://github.com/apache/logging-log4j2/pull/3919"/>
- <description format="asciidoc">
- Fix Pattern Layout exception stack trace converters to no longer
prepend newlines based on context
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
b/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
deleted file mode 100644
index 2667e0f424..0000000000
--- a/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3779"
link="https://github.com/apache/logging-log4j2/issues/3779"/>
- <issue id="3785" link="https://github.com/apache/logging-log4j2/pull/3785"/>
- <issue id="3905" link="https://github.com/apache/logging-log4j2/pull/3905"/>
- <description format="asciidoc">
- Fix the `com.google.errorprone:error_prone_annotations` dependency whose
version property gets erased due to flattening
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3920-nested-throwables.xml
b/src/changelog/.2.x.x/3920-nested-throwables.xml
deleted file mode 100644
index a8c9b13cfe..0000000000
--- a/src/changelog/.2.x.x/3920-nested-throwables.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3920" link="https://github.com/apache/logging-log4j2/pull/3920"/>
- <description format="asciidoc">
- Fix detection of throwable converters inside nested patterns when applying
`alwaysWriteExceptions`.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3930_date-converter.xml
b/src/changelog/.2.x.x/3930_date-converter.xml
deleted file mode 100644
index 1823ea9602..0000000000
--- a/src/changelog/.2.x.x/3930_date-converter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3930"
link="https://github.com/apache/logging-log4j2/issues/3930"/>
- <description format="asciidoc">
- Fix parsing and merging of literals in `InstantPatternDynamicFormatter`.
- </description>
-</entry>
diff --git
a/src/changelog/.2.x.x/3935_optimize_DefaultThreadContextMap_getCopy.xml
b/src/changelog/.2.x.x/3935_optimize_DefaultThreadContextMap_getCopy.xml
deleted file mode 100644
index 35e1cf8b44..0000000000
--- a/src/changelog/.2.x.x/3935_optimize_DefaultThreadContextMap_getCopy.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="changed">
- <issue id="3935"
link="https://github.com/apache/logging-log4j2/issues/3935"/>
- <issue id="3939"
link="https://github.com/apache/logging-log4j2/pull/3939"/>
- <description format="asciidoc">
- Optimize `DefaultThreadContextMap.getCopy()` performance by avoiding
megamorphic calls in `HashMap` constructor
- </description>
-</entry>
\ No newline at end of file
diff --git a/src/changelog/.2.x.x/3947_fix_SslSocketManager_null_keystore.xml
b/src/changelog/.2.x.x/3947_fix_SslSocketManager_null_keystore.xml
deleted file mode 100644
index ff6efe8256..0000000000
--- a/src/changelog/.2.x.x/3947_fix_SslSocketManager_null_keystore.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="3947"
link="https://github.com/apache/logging-log4j2/issues/3947"/>
- <issue id="3953"
link="https://github.com/apache/logging-log4j2/pull/3953"/>
- <description format="asciidoc">
- Fix failures caused by null `SslConfiguration`
- </description>
-</entry>
diff --git
a/src/changelog/.2.x.x/3975_prevent_warning_for_last_null_argument.xml
b/src/changelog/.2.x.x/3975_prevent_warning_for_last_null_argument.xml
deleted file mode 100644
index 9c96386fac..0000000000
--- a/src/changelog/.2.x.x/3975_prevent_warning_for_last_null_argument.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="changed">
- <issue id="3975"
link="https://github.com/apache/logging-log4j2/issues/3975"/>
- <issue id="4014"
link="https://github.com/apache/logging-log4j2/pull/4014"/>
- <description format="asciidoc">
- Prevent ParameterFormatter issuing a warning in case there is an extra
null argument.
- Needed to support cases with Throwable parameter that may be null.
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/3985_remove_spotbugs_annotations.xml
b/src/changelog/.2.x.x/3985_remove_spotbugs_annotations.xml
deleted file mode 100644
index a2c7b3b8b2..0000000000
--- a/src/changelog/.2.x.x/3985_remove_spotbugs_annotations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="removed">
- <issue id="3984"
link="https://github.com/apache/logging-log4j2/issues/3984"/>
- <issue id="3985"
link="https://github.com/apache/logging-log4j2/pull/3985"/>
- <description format="asciidoc">
- Remove the `com.github.spotbugs:spotbugs-annotations` dependency
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/4002_fix_SslSocketAppender_verifyHostName.xml
b/src/changelog/.2.x.x/4002_fix_SslSocketAppender_verifyHostName.xml
deleted file mode 100644
index 9fb4e40c88..0000000000
--- a/src/changelog/.2.x.x/4002_fix_SslSocketAppender_verifyHostName.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="fixed">
- <issue id="4002" link="https://github.com/apache/logging-log4j2/pull/4002"/>
- <description format="asciidoc">
- Fix incorrect handling of the host name verification (i.e.,
`verifyHostName`) in `SslSocketManager`, which is used by Socket Appender when
SSL/TLS is enabled
- </description>
-</entry>
diff --git a/src/changelog/.2.x.x/4033_fix_custom_throwable_to_sting.xml
b/src/changelog/.2.x.x/4033_fix_custom_throwable_to_sting.xml
deleted file mode 100644
index 761380f81c..0000000000
--- a/src/changelog/.2.x.x/4033_fix_custom_throwable_to_sting.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="changed">
- <issue id="3623"
link="https://github.com/apache/logging-log4j2/issues/3623"/>
- <issue id="4033"
link="https://github.com/apache/logging-log4j2/pull/4033"/>
- <description format="asciidoc">
- Take `Throwable#toString()` into account while rendering stack traces
in Pattern Layout.
- </description>
-</entry>
diff --git
a/src/changelog/.2.x.x/add_debug_logs_for_successful_resource_loading.xml
b/src/changelog/.2.x.x/add_debug_logs_for_successful_resource_loading.xml
deleted file mode 100644
index 445100bf51..0000000000
--- a/src/changelog/.2.x.x/add_debug_logs_for_successful_resource_loading.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry 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";
- type="added">
- <issue id="4058"
link="https://github.com/apache/logging-log4j2/issues/4058"/>
- <issue id="4060"
link="https://github.com/apache/logging-log4j2/pull/4060"/>
- <description format="asciidoc">
- Added debug level logs for successful resource loading in `Loader`
class to show where resources are found
- </description>
-</entry>
diff --git
a/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml
b/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml
deleted file mode 100644
index a2f7650479..0000000000
--- a/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="updated">
- <issue id="3949" link="https://github.com/apache/logging-log4j2/pull/3949"/>
- <description format="asciidoc">Update
`co.elastic.clients:elasticsearch-java` to version `9.1.5`</description>
-</entry>
diff --git a/src/changelog/.2.x.x/update_org_apache_commons_commons_lang3.xml
b/src/changelog/.2.x.x/update_org_apache_commons_commons_lang3.xml
deleted file mode 100644
index 33e9b85386..0000000000
--- a/src/changelog/.2.x.x/update_org_apache_commons_commons_lang3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="updated">
- <issue id="3815" link="https://github.com/apache/logging-log4j2/pull/3815"/>
- <description format="asciidoc">Update `org.apache.commons:commons-lang3` to
version `3.18.0`</description>
-</entry>
diff --git
a/src/changelog/.2.x.x/update_org_gradlex_gradle_module_metadata_maven_plugin.xml
b/src/changelog/.2.x.x/update_org_gradlex_gradle_module_metadata_maven_plugin.xml
deleted file mode 100644
index a1d201d9a7..0000000000
---
a/src/changelog/.2.x.x/update_org_gradlex_gradle_module_metadata_maven_plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="updated">
- <issue id="3811" link="https://github.com/apache/logging-log4j2/pull/3811"/>
- <description format="asciidoc">Update
`org.gradlex:gradle-module-metadata-maven-plugin` to version `1.1`</description>
-</entry>
diff --git a/src/changelog/2.26.0/.release-notes.adoc.ftl
b/src/changelog/2.26.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000000..a8872ea196
--- /dev/null
+++ b/src/changelog/2.26.0/.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 minor release delivers all the fixes in the `[2.25.0, 2.25.4]` version
range, plus some new fixes, and several other improvements and features.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.26.0/.release.xml
b/src/changelog/2.26.0/.release.xml
new file mode 100644
index 0000000000..6bd483477d
--- /dev/null
+++ b/src/changelog/2.26.0/.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="2026-05-02" version="2.26.0"/>
diff --git a/src/changelog/.2.x.x/3176_validate_scripts_in_ScriptsPlugin.xml
b/src/changelog/2.26.0/3176_validate_scripts_in_ScriptsPlugin.xml
similarity index 65%
rename from src/changelog/.2.x.x/3176_validate_scripts_in_ScriptsPlugin.xml
rename to src/changelog/2.26.0/3176_validate_scripts_in_ScriptsPlugin.xml
index 0246396937..db263d3b4c 100644
--- a/src/changelog/.2.x.x/3176_validate_scripts_in_ScriptsPlugin.xml
+++ b/src/changelog/2.26.0/3176_validate_scripts_in_ScriptsPlugin.xml
@@ -7,7 +7,6 @@
type="changed">
<issue id="3176"
link="https://github.com/apache/logging-log4j2/issues/3176"/>
<description format="asciidoc">
- Ensured scripts in global `Scripts container` have explicit names by
throwing a `ConfigurationException` for unnamed ones.
- Refined script identification with `AbstractScript.getId()` and
clarified `AbstractScript.getName()`.
+ Ensure scripts in the global `Scripts` element have explicit names by
throwing a `ConfigurationException` for unnamed ones.
</description>
</entry>
diff --git a/src/changelog/.2.x.x/3336_script_resolution_order_fix.xml
b/src/changelog/2.26.0/3336_script_resolution_order_fix.xml
similarity index 100%
rename from src/changelog/.2.x.x/3336_script_resolution_order_fix.xml
rename to src/changelog/2.26.0/3336_script_resolution_order_fix.xml
diff --git a/src/changelog/.2.x.x/3750_deprecate_withers.xml
b/src/changelog/2.26.0/3750_deprecate_withers.xml
similarity index 73%
rename from src/changelog/.2.x.x/3750_deprecate_withers.xml
rename to src/changelog/2.26.0/3750_deprecate_withers.xml
index f7084c2719..e691f0ce4e 100644
--- a/src/changelog/.2.x.x/3750_deprecate_withers.xml
+++ b/src/changelog/2.26.0/3750_deprecate_withers.xml
@@ -7,6 +7,7 @@
type="deprecated">
<issue id="3750"
link="https://github.com/apache/logging-log4j2/issues/3750"/>
<description format="asciidoc">
- Deprecated withers in builder classes in favor of setters. This change
improves API consistency with 3.x and helps users adapt to the upcoming changes.
+ Deprecated withers in builder classes in favor of setters.
+ This change improves API consistency with Log4j Core 3 and helps users
adapt to the upcoming changes.
</description>
</entry>
diff --git a/src/changelog/.2.x.x/3874_remove_jvmrunargs_lookup.xml
b/src/changelog/2.26.0/3874_remove_jvmrunargs_lookup.xml
similarity index 82%
rename from src/changelog/.2.x.x/3874_remove_jvmrunargs_lookup.xml
rename to src/changelog/2.26.0/3874_remove_jvmrunargs_lookup.xml
index ef0c2850be..6e0551af5f 100644
--- a/src/changelog/.2.x.x/3874_remove_jvmrunargs_lookup.xml
+++ b/src/changelog/2.26.0/3874_remove_jvmrunargs_lookup.xml
@@ -5,8 +5,7 @@
https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="removed">
- <issue id="3874"
link="https://github.com/apache/logging-log4j2/pull/3874"/>
-
+ <issue id="3874"
link="https://github.com/apache/logging-log4j2/pull/3874"/>
<description format="asciidoc">
Remove the `jvmrunargs` lookup.
</description>
diff --git
a/src/changelog/.2.x.x/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
b/src/changelog/2.26.0/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
similarity index 80%
rename from
src/changelog/.2.x.x/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
rename to
src/changelog/2.26.0/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
index 4bd5ca2c28..cc0058776f 100644
---
a/src/changelog/.2.x.x/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
+++
b/src/changelog/2.26.0/3940_ThrowableStackTraceRenderer_ArrayIndexOutOfBoundsException.xml
@@ -8,6 +8,6 @@
<issue id="3940"
link="https://github.com/apache/logging-log4j2/issues/3940"/>
<issue id="3955" link="https://github.com/apache/logging-log4j2/pull/3955"/>
<description format="asciidoc">
- Fixes `ArrayIndexOutOfBoundsException` thrown by
`ThrowableStackTraceRenderer` when the stack trace is mutated concurrently.
+ Fix `ArrayIndexOutOfBoundsException` thrown by
`ThrowableStackTraceRenderer` when the stack trace is modified concurrently
</description>
</entry>
diff --git a/src/changelog/.2.x.x/3968_refactor_manager_factories.xml
b/src/changelog/2.26.0/3968_refactor_manager_factories.xml
similarity index 100%
rename from src/changelog/.2.x.x/3968_refactor_manager_factories.xml
rename to src/changelog/2.26.0/3968_refactor_manager_factories.xml
diff --git a/src/changelog/.2.x.x/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
b/src/changelog/2.26.0/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
similarity index 69%
rename from src/changelog/.2.x.x/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
rename to src/changelog/2.26.0/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
index 811996eb8d..f2dcb09537 100644
--- a/src/changelog/.2.x.x/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
+++ b/src/changelog/2.26.0/4068_fix_SLF4JLogger_atFatal_wrong_level.xml
@@ -8,6 +8,7 @@
<issue id="4068"
link="https://github.com/apache/logging-log4j2/issues/4068"/>
<issue id="4089"
link="https://github.com/apache/logging-log4j2/pull/4089"/>
<description format="asciidoc">
- Fixed `SLF4JLogger.atFatal()` returning `atLevel(Level.TRACE)` instead
of `atLevel(Level.FATAL)`, which caused FATAL log events to be silently
discarded when using the fluent API through the `log4j-to-slf4j` bridge.
+ Fix `SLF4JLogger.atFatal()` returning `atLevel(Level.TRACE)` instead
of `atLevel(Level.FATAL)`.
+ This was causing `FATAL`-level log events to be silently discarded
when using the fluent API through the `log4j-to-slf4j` bridge.
</description>
</entry>
diff --git a/src/changelog/.2.x.x/4099_javadoc-cross-link.xml
b/src/changelog/2.26.0/4099_javadoc-cross-link.xml
similarity index 86%
rename from src/changelog/.2.x.x/4099_javadoc-cross-link.xml
rename to src/changelog/2.26.0/4099_javadoc-cross-link.xml
index 86e02a96a1..5110576866 100644
--- a/src/changelog/.2.x.x/4099_javadoc-cross-link.xml
+++ b/src/changelog/2.26.0/4099_javadoc-cross-link.xml
@@ -8,6 +8,6 @@
<issue id="4099"
link="https://github.com/apache/logging-log4j2/issues/4099"/>
<issue id="4100" link="https://github.com/apache/logging-log4j2/pull/4100"/>
<description format="asciidoc">
- Javadoc references across module boundaries (i.e., cross-references) are
fixed
+ Fix Javadoc references across module boundaries (i.e., cross-references)
</description>
</entry>
diff --git
a/src/changelog/.2.x.x/add_getConfiguration_method_for_mulitiple_URIs.xml
b/src/changelog/2.26.0/add_getConfiguration_method_for_mulitiple_URIs.xml
similarity index 82%
rename from
src/changelog/.2.x.x/add_getConfiguration_method_for_mulitiple_URIs.xml
rename to
src/changelog/2.26.0/add_getConfiguration_method_for_mulitiple_URIs.xml
index 6a30033ce6..a6b84f9292 100644
--- a/src/changelog/.2.x.x/add_getConfiguration_method_for_mulitiple_URIs.xml
+++ b/src/changelog/2.26.0/add_getConfiguration_method_for_mulitiple_URIs.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns="https://logging.apache.org/xml/ns";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+ 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";
- type="added">
+ type="added">
<issue id="3775"
link="https://github.com/apache/logging-log4j2/issues/3775"/>
<issue id="3921" link="https://github.com/apache/logging-log4j2/pull/3921"/>
<description format="asciidoc">
diff --git a/src/changelog/.2.x.x/exported_named_patterns_into_public_enum.xml
b/src/changelog/2.26.0/exported_named_patterns_into_public_enum.xml
similarity index 100%
rename from src/changelog/.2.x.x/exported_named_patterns_into_public_enum.xml
rename to src/changelog/2.26.0/exported_named_patterns_into_public_enum.xml
diff --git
a/src/changelog/.2.x.x/fix_RollingRandomAccessFileManager_writeHeader.xml
b/src/changelog/2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
similarity index 97%
rename from
src/changelog/.2.x.x/fix_RollingRandomAccessFileManager_writeHeader.xml
rename to
src/changelog/2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
index a23c6497f9..0cf87573c7 100644
--- a/src/changelog/.2.x.x/fix_RollingRandomAccessFileManager_writeHeader.xml
+++ b/src/changelog/2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
@@ -6,7 +6,7 @@
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="fixed">
<description format="asciidoc">
- Fix header write in `RollingRandomAccessFileManager` that was being
incorrectly skipped if `append=true` and the file didn't exist before.
+ Fix header write in `RollingRandomAccessFileManager` that was being
incorrectly skipped if `append=true` and the file didn't exist before
</description>
</entry>
diff --git a/src/changelog/.2.x.x/plugin_processor_min_allowed_message_kind.xml
b/src/changelog/2.26.0/plugin_processor_min_allowed_message_kind.xml
similarity index 100%
rename from src/changelog/.2.x.x/plugin_processor_min_allowed_message_kind.xml
rename to src/changelog/2.26.0/plugin_processor_min_allowed_message_kind.xml
diff --git a/src/changelog/.2.x.x/prevent_configexception_non_used_config.xml
b/src/changelog/2.26.0/prevent_configexception_non_used_config.xml
similarity index 77%
rename from src/changelog/.2.x.x/prevent_configexception_non_used_config.xml
rename to src/changelog/2.26.0/prevent_configexception_non_used_config.xml
index b489fa0e24..ed774ce257 100644
--- a/src/changelog/.2.x.x/prevent_configexception_non_used_config.xml
+++ b/src/changelog/2.26.0/prevent_configexception_non_used_config.xml
@@ -4,10 +4,10 @@
xsi:schemaLocation="
https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="added">
+ type="fixed">
<issue id="4036"
link="https://github.com/apache/logging-log4j2/issues/4036"/>
<issue id="4069"
link="https://github.com/apache/logging-log4j2/pull/4069"/>
<description format="asciidoc">
- Disregarded defined logger, appender and filter properties not
referenced in loggers, appenders and filters respectively
+ Fix a properties file configuration regression caused by not
referenced loggers, appenders, and filters
</description>
</entry>
diff --git a/src/changelog/.2.x.x/rfc5424-setters.xml
b/src/changelog/2.26.0/rfc5424-setters.xml
similarity index 87%
rename from src/changelog/.2.x.x/rfc5424-setters.xml
rename to src/changelog/2.26.0/rfc5424-setters.xml
index 4cd3cde732..6ad576b69f 100644
--- a/src/changelog/.2.x.x/rfc5424-setters.xml
+++ b/src/changelog/2.26.0/rfc5424-setters.xml
@@ -6,6 +6,6 @@
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<description format="asciidoc">
- Add missing setters to `Rfc5424LayoutBuilder`.
+ Add missing setters to `Rfc5424LayoutBuilder`
</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org_junit_junit_bom.xml
b/src/changelog/2.26.0/update_org_junit_junit_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_junit_junit_bom.xml
rename to src/changelog/2.26.0/update_org_junit_junit_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_mongodb_bson.xml
b/src/changelog/2.26.0/update_org_mongodb_bson.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_mongodb_bson.xml
rename to src/changelog/2.26.0/update_org_mongodb_bson.xml
diff --git a/src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml
b/src/changelog/2.26.0/update_org_xerial_snappy_snappy_java.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml
rename to src/changelog/2.26.0/update_org_xerial_snappy_snappy_java.xml
