This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch 2.25.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3817c679a76e7ef23f5de9eb5727a1d2c60f0484 Merge: 0628e53b25 1fdfe142d5 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Mar 28 11:10:15 2026 +0100 Merge branch '2.x' into 2.25.x # Conflicts: # log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java # log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/async/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java # log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java # log4j-core/src/main/java/org/apache/logging/log4j/core/script/package-info.java # log4j-parent/pom.xml # pom.xml # src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml # src/changelog/.2.x.x/update_com_github_jnr_jnr_ffi.xml # src/changelog/.2.x.x/update_fast_xml_parser.xml # src/changelog/.2.x.x/update_org_apache_commons_commons_lang3.xml # src/changelog/.2.x.x/update_org_gradlex_gradle_module_metadata_maven_plugin.xml # src/changelog/.2.x.x/update_org_junit_junit_bom.xml # src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml # src/changelog/2.23.0/revamp_StatusLogger.xml # src/changelog/2.25.0/update_org_mongodb_bson.xml # src/changelog/2.25.1/3754_fix-gradle-build.xml # src/site/antora/modules/ROOT/pages/manual/plugins.adoc .asf.yaml | 4 - .github/ISSUE_TEMPLATE/feature_request.md | 3 - .github/dependabot.yaml | 90 +++----- .github/pull_request_template.md | 40 +--- .github/workflows/build.yaml | 1 - .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 +- log4j-cassandra/pom.xml | 4 +- .../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 +- .../core/appender/SyslogAppenderTestBase.java | 29 ++- .../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 +- .../lookup/MainInputArgumentsJmxLookupTest.java | 52 ----- .../core/pattern/DatePatternConverterTestBase.java | 26 +-- .../core/pattern/NamedInstantPatternTest.java | 59 +++++ .../pattern/ThrowablePatternConverterTest.java | 107 +++++++++ .../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 +++++++++ .../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 | 84 +++---- .../core/appender/RandomAccessFileAppender.java | 6 +- .../core/appender/RandomAccessFileManager.java | 119 +++------- .../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 +- .../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 +- .../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 ++ .../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 | 86 +++++-- .../log4j/core/config/properties/package-info.java | 2 +- .../log4j/core/config/yaml/package-info.java | 2 +- .../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/lookup/Interpolator.java | 7 - .../lookup/JmxRuntimeInputArgumentsLookup.java | 71 ------ .../log4j/core/pattern/DatePatternConverter.java | 94 ++------ .../log4j/core/pattern/NamedInstantPattern.java | 161 +++++++++++++ .../ThrowableExtendedStackTraceRenderer.java | 2 +- .../ThrowableInvertedStackTraceRenderer.java | 6 +- .../core/pattern/ThrowableStackTraceRenderer.java | 48 +++- .../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 +- .../log4j/core/util/datetime/FastDatePrinter.java | 2 +- log4j-layout-template-json-test/pom.xml | 9 +- .../template/json/resolver/PatternResolver.java | 8 +- log4j-mongodb/pom.xml | 2 +- log4j-parent/pom.xml | 8 +- .../log4j/perf/jmh/ThreadContextBenchmark2.java | 8 +- .../InstantPatternFormatterImpactBenchmark.java | 6 +- .../logging/log4j/perf/nogc/ClassicLogger.java | 4 +- pom.xml | 4 +- .../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 ++ ...date_co_elastic_clients_elasticsearch_java.xml} | 4 +- .../update_org_apache_commons_commons_lang3.xml} | 4 +- ...radlex_gradle_module_metadata_maven_plugin.xml} | 4 +- .../update_org_junit_junit_bom.xml} | 4 +- .../update_org_xerial_snappy_snappy_java.xml} | 4 +- .../update_com_fasterxml_jackson_jackson_bom.xml | 4 +- src/changelog/2.25.0/update_org_mongodb_bson.xml | 4 +- .../3929_ThrowableStackTraceRenderer-npe.xml | 13 ++ ...raceRenderer_ArrayIndexOutOfBoundsException.xml | 13 ++ .../antora/modules/ROOT/pages/manual/filters.adoc | 21 +- .../antora/modules/ROOT/pages/manual/plugins.adoc | 32 +++ 165 files changed, 3516 insertions(+), 1612 deletions(-) diff --cc pom.xml index 92bf34713c,c4d4af8b9a..1b4e5c92d3 --- a/pom.xml +++ b/pom.xml @@@ -307,11 -307,11 +307,11 @@@ <properties> <!-- project version --> - <revision>2.25.4</revision> + <revision>2.26.0-SNAPSHOT</revision> <!-- Versions used on the site: no snapshots! --> - <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> + <site-log4j-api.version>2.25.4</site-log4j-api.version> + <site-log4j-core.version>2.25.4</site-log4j-core.version> + <site-log4j-layout-template-json.version>2.25.4</site-log4j-layout-template-json.version> <!-- ================= Common properties diff --cc src/changelog/2.25.0/update_org_mongodb_bson.xml index 73b69e220e,73b69e220e..88fdfc6647 --- a/src/changelog/2.25.0/update_org_mongodb_bson.xml +++ b/src/changelog/2.25.0/update_org_mongodb_bson.xml @@@ -3,6 -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="3722" link="https://github.com/apache/logging-log4j2/pull/3722"/> -- <description format="asciidoc">Update `org.mongodb:bson` to version `5.5.1`</description> ++ <issue id="3961" link="https://github.com/apache/logging-log4j2/pull/3961"/> ++ <description format="asciidoc">Update `org.mongodb:bson` to version `5.6.1`</description> </entry>
