This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch post-release/2.25.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b000dd09b95eefe61311a592596fed408c2ef0f0 Merge: bda63362cf 8ec5703670 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Jul 11 20:23:23 2025 +0200 Merge release `2.25.1` into `2.x` branch This change merges the changes of the `release/2.25.1` branch back into the development branch. .../appender/DailyRollingFileAppenderBuilder.java | 16 +- .../EnhancedRollingFileAppenderBuilder.java | 12 +- .../builders/appender/FileAppenderBuilder.java | 4 +- .../appender/RollingFileAppenderBuilder.java | 16 +- .../log4j/builders/layout/HtmlLayoutBuilder.java | 4 +- .../builders/layout/PatternLayoutBuilder.java | 4 +- .../log4j/builders/layout/SimpleLayoutBuilder.java | 8 +- .../log4j/builders/layout/TTCCLayoutBuilder.java | 4 +- .../test/java/org/apache/log4j/CategoryTest.java | 2 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 2 +- .../log4j/layout/Log4j1SyslogLayoutTest.java | 2 +- .../log4j/core/appender/ConsoleAppenderTest.java | 2 +- .../core/appender/FileAppenderBuilderTest.java | 4 +- .../core/appender/FileAppenderPermissionsTest.java | 30 +-- .../log4j/core/appender/FileAppenderTest.java | 32 +-- .../log4j/core/appender/InMemoryAppenderTest.java | 4 +- .../core/appender/OutputStreamAppenderTest.java | 8 +- .../core/appender/ReconfigureAppenderTest.java | 18 +- .../appender/rolling/CronTriggeringPolicyTest.java | 16 +- .../rolling/OnStartupTriggeringPolicyTest.java | 10 +- ...llingAppenderDirectWriteWithHtmlLayoutTest.java | 10 +- .../appender/rolling/RollingAppenderSizeTest.java | 8 +- .../rolling/RollingFileAppenderAccessTest.java | 6 +- .../rolling/RollingFileAppenderLayoutTest.java | 8 +- .../appender/rolling/RollingFileManagerTest.java | 8 +- .../RollingRandomAccessFileManagerTest.java | 10 +- .../log4j/core/async/AsyncLoggerConfigTest.java | 12 +- .../async/AsyncWaitStrategyFactoryConfigTest.java | 4 +- .../core/config/AbstractConfigurationTest.java | 25 +++ .../log4j/core/config/CustomConfigurationTest.java | 20 +- .../log4j/core/config/JiraLog4j2_2134Test.java | 8 +- .../log4j/core/config/LoggerConfigTest.java | 38 ++-- .../log4j/core/config/ScriptsPluginTest.java | 78 +++++++ .../AbstractPluginWithGenericBuilder.java | 2 +- .../PluginWithGenericSubclassFoo1Builder.java | 2 +- .../plugins/validation/ValidatingPlugin.java | 2 +- .../ValidatingPluginWithGenericBuilder.java | 2 +- .../ValidatingPluginWithTypedBuilder.java | 2 +- .../logging/log4j/core/layout/HtmlLayoutTest.java | 4 +- .../PatternLayoutDefaultExceptionHandlerTest.java | 6 +- .../log4j/core/layout/PatternLayoutTest.java | 130 ++++++------ .../log4j/core/layout/PatternSelectorTest.java | 8 +- .../log4j/core/script/AbstractScriptTest.java | 71 +++++++ .../test/resources/log4j2-script-order-test.xml | 31 +++ .../log4j/core/appender/AbstractAppender.java | 4 +- .../log4j/core/appender/AbstractFileAppender.java | 108 ++++++++++ .../logging/log4j/core/appender/AppenderSet.java | 28 ++- .../logging/log4j/core/appender/FileAppender.java | 124 ++++++++++- .../core/appender/MemoryMappedFileAppender.java | 2 +- .../core/appender/RandomAccessFileAppender.java | 6 +- .../log4j/core/appender/RollingFileAppender.java | 176 ++++++++++++++-- .../appender/RollingRandomAccessFileAppender.java | 150 +++++++++++-- .../core/appender/ScriptAppenderSelector.java | 60 +++++- .../log4j/core/appender/db/ColumnMapping.java | 6 +- .../log4j/core/appender/db/jdbc/ColumnConfig.java | 6 +- .../logging/log4j/core/appender/package-info.java | 2 +- .../appender/rolling/DefaultRolloverStrategy.java | 124 +++++++++-- .../rolling/DirectWriteRolloverStrategy.java | 96 +++++++-- .../rolling/TimeBasedTriggeringPolicy.java | 40 +++- .../rolling/action/PosixViewAttributeAction.java | 118 ++++++++++- .../appender/rolling/action/ScriptCondition.java | 6 +- .../core/appender/rolling/action/package-info.java | 2 +- .../log4j/core/appender/rolling/package-info.java | 2 +- .../log4j/core/appender/routing/Routes.java | 58 ++++- .../core/appender/routing/RoutingAppender.java | 57 ++++- .../log4j/core/appender/routing/package-info.java | 2 +- .../core/async/AsyncWaitStrategyFactoryConfig.java | 13 ++ .../logging/log4j/core/async/package-info.java | 2 +- .../log4j/core/config/AbstractConfiguration.java | 45 ++-- .../logging/log4j/core/config/LoggerConfig.java | 234 ++++++++++++++++++--- .../logging/log4j/core/config/ScriptsPlugin.java | 20 +- .../log4j/core/config/arbiters/ScriptArbiter.java | 6 +- .../logging/log4j/core/config/package-info.java | 2 +- .../config/plugins/processor/PluginProcessor.java | 5 +- .../logging/log4j/core/filter/ScriptFilter.java | 14 +- .../logging/log4j/core/layout/GelfLayout.java | 12 +- .../logging/log4j/core/layout/HtmlLayout.java | 84 +++++++- .../logging/log4j/core/layout/PatternLayout.java | 141 +++++++++++-- .../log4j/core/layout/ScriptPatternSelector.java | 6 +- .../logging/log4j/core/layout/package-info.java | 2 +- .../logging/log4j/core/script/AbstractScript.java | 10 +- .../logging/log4j/core/script/ScriptFile.java | 4 +- .../logging/log4j/core/script/ScriptManager.java | 28 +-- .../logging/log4j/core/script/ScriptRef.java | 6 +- .../logging/log4j/core/script/package-info.java | 2 +- .../template/json/resolver/PatternResolver.java | 8 +- log4j-parent/pom.xml | 2 +- .../log4j/perf/jmh/ThreadContextBenchmark2.java | 8 +- .../InstantPatternFormatterImpactBenchmark.java | 6 +- .../logging/log4j/perf/nogc/ClassicLogger.java | 4 +- pom.xml | 2 +- .../3176_validate_scripts_in_ScriptsPlugin.xml | 13 ++ .../.2.x.x/3336_script_resolution_order_fix.xml | 12 ++ src/changelog/.2.x.x/3750_deprecate_withers.xml | 12 ++ 94 files changed, 2069 insertions(+), 504 deletions(-) diff --cc pom.xml index 31f62e7927,f10bb2f171..c6e5aa6ab9 --- a/pom.xml +++ b/pom.xml @@@ -307,11 -307,11 +307,11 @@@ <properties> <!-- project version --> - <revision>2.25.1</revision> + <revision>2.26.0-SNAPSHOT</revision> <!-- Versions used on the site: no snapshots! --> - <site-log4j-api.version>2.25.0</site-log4j-api.version> - <site-log4j-core.version>2.25.0</site-log4j-core.version> - <site-log4j-layout-template-json.version>2.25.0</site-log4j-layout-template-json.version> + <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> <!-- ================= Common properties
