Skip to content

Commit 745d096

Browse files
vyvy
authored
Merge changes from 2.25.2 release (#3936)
1 parent 9b9a0d4 commit 745d096

14 files changed

+169
-14
lines changed

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,9 @@
309309
<!-- project version -->
310310
<revision>2.26.0-SNAPSHOT</revision>
311311
<!-- Versions used on the site: no snapshots! -->
312-
<site-log4j-api.version>2.25.1</site-log4j-api.version>
313-
<site-log4j-core.version>2.25.1</site-log4j-core.version>
314-
<site-log4j-layout-template-json.version>2.25.1</site-log4j-layout-template-json.version>
312+
<site-log4j-api.version>2.25.2</site-log4j-api.version>
313+
<site-log4j-core.version>2.25.2</site-log4j-core.version>
314+
<site-log4j-layout-template-json.version>2.25.2</site-log4j-layout-template-json.version>
315315

316316
<!-- =================
317317
Common properties
@@ -325,7 +325,7 @@
325325
2. This value is employed in various places while creating the distribution
326326
To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
327327
Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
328-
<project.build.outputTimestamp>2025-07-05T19:48:56Z</project.build.outputTimestamp>
328+
<project.build.outputTimestamp>2025-09-18T18:02:17Z</project.build.outputTimestamp>
329329

330330
<!-- ========================
331331
Site-specific properties

‎src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="updated">
6-
<issue id="3708" link="https://github.com/apache/logging-log4j2/pull/3708"/>
7-
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.19.0`</description>
6+
<issue id="3847" link="https://github.com/apache/logging-log4j2/pull/3847"/>
7+
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version ``</description>
88
</entry>

‎src/changelog/2.25.2/.release-notes.adoc.ftl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
////
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
https://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
////
17+
18+
[${'#release-notes-' + release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
19+
== ${release.version}
20+
21+
<#if release.date?has_content>Release date:: ${release.date}</#if>
22+
23+
This patch release addresses certain minor issues detailed in the changelog.
24+
25+
<#include "../.changelog.adoc.ftl">

‎src/changelog/2.25.2/.release.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to you under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<release xmlns="https://logging.apache.org/xml/ns"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
21+
date="2025-09-18" version="2.25.2"/>

‎src/changelog/2.25.2/3819_logback-builder-reuse.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3819" link="https://github.com/apache/logging-log4j2/issues/3819"/>
9+
<issue id="3824" link="https://github.com/apache/logging-log4j2/pull/3824"/>
10+
<description format="asciidoc">
11+
Fix potential memory leak involving `LogBuilder` in Log4j API to Logback bridge
12+
</description>
13+
</entry>

‎src/changelog/2.25.2/3828_fix_log_placeholder_mismatch.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3828" link="https://github.com/apache/logging-log4j2/issues/3828"/>
9+
<issue id="3831" link="https://github.com/apache/logging-log4j2/pull/3831"/>
10+
<description format="asciidoc">
11+
Prevent unnecessary warnings in `AbstractDriverManagerConnectionSource`
12+
</description>
13+
</entry>

‎src/changelog/2.25.2/3835-default-layout.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3835" link="https://github.com/apache/logging-log4j2/issues/3835"/>
9+
<issue id="3851" link="https://github.com/apache/logging-log4j2/pull/3851"/>
10+
<description format="asciidoc">
11+
Fix missing newlines in default logging configuration for `log4j-core`
12+
</description>
13+
</entry>

‎src/changelog/2.25.2/3852-default-target.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3852" link="https://github.com/apache/logging-log4j2/pull/3852"/>
9+
<description format="asciidoc">
10+
Fix missing default `Target` value in Console Appender
11+
</description>
12+
</entry>

‎src/changelog/2.25.2/3872_fix_RollingFileManager_initialTime.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3068" link="https://github.com/apache/logging-log4j2/issues/3068"/>
9+
<issue id="3872" link="https://github.com/apache/logging-log4j2/pull/3872"/>
10+
<description format="asciidoc">
11+
Discard the sub-second part while obtaining the initial time (i.e., creation time) of a file in `RollingFileManager`
12+
</description>
13+
</entry>

0 commit comments

Comments
 (0)