This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch 2.x-site-pro in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5aabe1bd0f705b004a44887a099b61458fe8ec2b Merge: 672eaf56ea bdd102466d Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Mar 28 11:51:03 2026 +0100 Merge branch '2.25.x' into 2.x-site-pro # Conflicts: # .asf.yaml .github/ISSUE_TEMPLATE/feature_request.md | 3 - .github/dependabot.yaml | 90 ++---- .github/pull_request_template.md | 40 +-- .github/workflows/build.yaml | 2 +- .github/workflows/merge-dependabot.yaml | 52 ---- .../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 +- .../org/apache/log4j/helpers/FileWatchdog.java | 2 +- .../org/apache/log4j/helpers/PatternParser.java | 4 +- .../test/java/org/apache/log4j/CategoryTest.java | 2 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 2 +- .../log4j/layout/Log4j1SyslogLayoutTest.java | 2 +- .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 42 ++- .../logging/log4j/message/MapMessageTest.java | 23 +- .../log4j/message/ParameterFormatterTest.java | 13 + .../logging/log4j/util/StringBuildersTest.java | 41 ++- .../apache/logging/log4j/message/MapMessage.java | 10 +- .../logging/log4j/message/ParameterFormatter.java | 8 +- .../apache/logging/log4j/util/StringBuilders.java | 55 +++- log4j-cassandra/pom.xml | 4 +- log4j-core-test/pom.xml | 17 + .../log4j/core/EventParameterMemoryLeakTest.java | 7 +- .../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 +- .../log4j/core/appender/LineReadingTcpServer.java | 18 +- .../core/appender/OutputStreamAppenderTest.java | 8 +- .../core/appender/ReconfigureAppenderTest.java | 18 +- .../core/appender/SyslogAppenderTestBase.java | 29 +- .../log4j/core/appender/TlsSocketAppenderTest.java | 346 +++++++++++++++++++++ .../log4j/core/appender/X509Certificates.java | 193 ++++++++++++ .../core/appender/XmlCompleteFileAppenderTest.java | 6 +- .../appender/rolling/CronTriggeringPolicyTest.java | 16 +- .../rolling/OnStartupTriggeringPolicyTest.java | 10 +- ...RollingAppenderDeleteAccumulatedCount1Test.java | 44 ++- .../rolling/RollingAppenderDirectCronTest.java | 21 +- ...llingAppenderDirectWriteWithHtmlLayoutTest.java | 10 +- .../appender/rolling/RollingAppenderSizeTest.java | 8 +- .../rolling/RollingFileAppenderAccessTest.java | 6 +- .../rolling/RollingFileAppenderLayoutTest.java | 8 +- .../appender/rolling/RollingFileManagerTest.java | 8 +- .../RollingRandomAccessFileManagerTest.java | 73 ++++- .../async/AbstractAsyncThreadContextTestBase.java | 8 +- .../log4j/core/async/AsyncLoggerConfigTest.java | 12 +- .../async/AsyncWaitStrategyFactoryConfigTest.java | 4 +- .../core/config/AbstractConfigurationTest.java | 25 ++ .../core/config/ConfigurationFactoryTest.java | 57 ++++ .../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 +++++ .../config/builder/CustomConfigurationFactory.java | 2 +- .../processor/PluginProcessorPublicSetterTest.java | 72 ++++- .../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/layout/Rfc5424LayoutTest.java | 202 +++++++++++- .../log4j/core/layout/XmlLayoutJUnit5Test.java | 111 +++++++ .../lookup/MainInputArgumentsJmxLookupTest.java | 52 ---- .../log4j/core/net/ssl/SslConfigurationTest.java | 21 ++ .../core/pattern/DatePatternConverterTestBase.java | 26 +- .../core/pattern/NamedInstantPatternTest.java | 59 ++++ .../pattern/ThrowablePatternConverterTest.java | 144 ++++++++- .../log4j/core/script/AbstractScriptTest.java | 71 +++++ .../logging/log4j/core/util/TransformTest.java | 90 ++++++ .../resources/TlsSocketAppenderTest/log4j2.xml | 42 +++ .../test/resources/log4j2-script-order-test.xml | 31 ++ log4j-core/pom.xml | 7 +- .../log4j/core/appender/AbstractAppender.java | 4 +- .../log4j/core/appender/AbstractFileAppender.java | 108 +++++++ .../log4j/core/appender/AbstractManager.java | 1 + .../logging/log4j/core/appender/AppenderSet.java | 28 +- .../logging/log4j/core/appender/FileAppender.java | 124 +++++++- .../logging/log4j/core/appender/FileManager.java | 162 +++------- .../core/appender/MemoryMappedFileAppender.java | 2 +- .../core/appender/MemoryMappedFileManager.java | 85 ++--- .../core/appender/RandomAccessFileAppender.java | 6 +- .../core/appender/RandomAccessFileManager.java | 120 ++----- .../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 ++++-- .../core/appender/rolling/RollingFileManager.java | 227 ++++---------- .../rolling/RollingRandomAccessFileManager.java | 251 +++++---------- .../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 +-- .../log4j/core/config/ConfigurationFactory.java | 81 +++++ .../logging/log4j/core/config/LoggerConfig.java | 234 ++++++++++++-- .../logging/log4j/core/config/ScriptsPlugin.java | 20 +- .../log4j/core/config/arbiters/ScriptArbiter.java | 6 +- .../log4j/core/config/json/package-info.java | 2 +- .../logging/log4j/core/config/package-info.java | 2 +- .../config/plugins/processor/PluginProcessor.java | 93 +++++- .../log4j/core/config/properties/package-info.java | 2 +- .../log4j/core/config/xml/package-info.java | 2 +- .../log4j/core/config/yaml/package-info.java | 2 +- .../logging/log4j/core/filter/ScriptFilter.java | 14 +- .../log4j/core/jackson/Log4jXmlObjectMapper.java | 175 ++++++++++- .../logging/log4j/core/layout/GelfLayout.java | 12 +- .../logging/log4j/core/layout/HtmlLayout.java | 84 ++++- .../logging/log4j/core/layout/PatternLayout.java | 141 +++++++-- .../logging/log4j/core/layout/Rfc5424Layout.java | 251 ++++++++++++++- .../log4j/core/layout/ScriptPatternSelector.java | 6 +- .../logging/log4j/core/layout/package-info.java | 2 +- .../logging/log4j/core/lookup/Interpolator.java | 7 - .../lookup/JmxRuntimeInputArgumentsLookup.java | 71 ----- .../logging/log4j/core/lookup/package-info.java | 4 +- .../log4j/core/net/ssl/SslConfiguration.java | 10 +- .../log4j/core/pattern/DatePatternConverter.java | 94 +----- .../log4j/core/pattern/NamedInstantPattern.java | 161 ++++++++++ .../ThrowableExtendedStackTraceRenderer.java | 2 +- .../ThrowableInvertedStackTraceRenderer.java | 6 +- .../core/pattern/ThrowableStackTraceRenderer.java | 55 +++- .../logging/log4j/core/pattern/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 +- .../org/apache/logging/log4j/core/util/Loader.java | 18 +- .../apache/logging/log4j/core/util/Transform.java | 137 +++++--- .../log4j/core/util/datetime/FastDatePrinter.java | 2 +- log4j-layout-template-json-test/pom.xml | 9 +- .../layout/template/json/util/JsonWriterTest.java | 18 ++ .../template/json/resolver/PatternResolver.java | 8 +- .../layout/template/json/util/JsonWriter.java | 14 +- log4j-mongodb/pom.xml | 2 +- log4j-parent/pom.xml | 15 +- .../log4j/perf/jmh/ThreadContextBenchmark2.java | 8 +- .../InstantPatternFormatterImpactBenchmark.java | 6 +- .../logging/log4j/perf/nogc/ClassicLogger.java | 4 +- pom.xml | 12 +- .../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 + .../.2.x.x/3819_logback-builder-reuse.xml | 12 + .../.2.x.x/3828_fix_log_placeholder_mismatch.xml | 12 + src/changelog/.2.x.x/3835-default-layout.xml | 12 + src/changelog/.2.x.x/3852-default-target.xml | 12 + src/changelog/.2.x.x/3871_graalvm_binary_name.xml | 13 + .../3872_fix_RollingFileManager_initialTime.xml | 13 + .../.2.x.x/3873_throwable_converter_new_line.xml | 13 + .../.2.x.x/3874_remove_jvmrunargs_lookup.xml | 13 + src/changelog/.2.x.x/3905_fix_error_prone_dep.xml | 14 + src/changelog/.2.x.x/3920-nested-throwables.xml | 12 + src/changelog/.2.x.x/3930_date-converter.xml | 12 + ...35_optimize_DefaultThreadContextMap_getCopy.xml | 13 + .../3947_fix_SslSocketManager_null_keystore.xml | 13 + .../.2.x.x/3968_refactor_manager_factories.xml | 12 + ...3975_prevent_warning_for_last_null_argument.xml | 14 + .../.2.x.x/3985_remove_spotbugs_annotations.xml | 13 + .../4002_fix_SslSocketAppender_verifyHostName.xml | 12 + .../.2.x.x/4033_fix_custom_throwable_to_sting.xml | 13 + ..._debug_logs_for_successful_resource_loading.xml | 13 + ..._getConfiguration_method_for_mulitiple_URIs.xml | 13 + .../exported_named_patterns_into_public_enum.xml | 8 + ..._RollingRandomAccessFileManager_writeHeader.xml | 12 + .../plugin_processor_min_allowed_message_kind.xml | 14 + ...pdate_co_elastic_clients_elasticsearch_java.xml | 8 + .../update_org_apache_commons_commons_lang3.xml | 8 + ...gradlex_gradle_module_metadata_maven_plugin.xml | 8 + .../.2.x.x/update_org_junit_junit_bom.xml | 8 + src/changelog/.2.x.x/update_org_mongodb_bson.xml | 8 + .../update_org_xerial_snappy_snappy_java.xml | 8 + .../3929_ThrowableStackTraceRenderer-npe.xml | 13 + ...raceRenderer_ArrayIndexOutOfBoundsException.xml | 13 + src/changelog/2.25.4/.release-notes.adoc.ftl | 32 ++ src/changelog/2.25.4/.release.xml | 21 ++ ...3975_prevent_warning_for_last_null_argument.xml | 13 + src/changelog/2.25.4/4022_rfc5424-param-names.xml | 13 + .../2.25.4/4033_fix_custom_throwable_to_sting.xml | 13 + src/changelog/2.25.4/4060_resource-loading.xml | 13 + src/changelog/2.25.4/4061_ssl-connection.xml | 14 + src/changelog/2.25.4/4073_rfc5424-sd-param.xml | 12 + .../2.25.4/4077_xml-control-characters.xml | 12 + .../2.25.4/4078_log4j1-xml-control-characters.xml | 12 + .../2.25.4/4079_map-message-control-characters.xml | 12 + src/changelog/2.25.4/4080_jtl-nan.xml | 12 + .../antora/modules/ROOT/pages/manual/plugins.adoc | 32 ++ .../properties-async-logger-config.adoc | 2 +- 207 files changed, 5537 insertions(+), 1721 deletions(-)
