This is an automated email from the ASF dual-hosted git repository. ramanathan1504 pushed a commit to branch release/2.26.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 69d6641e41f97f934858bf30a52eb4be80dcb5c5 Author: Ramanathan <[email protected]> AuthorDate: Fri Jun 26 04:50:46 2026 +0530 add patch release/2.26.1 liked commits and moved changelog the release/2.26.1 folder --- pom.xml | 8 +++--- src/changelog/2.26.1/.release-notes.adoc.ftl | 33 ++++++++++++++++++++++ src/changelog/2.26.1/.release.xml | 21 ++++++++++++++ ...2006_Fix_RollingFileAppender_createOnDemand.xml | 0 ...atePatternConverter_locale_without_timezone.xml | 0 .../fix-StructuredDataMessage-XML-encoding.xml | 0 ...nce-detection-for-exceptions-with-colliding.xml | 0 .../fix-log-disruptor-initialization-errors.xml | 0 .../fix_configuration_source_url_leak.xml | 0 .../fix_kafka_appender_retry_error_reporting.xml | 0 10 files changed, 58 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 69f4b16d79..4ef2681a59 100644 --- a/pom.xml +++ b/pom.xml @@ -307,11 +307,11 @@ <properties> <!-- project version --> - <revision>2.26.0</revision> + <revision>2.26.1-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 diff --git a/src/changelog/2.26.1/.release-notes.adoc.ftl b/src/changelog/2.26.1/.release-notes.adoc.ftl new file mode 100644 index 0000000000..d62e7cfa72 --- /dev/null +++ b/src/changelog/2.26.1/.release-notes.adoc.ftl @@ -0,0 +1,33 @@ +//// + 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 patch release addresses several bugs in version 2.26.0, in particular: + +* Fixes "Identity Malfunction" in `ThrowableStackTraceRenderer` by using `IdentityHashMap` for metadata caching. +* Fixes resource leaks in `ConfigurationSource` when loading configurations via URL. +* Fixes `DatePatternConverter` locale parsing when the timezone is omitted. +* Improves logging for `LinkageError` and Disruptor initialization failures to provide better diagnostics. +* Fixes `RollingFileAppender` with `createOnDemand="true"` to prevent the eager creation of parent directories when no logs are being written. +* Fixes `KafkaAppender` retry logic to prevent reporting spurious errors to the error handler after a successful retry. +* Fixes encoding of MSGID and SD-ID fields of `StructuredDataMessage` to XML. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.26.1/.release.xml b/src/changelog/2.26.1/.release.xml new file mode 100644 index 0000000000..fac22b6cfc --- /dev/null +++ b/src/changelog/2.26.1/.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.1"/> diff --git a/src/changelog/.2.x.x/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml b/src/changelog/2.26.1/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml similarity index 100% rename from src/changelog/.2.x.x/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml rename to src/changelog/2.26.1/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml diff --git a/src/changelog/.2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml b/src/changelog/2.26.1/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml similarity index 100% rename from src/changelog/.2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml rename to src/changelog/2.26.1/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml diff --git a/src/changelog/.2.x.x/fix-StructuredDataMessage-XML-encoding.xml b/src/changelog/2.26.1/fix-StructuredDataMessage-XML-encoding.xml similarity index 100% rename from src/changelog/.2.x.x/fix-StructuredDataMessage-XML-encoding.xml rename to src/changelog/2.26.1/fix-StructuredDataMessage-XML-encoding.xml diff --git a/src/changelog/.2.x.x/fix-circular-reference-detection-for-exceptions-with-colliding.xml b/src/changelog/2.26.1/fix-circular-reference-detection-for-exceptions-with-colliding.xml similarity index 100% rename from src/changelog/.2.x.x/fix-circular-reference-detection-for-exceptions-with-colliding.xml rename to src/changelog/2.26.1/fix-circular-reference-detection-for-exceptions-with-colliding.xml diff --git a/src/changelog/.2.x.x/fix-log-disruptor-initialization-errors.xml b/src/changelog/2.26.1/fix-log-disruptor-initialization-errors.xml similarity index 100% rename from src/changelog/.2.x.x/fix-log-disruptor-initialization-errors.xml rename to src/changelog/2.26.1/fix-log-disruptor-initialization-errors.xml diff --git a/src/changelog/.2.x.x/fix_configuration_source_url_leak.xml b/src/changelog/2.26.1/fix_configuration_source_url_leak.xml similarity index 100% rename from src/changelog/.2.x.x/fix_configuration_source_url_leak.xml rename to src/changelog/2.26.1/fix_configuration_source_url_leak.xml diff --git a/src/changelog/.2.x.x/fix_kafka_appender_retry_error_reporting.xml b/src/changelog/2.26.1/fix_kafka_appender_retry_error_reporting.xml similarity index 100% rename from src/changelog/.2.x.x/fix_kafka_appender_retry_error_reporting.xml rename to src/changelog/2.26.1/fix_kafka_appender_retry_error_reporting.xml
