Merge changes from `2.25.2` release (#3936)
diff --git a/pom.xml b/pom.xml
index df51f7d..b3c1385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,9 +309,9 @@
<!-- project version -->
<revision>2.26.0-SNAPSHOT</revision>
<!-- Versions used on the site: no snapshots! -->
- <site-log4j-api.version>2.25.1</site-log4j-api.version>
- <site-log4j-core.version>2.25.1</site-log4j-core.version>
- <site-log4j-layout-template-json.version>2.25.1</site-log4j-layout-template-json.version>
+ <site-log4j-api.version>2.25.2</site-log4j-api.version>
+ <site-log4j-core.version>2.25.2</site-log4j-core.version>
+ <site-log4j-layout-template-json.version>2.25.2</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>2025-07-05T19:48:56Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2025-09-18T18:02:17Z</project.build.outputTimestamp>
<!-- ========================
Site-specific properties
diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
deleted file mode 100644
index 08757e7..0000000
--- a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.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="3847" link="https://github.com/apache/logging-log4j2/pull/3847"/>
- <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version ``</description>
-</entry>
diff --git a/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml
index 73d0af7..08757e7 100644
--- a/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml
+++ b/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml
@@ -3,6 +3,6 @@
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="3708" link="https://github.com/apache/logging-log4j2/pull/3708"/>
- <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.19.0`</description>
+ <issue id="3847" link="https://github.com/apache/logging-log4j2/pull/3847"/>
+ <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version ``</description>
</entry>
diff --git a/src/changelog/2.25.2/.release-notes.adoc.ftl b/src/changelog/2.25.2/.release-notes.adoc.ftl
new file mode 100644
index 0000000..4f89c9f
--- /dev/null
+++ b/src/changelog/2.25.2/.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 addresses certain minor issues detailed in the changelog.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.25.2/.release.xml b/src/changelog/2.25.2/.release.xml
new file mode 100644
index 0000000..0897f9a
--- /dev/null
+++ b/src/changelog/2.25.2/.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="2025-09-18" version="2.25.2"/>
diff --git a/src/changelog/2.25.2/3819_logback-builder-reuse.xml b/src/changelog/2.25.2/3819_logback-builder-reuse.xml
new file mode 100644
index 0000000..100d8b9
--- /dev/null
+++ b/src/changelog/2.25.2/3819_logback-builder-reuse.xml
@@ -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="3819" link="https://github.com/apache/logging-log4j2/issues/3819"/>
+ <issue id="3824" link="https://github.com/apache/logging-log4j2/pull/3824"/>
+ <description format="asciidoc">
+ Fix potential memory leak involving `LogBuilder` in Log4j API to Logback bridge
+ </description>
+</entry>
diff --git a/src/changelog/2.25.2/3828_fix_log_placeholder_mismatch.xml b/src/changelog/2.25.2/3828_fix_log_placeholder_mismatch.xml
new file mode 100644
index 0000000..4d1f7ac
--- /dev/null
+++ b/src/changelog/2.25.2/3828_fix_log_placeholder_mismatch.xml
@@ -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="3828" link="https://github.com/apache/logging-log4j2/issues/3828"/>
+ <issue id="3831" link="https://github.com/apache/logging-log4j2/pull/3831"/>
+ <description format="asciidoc">
+ Prevent unnecessary warnings in `AbstractDriverManagerConnectionSource`
+ </description>
+</entry>
diff --git a/src/changelog/2.25.2/3835-default-layout.xml b/src/changelog/2.25.2/3835-default-layout.xml
new file mode 100644
index 0000000..7f3eb82
--- /dev/null
+++ b/src/changelog/2.25.2/3835-default-layout.xml
@@ -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="3835" link="https://github.com/apache/logging-log4j2/issues/3835"/>
+ <issue id="3851" link="https://github.com/apache/logging-log4j2/pull/3851"/>
+ <description format="asciidoc">
+ Fix missing newlines in default logging configuration for `log4j-core`
+ </description>
+</entry>
diff --git a/src/changelog/2.25.2/3852-default-target.xml b/src/changelog/2.25.2/3852-default-target.xml
new file mode 100644
index 0000000..a7eaace
--- /dev/null
+++ b/src/changelog/2.25.2/3852-default-target.xml
@@ -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="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.25.2/3872_fix_RollingFileManager_initialTime.xml b/src/changelog/2.25.2/3872_fix_RollingFileManager_initialTime.xml
new file mode 100644
index 0000000..ba6fbd9
--- /dev/null
+++ b/src/changelog/2.25.2/3872_fix_RollingFileManager_initialTime.xml
@@ -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="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.25.2/3873_throwable_converter_new_line.xml b/src/changelog/2.25.2/3873_throwable_converter_new_line.xml
new file mode 100644
index 0000000..3001126
--- /dev/null
+++ b/src/changelog/2.25.2/3873_throwable_converter_new_line.xml
@@ -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="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.25.2/3905_fix_error_prone_dep.xml b/src/changelog/2.25.2/3905_fix_error_prone_dep.xml
new file mode 100644
index 0000000..357c225
--- /dev/null
+++ b/src/changelog/2.25.2/3905_fix_error_prone_dep.xml
@@ -0,0 +1,15 @@
+<?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="3822" link="https://github.com/apache/logging-log4j2/issues/3822"/>
+ <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.25.2/3920-nested-throwables.xml b/src/changelog/2.25.2/3920-nested-throwables.xml
new file mode 100644
index 0000000..b2ef8b2
--- /dev/null
+++ b/src/changelog/2.25.2/3920-nested-throwables.xml
@@ -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="3920" link="https://github.com/apache/logging-log4j2/pull/3920"/>
+ <description format="asciidoc">
+ Fix detection of `Throwable` converters inside nested Pattern Layout patterns when applying `alwaysWriteExceptions`
+ </description>
+</entry>
diff --git a/src/changelog/2.25.2/3930_date-converter.xml b/src/changelog/2.25.2/3930_date-converter.xml
new file mode 100644
index 0000000..2fb8f4a
--- /dev/null
+++ b/src/changelog/2.25.2/3930_date-converter.xml
@@ -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="3930" link="https://github.com/apache/logging-log4j2/issues/3930"/>
+ <issue id="3932" link="https://github.com/apache/logging-log4j2/pull/3932"/>
+ <description format="asciidoc">
+ Fix parsing and merging of literals in `InstantPatternDynamicFormatter`
+ </description>
+</entry>
