This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch release/2.25.4 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ed021e6108fbcad4e93a8c1a2f49f18decd1f951 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Mar 25 08:35:28 2026 +0100 Add release notes for version `2.25.4` --- pom.xml | 2 +- src/changelog/2.25.4/.release-notes.adoc.ftl | 32 ++++++++++++++++++++++ src/changelog/2.25.4/.release.xml | 21 ++++++++++++++ .../4022_rfc5424-param-names.xml | 0 .../{.2.x.x => 2.25.4}/4061_ssl-connection.xml | 0 .../{.2.x.x => 2.25.4}/4073_rfc5424-sd-param.xml | 0 .../4077_xml-control-characters.xml | 0 .../4078_log4j1-xml-control-characters.xml | 0 .../4079_map-message-control-characters.xml | 0 src/changelog/{.2.x.x => 2.25.4}/4080_jtl-nan.xml | 0 10 files changed, 54 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d48c2c5228..9fdfcd70c1 100644 --- a/pom.xml +++ b/pom.xml @@ -307,7 +307,7 @@ <properties> <!-- project version --> - <revision>2.25.4-SNAPSHOT</revision> + <revision>2.25.4</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> diff --git a/src/changelog/2.25.4/.release-notes.adoc.ftl b/src/changelog/2.25.4/.release-notes.adoc.ftl new file mode 100644 index 0000000000..fd06e74e15 --- /dev/null +++ b/src/changelog/2.25.4/.release-notes.adoc.ftl @@ -0,0 +1,32 @@ +//// + 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 fixes for configuration inconsistencies and formatting issues across several layouts. + +* Restores alignment between documented and actual configuration attributes. +* Fixes formatting and sanitization issues in XML and RFC5424 layouts. +* Improves handling of invalid characters and non-standard values. + +The authoritative list of recognized configuration attributes is available in the +{logging-services-url}/log4j/2.x/plugin-reference.html[Plugin Reference]. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.25.4/.release.xml b/src/changelog/2.25.4/.release.xml new file mode 100644 index 0000000000..4d6e2a9c5f --- /dev/null +++ b/src/changelog/2.25.4/.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-03-25" version="2.25.4"/> diff --git a/src/changelog/.2.x.x/4022_rfc5424-param-names.xml b/src/changelog/2.25.4/4022_rfc5424-param-names.xml similarity index 100% rename from src/changelog/.2.x.x/4022_rfc5424-param-names.xml rename to src/changelog/2.25.4/4022_rfc5424-param-names.xml diff --git a/src/changelog/.2.x.x/4061_ssl-connection.xml b/src/changelog/2.25.4/4061_ssl-connection.xml similarity index 100% rename from src/changelog/.2.x.x/4061_ssl-connection.xml rename to src/changelog/2.25.4/4061_ssl-connection.xml diff --git a/src/changelog/.2.x.x/4073_rfc5424-sd-param.xml b/src/changelog/2.25.4/4073_rfc5424-sd-param.xml similarity index 100% rename from src/changelog/.2.x.x/4073_rfc5424-sd-param.xml rename to src/changelog/2.25.4/4073_rfc5424-sd-param.xml diff --git a/src/changelog/.2.x.x/4077_xml-control-characters.xml b/src/changelog/2.25.4/4077_xml-control-characters.xml similarity index 100% rename from src/changelog/.2.x.x/4077_xml-control-characters.xml rename to src/changelog/2.25.4/4077_xml-control-characters.xml diff --git a/src/changelog/.2.x.x/4078_log4j1-xml-control-characters.xml b/src/changelog/2.25.4/4078_log4j1-xml-control-characters.xml similarity index 100% rename from src/changelog/.2.x.x/4078_log4j1-xml-control-characters.xml rename to src/changelog/2.25.4/4078_log4j1-xml-control-characters.xml diff --git a/src/changelog/.2.x.x/4079_map-message-control-characters.xml b/src/changelog/2.25.4/4079_map-message-control-characters.xml similarity index 100% rename from src/changelog/.2.x.x/4079_map-message-control-characters.xml rename to src/changelog/2.25.4/4079_map-message-control-characters.xml diff --git a/src/changelog/.2.x.x/4080_jtl-nan.xml b/src/changelog/2.25.4/4080_jtl-nan.xml similarity index 100% rename from src/changelog/.2.x.x/4080_jtl-nan.xml rename to src/changelog/2.25.4/4080_jtl-nan.xml
