This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-site-pro in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit db8f1f2c63589d51759aa177ee96d5ae7e1a3e85 Merge: c40e8ab35a 6923bd90cb Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Sep 22 09:27:59 2025 +0200 Merge tag `rel/2.25.2` into `2.x-site-pro` .../log4j/core/appender/DefaultLayoutTest.java | 50 ++++++++++ .../appender/rolling/RollingFileManagerTest.java | 16 ++++ .../log4j/core/pattern/PatternParserTest.java | 89 ++++++++++++++++- .../pattern/RootThrowablePatternConverterTest.java | 4 +- .../pattern/ThrowablePatternConverterTest.java | 6 +- .../InstantPatternDynamicFormatterTest.java | 49 +++++++++- .../log4j/core/appender/ConsoleAppender.java | 2 +- .../AbstractDriverManagerConnectionSource.java | 2 +- .../core/appender/rolling/RollingFileManager.java | 21 ++-- .../logging/log4j/core/config/DefaultLayout.java | 13 +-- .../core/pattern/AbstractStyleNameConverter.java | 7 ++ .../core/pattern/EncodingPatternConverter.java | 7 +- .../pattern/EqualsBaseReplacementConverter.java | 7 ++ .../log4j/core/pattern/HighlightConverter.java | 9 +- .../core/pattern/LogEventPatternConverter.java | 11 ++- .../log4j/core/pattern/MaxLengthConverter.java | 7 ++ .../logging/log4j/core/pattern/PatternParser.java | 21 +++- .../core/pattern/RegexReplacementConverter.java | 7 ++ .../logging/log4j/core/pattern/StyleConverter.java | 9 +- .../core/pattern/ThrowableStackTraceRenderer.java | 10 -- .../VariablesNotEmptyReplacementConverter.java | 10 +- .../instant/InstantPatternDynamicFormatter.java | 106 +++++++++++++++------ log4j-parent/pom.xml | 2 +- .../logging/log4j/taglib/CatchingTagTest.java | 7 +- .../apache/logging/log4j/taglib/EnterTagTest.java | 4 +- .../apache/logging/log4j/taglib/ExitTagTest.java | 6 +- .../log4j/taglib/LoggingMessageTagSupportTest.java | 46 +++++---- log4j-taglib/src/test/resources/log4j-test1.xml | 2 +- log4j-to-slf4j/pom.xml | 39 ++++++++ .../java/org/apache/logging/slf4j/SLF4JLogger.java | 16 ++-- .../{LoggerTest.java => SLF4JLoggerTest.java} | 43 ++++++++- .../slf4j/{LoggerTest.xml => SLF4JLoggerTest.xml} | 0 pom.xml | 12 +-- src/changelog/2.23.0/.release-notes.adoc.ftl | 10 +- src/changelog/2.23.0/revamp_StatusLogger.xml | 8 ++ .../{2.23.0 => 2.25.2}/.release-notes.adoc.ftl | 6 +- .../changelog/2.25.2/.release.xml | 16 +--- .../2.25.2/3819_logback-builder-reuse.xml | 13 +++ .../2.25.2/3828_fix_log_placeholder_mismatch.xml | 13 +++ src/changelog/2.25.2/3835-default-layout.xml | 13 +++ src/changelog/2.25.2/3852-default-target.xml | 12 +++ .../3872_fix_RollingFileManager_initialTime.xml | 13 +++ .../2.25.2/3873_throwable_converter_new_line.xml | 13 +++ src/changelog/2.25.2/3905_fix_error_prone_dep.xml | 15 +++ src/changelog/2.25.2/3920-nested-throwables.xml | 12 +++ src/changelog/2.25.2/3930_date-converter.xml | 13 +++ .../modules/ROOT/pages/manual/pattern-layout.adoc | 12 ++- 47 files changed, 660 insertions(+), 149 deletions(-)
