Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a487a5d
Tidy up changelog
vy May 2, 2026
0e019f2
Move changelog entries
vy May 2, 2026
def55fc
Add `.release.xml` and `.release-notes.adoc.ftl`
vy May 2, 2026
23321de
Remove changelog entries for already released changes
vy May 2, 2026
96486eb
Merge remote-tracking branch 'origin/2.x' into release/2.26.0
vy May 2, 2026
8b3a799
Set version to `2.26.0`
asf-rm May 2, 2026
39517e0
Fix stack trace rendering for exceptions with identity malfunction (#…
ramanathan1504 Jun 11, 2026
b655e6a
Fix resource leaks in `ConfigurationSource` when loading via URL (#4127)
SebTardif Jun 15, 2026
bd750d5
Fix `DatePatternConverter` locale parsing when timezone is omitted (#…
ramanathan1504 Jun 11, 2026
c123c46
Improve logging for `LinkageError` scenarios involving the LMAX Disru…
ramanathan1504 May 29, 2026
833366f
Fix changelog issue and PR references for Disruptor initialization er…
ramanathan1504 Jun 1, 2026
d3f25ac
Fix `createOnDemand` for Rolling File Appender (#4072)
ramanathan1504 May 21, 2026
8a79525
Fix KafkaAppender reporting error after successful retry (#4125)
SebTardif May 20, 2026
3944353
Fix encoding of `MSGID` and `SD-ID` fields of `StructuredDataMessage`…
vy Jun 5, 2026
69d6641
add patch release/2.26.1 liked commits and moved changelog the releas…
ramanathan1504 Jun 25, 2026
6c2d931
Set version to `2.26.1`
asf-rm Jun 25, 2026
5755541
Update the `project.build.outputTimestamp` property
asf-rm Jun 25, 2026
e320257
Release changelog for version `2.26.1`
asf-rm Jun 25, 2026
0592cff
fix version in `pom.xml`
ramanathan1504 Jun 26, 2026
df1c753
tidy up changelogs
ramanathan1504 Jun 26, 2026
bd8eca1
Fix AsciiDoc typo in `pattern-layout.adoc`
vy Jun 26, 2026
c9332be
Fix handling of non-finite numbers while encoding `MapMessage` to JSO…
vy Jun 29, 2026
efbb638
Update the `project.build.outputTimestamp` property
asf-rm Jun 29, 2026
dd0f9d2
Release changelog for version `2.26.1`
asf-rm Jun 29, 2026
5cbe1dd
Merge tag 'rel/2.26.1' into 2.26.1-to-2.x
ramanathan1504 Jul 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,9 @@
<!-- project version -->
<revision>2.27.0-SNAPSHOT</revision>
<!-- Versions used on the site: no snapshots! -->
<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>
<site-log4j-api.version>2.26.1</site-log4j-api.version>
<site-log4j-core.version>2.26.1</site-log4j-core.version>
<site-log4j-layout-template-json.version>2.26.1</site-log4j-layout-template-json.version>

<!-- =================
Common properties
Expand Down
25 changes: 25 additions & 0 deletions src/changelog/2.26.1/.release-notes.adoc.ftl
Original file line number Diff line number Diff line change
@@ -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.26.0`.

<#include "../.changelog.adoc.ftl">
21 changes: 21 additions & 0 deletions src/changelog/2.26.1/.release.xml
Original file line number Diff line number Diff line change
@@ -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-06-29" version="2.26.1"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?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="2006" link="https://github.com/apache/logging-log4j2/issues/2006"/>
<issue id="4072" link="https://github.com/apache/logging-log4j2/pull/4072"/>
<description format="asciidoc">
Fix the `createOnDemand` behavior of `RollingFileAppender` to correctly defer file and directory creation
until the first log event, while preserving eager creation when disabled.
</description>
</entry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?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="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">
Improve documentation for locale handling in the Pattern Layout date pattern converter
</description>
</entry>

12 changes: 12 additions & 0 deletions src/changelog/2.26.1/fix-MapMessage-JSON-non-finite-number.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?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="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>
</entry>
12 changes: 12 additions & 0 deletions src/changelog/2.26.1/fix-StructuredDataMessage-XML-encoding.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?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="4136" link="https://github.com/apache/logging-log4j2/pull/4136"/>
<description format="asciidoc">
Fix encoding of `MSGID` and `SD-ID` fields of `StructuredDataMessage` to XML
</description>
</entry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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="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">
Fix stack trace rendering for exceptions with identity malfunction (e.g., colliding `equals()` and/or `hashCode()` implementations)
</description>
</entry>
13 changes: 13 additions & 0 deletions src/changelog/2.26.1/fix-log-disruptor-initialization-errors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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="2250" link="https://github.com/apache/logging-log4j2/issues/2250"/>
<issue id="4124" link="https://github.com/apache/logging-log4j2/pull/4124"/>
<description format="asciidoc">
Improve logging for `LinkageError` scenarios involving the LMAX Disruptor library
</description>
</entry>
8 changes: 8 additions & 0 deletions src/changelog/2.26.1/fix_configuration_source_url_leak.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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="fixed">
<issue id="4127" link="https://github.com/apache/logging-log4j2/pull/4127"/>
<description format="asciidoc">Fix resource leaks in `ConfigurationSource` when loading configuration via URL fails</description>
</entry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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="fixed">
<issue id="4125" link="https://github.com/apache/logging-log4j2/pull/4125"/>
<description format="asciidoc">Fix `KafkaAppender` reporting error to error handler even after a successful retry</description>
</entry>
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,7 @@ You can also define custom date formats, see following examples:
|%d{yyyy-mm-dd'T'HH:mm:ss.SSS'Z'}\{UTC}
|2012-11-02T14:34:02.123Z


|%d{dd-MMMM-yyyy}\{UTC}\{de-DE}
|%d\{dd-MMMM-yyyy}\{UTC}\{de-DE}
|02 November 2012 (UTC timezone, German locale)
|===

Expand Down
Loading