This is an automated email from the ASF dual-hosted git repository. ramanathan1504 pushed a commit to branch 2.25.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0121560fd714f5494a0981f098fc8198d76e322d Author: Ramanathan <[email protected]> AuthorDate: Wed Jul 1 11:49:00 2026 +0530 Add release metadata for version 2.25.5 and update changelog entries --- src/changelog/2.25.5/.release-notes.adoc.ftl | 25 ++++++++++++++++++++++ src/changelog/2.25.5/.release.xml | 21 ++++++++++++++++++ ...atePatternConverter_locale_without_timezone.xml | 3 ++- .../fix-MapMessage-JSON-non-finite-number.xml | 2 +- .../fix-StructuredDataMessage-XML-encoding.xml | 0 ...nce-detection-for-exceptions-with-colliding.xml | 2 +- .../fix-log-disruptor-initialization-errors.xml | 0 .../fix_configuration_source_url_leak.xml | 0 .../fix_kafka_appender_retry_error_reporting.xml | 0 9 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/changelog/2.25.5/.release-notes.adoc.ftl b/src/changelog/2.25.5/.release-notes.adoc.ftl new file mode 100644 index 0000000000..d97e14b7c8 --- /dev/null +++ b/src/changelog/2.25.5/.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 patch release delivers certain fixes on top of `2.25.4`. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.25.5/.release.xml b/src/changelog/2.25.5/.release.xml new file mode 100644 index 0000000000..6dfdec5030 --- /dev/null +++ b/src/changelog/2.25.5/.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-07-01" version="2.25.5"/> diff --git a/src/changelog/.2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml b/src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml similarity index 82% rename from src/changelog/.2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml rename to src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml index 52238f30fb..d2c4ff718d 100644 --- a/src/changelog/.2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml +++ b/src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml @@ -8,6 +8,7 @@ <issue id="4129" link="https://github.com/apache/logging-log4j2/issues/4129"/> <issue id="4130" link="https://github.com/apache/logging-log4j2/pull/4130"/> <description format="asciidoc"> - Improved documentation for locale handling in the Pattern Layout date pattern converter. </description> + Improve documentation for locale handling in the Pattern Layout date pattern converter + </description> </entry> diff --git a/src/changelog/.2.x.x/fix-MapMessage-JSON-non-finite-number.xml b/src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml similarity index 84% rename from src/changelog/.2.x.x/fix-MapMessage-JSON-non-finite-number.xml rename to src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml index 177291e651..d46ebd2133 100644 --- a/src/changelog/.2.x.x/fix-MapMessage-JSON-non-finite-number.xml +++ b/src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml @@ -5,7 +5,7 @@ https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"; type="fixed"> - <issue id="TBD" link="https://github.com/apache/logging-log4j2/pull/TBD"/> + <issue id="4163" link="https://github.com/apache/logging-log4j2/pull/4163"/> <description format="asciidoc"> Fix handling of non-finite numbers while encoding `MapMessage` to JSON </description> diff --git a/src/changelog/.2.x.x/fix-StructuredDataMessage-XML-encoding.xml b/src/changelog/2.25.5/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.25.5/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.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml similarity index 96% rename from src/changelog/.2.x.x/fix-circular-reference-detection-for-exceptions-with-colliding.xml rename to src/changelog/2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml index 1633dcdb8a..63173fdacb 100644 --- a/src/changelog/.2.x.x/fix-circular-reference-detection-for-exceptions-with-colliding.xml +++ b/src/changelog/2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml @@ -4,7 +4,7 @@ xsi:schemaLocation=" https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"; - type="changed"> + type="fixed"> <issue id="3933" link="https://github.com/apache/logging-log4j2/issues/3933"/> <issue id="4133" link="https://github.com/apache/logging-log4j2/pull/4133"/> <description format="asciidoc"> diff --git a/src/changelog/.2.x.x/fix-log-disruptor-initialization-errors.xml b/src/changelog/2.25.5/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.25.5/fix-log-disruptor-initialization-errors.xml diff --git a/src/changelog/.2.x.x/fix_configuration_source_url_leak.xml b/src/changelog/2.25.5/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.25.5/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.25.5/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.25.5/fix_kafka_appender_retry_error_reporting.xml
