This is an automated email from the ASF dual-hosted git repository. ramanathan1504 pushed a commit to branch junit5-iostreams in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f27314b4e84e03d248cce8cad76f62c14ce8db79 Merge: 6a9af6a5d9 33c8236d88 Author: Ramanathan <[email protected]> AuthorDate: Fri Aug 28 20:19:28 2026 +0530 Merge branch '2.x' into junit5-iostreams .asf.yaml | 49 +- ...maven-wrapper.properties => .cherry_picker.toml | 12 +- .../log4j2.properties => .github/FUNDING.yml | 21 +- .github/ISSUE_TEMPLATE/feature_request.md | 3 - .github/dependabot.yaml | 156 ++-- .github/generate-email.sh | 7 +- .github/pull_request_template.md | 7 +- ...odeql-analysis.yaml => analyze-dependabot.yaml} | 31 +- .github/workflows/build.yaml | 57 +- .github/workflows/close-stale.yaml | 2 +- .github/workflows/codeql-analysis.yaml | 14 +- .github/workflows/deploy-site.yaml | 7 +- .github/workflows/merge-dependabot.yaml | 52 -- ...sh-build-scans.yaml => process-dependabot.yaml} | 40 +- .gitignore | 3 +- .gitignore => .logging-parent-bom-activator | 30 +- .mvn/develocity.xml | 30 - .mvn/wrapper/maven-wrapper.properties | 6 +- AGENTS.md | 58 ++ NOTICE.txt | 4 +- README.adoc | 6 + antora-playbook.yaml | 5 + .../org/apache/log4j/DefaultThrowableRenderer.java | 2 +- .../main/java/org/apache/log4j/FileAppender.java | 2 +- .../src/main/java/org/apache/log4j/Hierarchy.java | 7 + .../src/main/java/org/apache/log4j/Level.java | 2 + .../org/apache/log4j/PropertyConfigurator.java | 2 +- .../java/org/apache/log4j/RollingFileAppender.java | 2 +- .../org/apache/log4j/bridge/LogEventAdapter.java | 4 +- .../org/apache/log4j/bridge/LogEventWrapper.java | 19 + .../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 | 4 +- .../org/apache/log4j/helpers/PatternParser.java | 18 +- .../org/apache/log4j/helpers/UtilLoggingLevel.java | 4 + .../org/apache/log4j/helpers/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 19 +- .../org/apache/log4j/jmx/AppenderDynamicMBean.java | 8 + .../org/apache/log4j/jmx/LoggerDynamicMBean.java | 8 +- .../apache/log4j/layout/Log4j1SyslogLayout.java | 11 +- .../org/apache/log4j/layout/Log4j1XmlLayout.java | 2 +- .../main/java/org/apache/log4j/package-info.java | 2 +- .../org/apache/log4j/rewrite/MapRewritePolicy.java | 1 - .../log4j/rewrite/PropertyRewritePolicy.java | 1 - .../java/org/apache/log4j/spi/LoggingEvent.java | 2 +- .../java/org/apache/log4j/xml/DOMConfigurator.java | 2 +- .../org/apache/log4j/xml/XmlConfiguration.java | 18 +- .../java/org/apache/log4j/xml/package-info.java | 2 +- .../test/java/org/apache/log4j/CategoryTest.java | 2 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 2 +- .../apache/log4j/config/XmlConfigurationTest.java | 13 + .../apache/log4j/jmx/AppenderDynamicMBeanTest.java | 83 +++ .../apache/log4j/jmx/LoggerDynamicMBeanTest.java | 102 +++ .../log4j/layout/Log4j1SyslogLayoutTest.java | 2 +- .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 42 +- .../apache/log4j/util/SerializationTestHelper.java | 21 +- .../src/test/resources/log4j1-invalid-appender.xml | 20 +- .../apache/logging/log4j/util/StackLocator.java | 4 - .../logging/log4j/util/java9/StackLocatorTest.java | 2 +- .../logging/log4j/test/SerializableMatchers.java | 23 +- .../org/apache/logging/log4j/test/TestLogger.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../logging/log4j/test/junit/DirectoryCleaner.java | 2 +- .../logging/log4j/test/junit/FileCleaner.java | 2 +- .../logging/log4j/test/junit/SerialUtil.java | 46 +- .../logging/log4j/test/junit/package-info.java | 2 +- .../apache/logging/log4j/test/package-info.java | 2 +- .../log4j/message/FormattedMessageTest.java | 16 +- .../log4j/message/LocalizedMessageTest.java | 7 +- .../logging/log4j/message/MapMessageTest.java | 49 +- .../log4j/message/ObjectArrayMessageTest.java | 13 + .../log4j/message/ParameterFormatterTest.java | 52 +- .../log4j/message/StringFormattedMessageTest.java | 16 +- .../log4j/message/StructuredDataMessageTest.java | 90 +++ .../log4j/spi/DefaultThreadContextMapTest.java | 122 ++++ .../logging/log4j/status/StatusDataTest.java | 52 ++ .../logging/log4j/status/StatusLoggerDateTest.java | 2 +- .../logging/log4j/status/StatusLoggerTest.java | 56 ++ .../logging/log4j/util/PropertiesUtilTest.java | 69 +- .../logging/log4j/util/StringBuildersTest.java | 41 +- .../java/org/apache/logging/log4j/BridgeAware.java | 1 + .../logging/log4j/CloseableThreadContext.java | 3 + .../java/org/apache/logging/log4j/EventLogger.java | 3 +- .../java/org/apache/logging/log4j/LogBuilder.java | 16 +- .../java/org/apache/logging/log4j/LogManager.java | 2 + .../main/java/org/apache/logging/log4j/Logger.java | 154 +++- .../org/apache/logging/log4j/ThreadContext.java | 2 + .../annotation/SuppressFBWarnings.java} | 14 +- .../internal/map/UnmodifiableArrayBackedMap.java | 8 - .../log4j/message/DefaultFlowMessageFactory.java | 3 + .../logging/log4j/message/FlowMessageFactory.java | 6 +- .../logging/log4j/message/FormattedMessage.java | 2 + .../logging/log4j/message/LocalizedMessage.java | 2 + .../apache/logging/log4j/message/MapMessage.java | 69 +- .../log4j/message/MapMessageJsonFormatter.java | 30 +- .../log4j/message/MessageCollectionMessage.java | 1 + .../log4j/message/MessageFormatMessage.java | 2 + .../logging/log4j/message/ObjectArrayMessage.java | 2 + .../logging/log4j/message/ParameterConsumer.java | 2 +- .../logging/log4j/message/ParameterFormatter.java | 157 ++++- .../logging/log4j/message/ParameterVisitable.java | 2 +- .../log4j/message/ParameterizedMessage.java | 2 +- .../ParameterizedNoReferenceMessageFactory.java | 1 + .../log4j/message/ReusableMessageFactory.java | 2 +- .../log4j/message/ReusableObjectMessage.java | 9 +- .../message/ReusableParameterizedMessage.java | 42 +- .../log4j/message/ReusableSimpleMessage.java | 9 +- .../logging/log4j/message/SimpleMessage.java | 2 + .../log4j/message/StringFormattedMessage.java | 2 + .../logging/log4j/message/StringMapMessage.java | 2 +- .../message/StructuredDataCollectionMessage.java | 1 + .../logging/log4j/message/StructuredDataId.java | 20 +- .../log4j/message/StructuredDataMessage.java | 41 +- .../logging/log4j/message/ThreadDumpMessage.java | 6 +- .../logging/log4j/message/ThreadInformation.java | 2 + .../apache/logging/log4j/simple/SimpleLogger.java | 2 +- .../logging/log4j/simple/SimpleLoggerContext.java | 2 +- .../log4j/simple/SimpleLoggerContextFactory.java | 2 + .../apache/logging/log4j/simple/package-info.java | 2 +- .../apache/logging/log4j/spi/AbstractLogger.java | 71 +- .../logging/log4j/spi/AbstractLoggerAdapter.java | 2 + .../logging/log4j/spi/DefaultThreadContextMap.java | 45 +- .../apache/logging/log4j/spi/ExtendedLogger.java | 25 + .../logging/log4j/spi/LocationAwareLogger.java | 2 + .../apache/logging/log4j/spi/LoggerContext.java | 1 + .../log4j/spi/LoggerContextShutdownAware.java | 2 + .../log4j/spi/LoggerContextShutdownEnabled.java | 2 + .../apache/logging/log4j/spi/LoggerRegistry.java | 20 +- .../org/apache/logging/log4j/spi/Provider.java | 13 +- .../logging/log4j/spi/ThreadContextMapFactory.java | 2 + .../logging/log4j/spi/TraceContextProvider.java | 52 ++ .../org/apache/logging/log4j/spi/package-info.java | 2 +- .../log4j/status/StatusConsoleListener.java | 4 +- .../apache/logging/log4j/status/StatusData.java | 14 +- .../apache/logging/log4j/status/StatusLogger.java | 20 +- .../apache/logging/log4j/status/package-info.java | 2 +- .../org/apache/logging/log4j/util/Activator.java | 1 + .../org/apache/logging/log4j/util/Base64Util.java | 43 +- .../java/org/apache/logging/log4j/util/Cast.java | 3 + .../java/org/apache/logging/log4j/util/Chars.java | 8 +- .../org/apache/logging/log4j/util/Constants.java | 8 +- .../log4j/util/FilteredObjectInputStream.java | 2 +- .../logging/log4j/util/InternalException.java | 2 + .../org/apache/logging/log4j/util/LambdaUtil.java | 2 + .../java/org/apache/logging/log4j/util/Lazy.java | 1 + .../org/apache/logging/log4j/util/LazyBoolean.java | 3 + .../org/apache/logging/log4j/util/LoaderUtil.java | 7 +- .../logging/log4j/util/OsgiServiceLocator.java | 3 + .../util/PrivateSecurityManagerStackTraceUtil.java | 31 +- .../apache/logging/log4j/util/ProcessIdUtil.java | 2 +- .../log4j/util/PropertiesPropertySource.java | 3 + .../apache/logging/log4j/util/PropertiesUtil.java | 42 +- .../log4j/util/PropertyFilePropertySource.java | 5 +- .../apache/logging/log4j/util/PropertySource.java | 1 + .../logging/log4j/util/ProviderActivator.java | 2 + .../apache/logging/log4j/util/ProviderUtil.java | 2 +- .../logging/log4j/util/ServiceLoaderUtil.java | 2 + .../logging/log4j/util/SortedArrayStringMap.java | 36 +- .../apache/logging/log4j/util/StackLocator.java | 5 + .../logging/log4j/util/StackLocatorUtil.java | 7 + .../apache/logging/log4j/util/StringBuilders.java | 70 +- .../org/apache/logging/log4j/util/Strings.java | 16 + .../log4j/util/SystemPropertiesPropertySource.java | 3 + .../java/org/apache/logging/log4j/util/Timer.java | 5 + .../log4j/util/internal/SerializationUtil.java | 2 +- .../logging/log4j/util/internal}/package-info.java | 21 +- .../apache/logging/log4j/util/package-info.java | 2 +- .../log4j-api/resource-config.json | 2 +- log4j-appserver/pom.xml | 2 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../log4j/appserver/jetty/Log4j2Logger.java | 2 + .../log4j/appserver/jetty/package-info.java | 2 +- .../log4j/appserver/tomcat/TomcatLogger.java | 2 + .../log4j/appserver/tomcat/package-info.java | 2 +- log4j-cassandra/pom.xml | 4 +- log4j-core-its/pom.xml | 2 +- log4j-core-java9/src/assembly/java9.xml | 1 - .../apache/logging/log4j/core/time/Instant.java | 77 -- .../logging/log4j/core/time/MutableInstant.java | 157 ----- .../logging/log4j/core/time/PreciseClock.java | 38 - log4j-core-test/pom.xml | 17 + .../log4j/core/test/AvailablePortFinder.java | 2 +- .../log4j/core/test/GcFreeLoggingTestUtil.java | 2 +- .../log4j/core/test/appender/ListAppender.java | 85 +-- .../test/appender/db/jdbc/JdbcH2TestHelper.java | 2 +- .../core/test/appender/db/jdbc/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../test/junit/AbstractExternalFileCleaner.java | 2 +- .../logging/log4j/core/test/junit/JdbcRule.java | 2 +- .../log4j/core/test/junit/package-info.java | 2 +- .../core/test/net/mock/MockTcpSyslogServer.java | 2 +- .../log4j/core/test/net/mock/package-info.java | 2 +- .../log4j/core/test/net/ssl/TlsSyslogTestUtil.java | 2 +- .../log4j/core/test/net/ssl/package-info.java | 2 +- .../logging/log4j/core/test/package-info.java | 2 +- .../log4j/core/test/smtp/SimpleSmtpServer.java | 2 +- .../logging/log4j/core/test/smtp/package-info.java | 2 +- .../src/{test => main}/resources/META-INF/NOTICE | 4 +- .../src/test/java/foo/TestFriendlyException.java | 76 +- .../log4j/core/EventParameterMemoryLeakTest.java | 7 +- .../logging/log4j/core/LoggerContextTest.java | 64 ++ .../LoggerMessageFactoryCustomizationTest.java | 59 +- ...oggerMessageFactoryDefaultsTlaDisabledTest.java | 15 +- ...LoggerMessageFactoryDefaultsTlaEnabledTest.java | 18 +- .../logging/log4j/core/MonitorResourcesTest.java | 126 ++++ .../logging/log4j/core/ShutdownDisabledTest.java | 75 +- .../logging/log4j/core/StrictXmlConfigTest.java | 131 ---- .../log4j/core/appender/AsyncAppenderTest.java | 7 + .../log4j/core/appender/ConsoleAppenderTest.java | 2 +- .../log4j/core/appender/DefaultLayoutTest.java | 50 ++ .../log4j/core/appender/FailoverAppenderTest.java | 41 +- .../core/appender/FileAppenderBuilderTest.java | 4 +- .../core/appender/FileAppenderPermissionsTest.java | 30 +- .../log4j/core/appender/FileAppenderTest.java | 32 +- .../core/appender/HttpAppenderBuilderTest.java | 130 ++++ .../log4j/core/appender/InMemoryAppenderTest.java | 4 +- .../log4j/core/appender/LineReadingTcpServer.java | 18 +- .../core/appender/OutputStreamAppenderTest.java | 8 +- .../core/appender/ReconfigureAppenderTest.java | 18 +- .../core/appender/SocketAppenderReconnectTest.java | 2 +- .../core/appender/SyslogAppenderTestBase.java | 29 +- .../log4j/core/appender/TlsSocketAppenderTest.java | 346 +++++++++ .../log4j/core/appender/TlsSyslogAppenderTest.java | 4 +- .../log4j/core/appender/X509Certificates.java | 193 +++++ .../core/appender/XmlCompleteFileAppenderTest.java | 6 +- .../core/appender/mom/kafka/KafkaAppenderTest.java | 53 +- .../appender/rolling/CronTriggeringPolicyTest.java | 16 +- .../rolling/OnStartupTriggeringPolicyTest.java | 10 +- ...RollingAppenderDeleteAccumulatedCount1Test.java | 44 +- .../rolling/RollingAppenderDirectCronTest.java | 27 +- ...llingAppenderDirectWriteWithHtmlLayoutTest.java | 10 +- .../rolling/RollingAppenderRandomDelayTest.java | 235 +++++++ .../appender/rolling/RollingAppenderSizeTest.java | 8 +- .../rolling/RollingFileAppenderAccessTest.java | 6 +- .../rolling/RollingFileAppenderLayoutTest.java | 8 +- .../RollingFileManagerCreateOnDemandTest.java | 72 ++ .../appender/rolling/RollingFileManagerTest.java | 24 +- .../RollingRandomAccessFileManagerTest.java | 73 +- .../rolling/action/GzCompressActionTest.java | 88 +++ .../rolling/action/ZipCompressActionTest.java | 76 ++ .../async/AbstractAsyncThreadContextTestBase.java | 8 +- .../log4j/core/async/AsyncLoggerConfigTest.java | 14 +- .../async/AsyncWaitStrategyFactoryConfigTest.java | 44 ++ .../logging/log4j/core/async/BlockingAppender.java | 3 +- .../log4j/core/async/DisruptorUtilTest.java | 63 ++ .../log4j/core/async/RingBufferLogEventTest.java | 90 ++- .../core/config/AbstractConfigurationTest.java | 25 + .../core/config/ConfigurationFactoryTest.java | 57 ++ .../core/config/ConfigurationSchedulerTest.java | 83 +++ .../log4j/core/config/ConfigurationSourceTest.java | 94 +++ .../log4j/core/config/Configurator1Test.java | 2 +- .../log4j/core/config/CustomConfigurationTest.java | 22 +- .../log4j/core/config/JiraLog4j2_2134Test.java | 8 +- .../logging/log4j/core/config/Log4j_3431_Test.java | 89 +++ .../log4j/core/config/LoggerConfigTest.java | 66 +- .../log4j/core/config/ScriptsPluginTest.java | 78 ++ .../config/builder/CustomConfigurationFactory.java | 2 +- .../plugins/processor/GraalVmProcessorTest.java | 256 ++++++- .../processor/PluginProcessorPublicSetterTest.java | 78 +- .../AbstractPluginWithGenericBuilder.java | 2 +- .../PluginWithGenericSubclassFoo1Builder.java | 2 +- .../plugins/validation/ValidatingPlugin.java | 2 +- .../ValidatingPluginWithGenericBuilder.java | 2 +- .../ValidatingPluginWithTypedBuilder.java | 2 +- .../properties/PropertiesConfigurationTest.java | 42 ++ .../XmlConfigurationConstructHierarchyTest.java | 307 ++++++++ .../core/config/xml/XmlConfigurationPropsTest.java | 2 +- .../log4j/core/filter/AbstractFilterTest.java | 1 - .../log4j/core/filter/AbstractFilterableTest.java | 24 +- .../logging/log4j/core/filter/RegexFilterTest.java | 139 +++- .../log4j/core/impl/FactoryTestStringMap.java | 23 + .../FactoryTestStringMapWithoutIntConstructor.java | 23 + .../core/impl/JdkMapAdapterStringMapTest.java | 21 + .../logging/log4j/core/impl/Log4jLogEventTest.java | 165 +++++ .../log4j/core/impl/MutableLogEventTest.java | 31 +- .../log4j/core/impl/TestTraceContextProvider.java | 53 ++ .../core/impl/ThreadContextDataInjectorTest.java | 2 - .../core/impl/TraceContextIntegrationTest.java | 233 ++++++ ...LoggerContextAdminSetConfigLocationUriTest.java | 134 ++++ .../log4j/core/layout/CsvParameterLayoutTest.java | 16 + .../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 | 208 +++++- .../log4j/core/layout/XmlLayoutJUnit5Test.java | 111 +++ .../logging/log4j/core/layout/XmlLayoutTest.java | 7 +- .../lookup/MainInputArgumentsJmxLookupTest.java | 52 -- .../message/ExtendedThreadInformationTest.java | 45 ++ .../logging/log4j/core/net/SmtpManagerTest.java | 14 +- .../log4j/core/net/SslSocketManagerTest.java | 131 ++++ .../log4j/core/net/ssl/SslConfigurationTest.java | 21 + .../core/pattern/DatePatternConverterTestBase.java | 26 +- .../core/pattern/NamedInstantPatternTest.java | 60 ++ .../log4j/core/pattern/PatternParserTest.java | 89 ++- .../pattern/RootThrowablePatternConverterTest.java | 4 +- .../pattern/ThrowablePatternConverterTest.java | 150 +++- .../log4j/core/script/AbstractScriptTest.java | 71 ++ .../log4j/core/test/appender/ListAppenderTest.java | 224 ++++++ .../log4j/core/util/CronExpressionTest.java | 126 ++++ .../logging/log4j/core/util/TransformTest.java | 90 +++ .../util/internal/InternalLoggerRegistryTest.java | 153 ++++ .../InstantPatternDynamicFormatterTest.java | 231 ++++-- ...InstantPatternLegacyFormatterPrecisionTest.java | 60 ++ ...stantPatternThreadLocalCachedFormatterTest.java | 56 +- .../AsyncWaitStrategyFactoryConfigTest.properties | 13 +- .../GraalVmProcessorTest/java/FakeAnnotations.java | 83 +++ .../GraalVmProcessorTest/java/FakeConverter.java | 46 ++ .../GraalVmProcessorTest/java/FakePlugin.java | 99 +++ .../src/test/resources/META-INF/LICENSE | 202 ------ ...g.apache.logging.log4j.spi.TraceContextProvider | 1 + .../resources/TlsSocketAppenderTest}/log4j2.xml | 40 +- .../included-fragment.xml | 16 +- .../included-with-id.xml | 21 +- .../included.xml | 13 +- .../nested.xml | 16 +- .../src/test/resources/bad/log4j-loggers.xml | 2 +- .../resources/config/MonitorResource/log4j.json | 15 + .../config/MonitorResource/log4j.properties | 18 +- .../resources/config/MonitorResource/log4j.xml | 22 +- .../resources/config/MonitorResource/log4j.yaml | 21 +- .../src/test/resources/log4j-asynch-location.xml | 26 +- .../src/test/resources/log4j-failover-location.xml | 36 +- .../src/test/resources/log4j-rolling.properties | 5 + .../src/test/resources/log4j-strict1.xml | 65 -- .../log4j2-asyncwaitfactoryconfig-3159-nok.xml | 15 +- .../test/resources/log4j2-properties.properties | 8 + .../test/resources/log4j2-script-order-test.xml | 24 +- .../resources/log4j2-unresolved-layout.properties | 23 +- log4j-core/pom.xml | 10 +- .../org/apache/logging/log4j/core/LogEvent.java | 44 ++ .../java/org/apache/logging/log4j/core/Logger.java | 75 +- .../apache/logging/log4j/core/LoggerContext.java | 100 ++- .../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/AsyncAppender.java | 19 + .../log4j/core/appender/ConsoleAppender.java | 2 +- .../log4j/core/appender/FailoverAppender.java | 17 + .../logging/log4j/core/appender/FileAppender.java | 124 +++- .../logging/log4j/core/appender/FileManager.java | 164 +---- .../logging/log4j/core/appender/HttpAppender.java | 24 +- .../core/appender/HttpURLConnectionManager.java | 12 +- .../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 | 193 ++++- .../appender/RollingRandomAccessFileAppender.java | 162 ++++- .../core/appender/ScriptAppenderSelector.java | 60 +- .../log4j/core/appender/SyslogAppender.java | 12 +- .../log4j/core/appender/db/ColumnMapping.java | 6 +- .../AbstractDriverManagerConnectionSource.java | 2 +- .../log4j/core/appender/db/jdbc/ColumnConfig.java | 6 +- .../core/appender/db/jdbc/JdbcDatabaseManager.java | 2 +- .../log4j/core/appender/db/jdbc/package-info.java | 2 +- .../core/appender/mom/kafka/KafkaAppender.java | 20 +- .../logging/log4j/core/appender/package-info.java | 2 +- .../appender/rolling/AbstractRolloverStrategy.java | 2 +- .../appender/rolling/DefaultRolloverStrategy.java | 133 +++- .../rolling/DirectWriteRolloverStrategy.java | 98 ++- .../log4j/core/appender/rolling/FileExtension.java | 2 +- .../core/appender/rolling/RollingFileManager.java | 418 +++++------ .../rolling/RollingRandomAccessFileManager.java | 289 +++----- .../rolling/TimeBasedTriggeringPolicy.java | 42 +- .../rolling/action/AbstractPathAction.java | 2 +- .../appender/rolling/action/FileRenameAction.java | 2 +- .../appender/rolling/action/GzCompressAction.java | 31 +- .../rolling/action/PosixViewAttributeAction.java | 120 +++- .../appender/rolling/action/ScriptCondition.java | 6 +- .../appender/rolling/action/ZipCompressAction.java | 20 +- .../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 +- .../logging/log4j/core/async/AsyncLogger.java | 34 +- .../log4j/core/async/AsyncLoggerConfig.java | 35 +- .../core/async/AsyncLoggerConfigDisruptor.java | 6 +- .../core/async/AsyncWaitStrategyFactoryConfig.java | 23 +- .../logging/log4j/core/async/DisruptorUtil.java | 19 +- .../log4j/core/async/RingBufferLogEvent.java | 113 ++- .../core/async/RingBufferLogEventTranslator.java | 67 +- .../logging/log4j/core/async/package-info.java | 2 +- .../log4j/core/config/AbstractConfiguration.java | 83 ++- .../log4j/core/config/ConfigurationFactory.java | 81 +++ .../log4j/core/config/ConfigurationScheduler.java | 32 +- .../log4j/core/config/ConfigurationSource.java | 53 +- .../logging/log4j/core/config/DefaultLayout.java | 13 +- .../logging/log4j/core/config/LoggerConfig.java | 258 ++++++- .../logging/log4j/core/config/MonitorResource.java | 95 +++ .../{ScriptsPlugin.java => MonitorResources.java} | 35 +- .../logging/log4j/core/config/ScriptsPlugin.java | 20 +- .../log4j/core/config/arbiters/ScriptArbiter.java | 6 +- .../config/builder/api/ConfigurationBuilder.java | 10 + .../core/config/builder/api/package-info.java | 2 +- .../config/builder/impl/BuiltConfiguration.java | 17 + .../builder/impl/DefaultConfigurationBuilder.java | 24 +- .../core/config/builder/impl/package-info.java | 2 +- .../log4j/core/config/json/package-info.java | 2 +- .../logging/log4j/core/config/package-info.java | 2 +- .../config/plugins/convert/TypeConverters.java | 11 +- .../core/config/plugins/convert/package-info.java | 2 +- .../config/plugins/processor/GraalVmProcessor.java | 140 ++-- .../config/plugins/processor/PluginProcessor.java | 93 ++- .../core/config/plugins/util/ResolverUtil.java | 2 +- .../core/config/plugins/util/package-info.java | 2 +- .../plugins/visitors/PluginElementVisitor.java | 4 + .../properties/PropertiesConfigurationBuilder.java | 40 +- .../log4j/core/config/properties/package-info.java | 2 +- .../core/config/status/StatusConfiguration.java | 2 +- .../log4j/core/config/status/package-info.java | 2 +- .../log4j/core/config/xml/XmlConfiguration.java | 63 +- .../log4j/core/config/xml/package-info.java | 2 +- .../log4j/core/config/yaml/package-info.java | 2 +- .../logging/log4j/core/filter/AbstractFilter.java | 28 + .../log4j/core/filter/AbstractFilterable.java | 3 +- .../core/filter/MutableThreadContextMapFilter.java | 8 +- .../logging/log4j/core/filter/RegexFilter.java | 392 ++++++++--- .../logging/log4j/core/filter/ScriptFilter.java | 14 +- .../logging/log4j/core/filter/package-info.java | 2 +- .../log4j/core/impl/JdkMapAdapterStringMap.java | 14 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 376 +++++++--- .../logging/log4j/core/impl/Log4jProvider.java | 2 +- .../logging/log4j/core/impl/MutableLogEvent.java | 101 ++- .../log4j/core/impl/ReusableLogEventFactory.java | 25 +- .../logging/log4j/core/impl/ThrowableProxy.java | 14 +- .../logging/log4j/core/impl/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../log4j/core/jackson/Log4jXmlObjectMapper.java | 175 ++++- .../logging/log4j/core/jmx/LoggerContextAdmin.java | 26 +- .../logging/log4j/core/jmx/package-info.java | 2 +- .../log4j/core/layout/AbstractJacksonLayout.java | 5 +- .../log4j/core/layout/CsvParameterLayout.java | 3 +- .../logging/log4j/core/layout/GelfLayout.java | 14 +- .../logging/log4j/core/layout/HtmlLayout.java | 86 ++- .../logging/log4j/core/layout/PatternLayout.java | 141 +++- .../logging/log4j/core/layout/Rfc5424Layout.java | 329 ++++++++- .../log4j/core/layout/ScriptPatternSelector.java | 6 +- .../logging/log4j/core/layout/package-info.java | 2 +- .../core/lookup/ConfigurationStrSubstitutor.java | 2 +- .../logging/log4j/core/lookup/Interpolator.java | 7 - .../lookup/JmxRuntimeInputArgumentsLookup.java | 71 -- .../logging/log4j/core/lookup/MainMapLookup.java | 4 + .../logging/log4j/core/lookup/package-info.java | 4 +- .../core/message/ExtendedThreadInformation.java | 29 +- .../apache/logging/log4j/core/net/JndiManager.java | 2 +- .../apache/logging/log4j/core/net/SmtpManager.java | 11 +- .../logging/log4j/core/net/SslSocketManager.java | 113 ++- .../logging/log4j/core/net/TcpSocketManager.java | 2 +- .../log4j/core/net/UrlConnectionFactory.java | 32 +- .../logging/log4j/core/net/package-info.java | 2 +- .../log4j/core/net/ssl/FilePasswordProvider.java | 2 +- .../log4j/core/net/ssl/LaxHostnameVerifier.java | 2 +- .../log4j/core/net/ssl/SslConfiguration.java | 34 +- .../logging/log4j/core/net/ssl/package-info.java | 2 +- .../apache/logging/log4j/core/osgi/Activator.java | 2 +- .../apache/logging/log4j/core/package-info.java | 2 +- .../core/pattern/AbstractStyleNameConverter.java | 7 + .../log4j/core/pattern/DatePatternConverter.java | 94 +-- .../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 + .../log4j/core/pattern/NamedInstantPattern.java | 161 +++++ .../logging/log4j/core/pattern/PatternParser.java | 21 +- .../log4j/core/pattern/RegexReplacement.java | 3 +- .../core/pattern/RegexReplacementConverter.java | 7 + .../log4j/core/pattern/SpanIdPatternConverter.java | 33 +- .../logging/log4j/core/pattern/StyleConverter.java | 9 +- .../ThrowableExtendedStackTraceRenderer.java | 2 +- .../ThrowableInvertedStackTraceRenderer.java | 6 +- .../core/pattern/ThrowableStackTraceRenderer.java | 81 ++- .../core/pattern/TraceFlagsPatternConverter.java | 33 +- .../core/pattern/TraceIdPatternConverter.java | 41 +- .../log4j/core/pattern/UuidPatternConverter.java | 17 +- .../VariablesNotEmptyReplacementConverter.java | 10 +- .../logging/log4j/core/pattern/package-info.java | 2 +- .../logging/log4j/core/script/AbstractScript.java | 10 +- .../logging/log4j/core/script/ScriptFile.java | 6 +- .../logging/log4j/core/script/ScriptManager.java | 28 +- .../logging/log4j/core/script/ScriptRef.java | 6 +- .../logging/log4j/core/script/package-info.java | 2 +- .../apache/logging/log4j/core/tools/Generate.java | 2 +- .../logging/log4j/core/tools/package-info.java | 2 +- .../log4j/core/tools/picocli/CommandLine.java | 2 +- .../apache/logging/log4j/core/util/Builder.java | 4 + .../logging/log4j/core/util/CronExpression.java | 9 +- .../apache/logging/log4j/core/util/FileUtils.java | 2 +- .../org/apache/logging/log4j/core/util/Loader.java | 18 +- .../apache/logging/log4j/core/util/NameUtil.java | 2 +- .../apache/logging/log4j/core/util/NetUtils.java | 2 +- .../org/apache/logging/log4j/core/util/Source.java | 2 +- .../logging/log4j/core/util/SystemClock.java | 12 +- .../apache/logging/log4j/core/util/Throwables.java | 2 +- .../core/util/TraceContextProviderService.java | 131 ++++ .../apache/logging/log4j/core/util/Transform.java | 137 ++-- .../log4j/core/util/datetime/FastDatePrinter.java | 4 +- .../core/util/internal/InternalLoggerRegistry.java | 154 ++-- .../log4j/core/util/internal/SystemUtils.java | 16 + .../instant/InstantPatternDynamicFormatter.java | 781 +++++++++++---------- .../internal/instant/InstantPatternFormatter.java | 8 +- .../instant/InstantPatternLegacyFormatter.java | 5 +- .../InstantPatternThreadLocalCachedFormatter.java | 31 +- .../logging/log4j/core/util/package-info.java | 2 +- log4j-core/src/main/resources/META-INF/LICENSE | 202 ------ log4j-core/src/main/resources/META-INF/NOTICE | 13 +- .../log4j-core/reflect-config.json | 120 ++++ .../log4j-core/resource-config.json | 2 +- log4j-fuzz-test/pom.xml | 9 +- .../org/apache/logging/log4j/smtp/SmtpManager.java | 9 +- .../apache/logging/log4j/smtp/SmtpManagerTest.java | 14 +- log4j-jakarta-web/pom.xml | 3 + .../org/apache/logging/log4j/jul/ApiLogger.java | 2 +- .../logging/log4j/jul/Log4jBridgeHandler.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../org/apache/logging/log4j/jul/package-info.java | 2 +- log4j-layout-template-json-fuzz-test/pom.xml | 2 +- log4j-layout-template-json-test/pom.xml | 9 +- .../log4j/layout/template/json/GcpLayoutTest.java | 44 +- .../json/resolver/MessageResolverTest.java | 2 + .../layout/template/json/util/JsonWriterTest.java | 18 + .../json/util/RecyclerFactoryConverterTest.java | 21 +- .../json/util/RecyclerFactoryCustomConverter.java | 63 ++ .../template/json/JsonTemplateLayoutDefaults.java | 34 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../template/json/resolver/ExceptionResolver.java | 4 - .../json/resolver/ExceptionResolverFactory.java | 2 +- .../json/resolver/ExceptionRootCauseResolver.java | 4 - .../ExceptionRootCauseResolverFactory.java | 2 +- .../template/json/resolver/PatternResolver.java | 8 +- .../layout/template/json/util/JsonWriter.java | 14 +- .../template/json/util/RecyclerFactories.java | 4 + .../log4j/layout/template/json/util/Uris.java | 2 +- .../layout/template/json/util/package-info.java | 2 +- .../src/main/resources/GcpLayout.json | 38 +- .../log4j-layout-template-json/reflect-config.json | 24 + .../resource-config.json | 1 + log4j-mongodb/pom.xml | 4 +- .../log4j/mongodb/MongoDbCollectionNameIT.java | 20 +- .../MongoDbDatabaseAndCollectionNameIT.java | 20 +- .../MongoDbNoDatabaseAndCollectionNameIT.java | 20 +- .../src/test/resources/MongoDbCollectionNameIT.xml | 19 +- .../MongoDbDatabaseAndCollectionNameIT.xml | 21 +- .../MongoDbNoDatabaseAndCollectionNameIT.xml | 19 +- log4j-mongodb4/pom.xml | 17 +- .../logging/log4j/mongodb4/MongoDb4Connection.java | 30 +- .../logging/log4j/mongodb4/MongoDb4Provider.java | 110 ++- .../log4j/mongodb4/AbstractMongoDb4CappedIT.java | 6 +- .../log4j/mongodb4/MongoDb4CollectionNameIT.java | 20 +- .../MongoDb4DatabaseAndCollectionNameIT.java | 20 +- .../log4j/mongodb4/MongoDb4ProviderTest.java | 116 +++ .../logging/log4j/mongodb4/MongoDb4Resolver.java | 2 - .../test/resources/MongoDb4CollectionNameIT.xml | 18 +- .../MongoDb4DatabaseAndCollectionNameIT.xml | 20 +- log4j-osgi-test/pom.xml | 47 ++ .../logging/log4j/osgi/tests/DisruptorTest.java | 154 ++++ log4j-parent/pom.xml | 218 ++++-- log4j-perf-test/pom.xml | 17 +- .../log4j/message/ParameterFormatterBenchmark.java | 38 +- .../internal/annotation/SuppressFBWarnings.java | 14 +- .../log4j/perf/jmh/AsyncTraceContextBenchmark.java | 181 +++++ .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 2 +- .../log4j/perf/jmh/JpaAppenderBenchmark.java | 2 +- .../log4j/perf/jmh/ThreadContextBenchmark.java | 5 + .../log4j/perf/jmh/ThreadContextBenchmark2.java | 8 +- .../InstantPatternFormatterImpactBenchmark.java | 6 +- .../logging/log4j/perf/nogc/ClassicLogger.java | 4 +- .../logging/log4j/perf/nogc/OpenHashStringMap.java | 48 +- .../java/org/apache/logging/slf4j/Log4jLogger.java | 2 + .../org/apache/logging/slf4j/SerializeTest.java | 6 +- .../ThrowableConsumingMessageFactoryTest.java | 2 +- log4j-slf4j2-impl/pom.xml | 2 +- .../java/org/apache/logging/slf4j/Log4jLogger.java | 2 + .../org/apache/logging/slf4j/SerializeTest.java | 6 +- .../ThrowableConsumingMessageFactoryTest.java | 2 +- .../spring/boot/Log4j2SpringBootLoggingSystem.java | 6 +- log4j-spring-cloud-config-client/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 +- .../org/apache/logging/log4j/tojul/JULLogger.java | 4 +- log4j-to-slf4j/pom.xml | 41 +- .../java/org/apache/logging/slf4j/SLF4JLogger.java | 18 +- .../org/apache/logging/slf4j/LogBuilderTest.java | 16 + .../apache/logging/slf4j/MDCContextMapTest.java | 3 +- .../org/apache/logging/slf4j/MDCTestHelper.java | 26 +- .../{LoggerTest.java => SLF4JLoggerTest.java} | 43 +- .../slf4j/{LoggerTest.xml => SLF4JLoggerTest.xml} | 0 mvnw | 50 +- mvnw.cmd | 56 +- package.json | 2 +- pom.xml | 124 +--- src/changelog/.2.x.x/.release-notes.adoc.ftl | 34 +- .../.2.x.x/1976_add_native_tracing_fields.xml | 13 + .../.2.x.x/2073_fix_ConfigurationScheduler_NPE.xml | 13 + ...369_add_missing_RootLogger_withFilter_alias.xml | 13 + ...l => 3816_legacy_instant_pattern_precision.xml} | 5 +- src/changelog/.2.x.x/3926_revamp_list_appender.xml | 13 + src/changelog/.2.x.x/4012_add_max_random_delay.xml | 14 + ...configuration_support_for_logger_properties.xml | 13 + .../.2.x.x/4145_add_log4j_api_kotlin_to_bom.xml | 13 + ...xml => 4181_routing_appender_security_docs.xml} | 4 +- src/changelog/.2.x.x/4185_fix_jmx_mbean_npe.xml | 12 + .../.2.x.x/4225_plugin_processor_messages.xml | 13 + ...4243_fix_CsvParameterLayout_null_parameters.xml | 13 + .../4248_fix_plugin_element_visitor_array_npe.xml | 13 + ...2006_Fix_RollingFileAppender_createOnDemand.xml | 14 + ..._cover_daylight_saving_and_scheduling_logic.xml | 13 + ...atePatternConverter_locale_without_timezone.xml | 13 + .../fix-MapMessage-JSON-non-finite-number.xml | 12 + .../fix-StructuredDataMessage-XML-encoding.xml | 12 + .../fix-StructuredDataMessage-XML-message.xml | 13 + ...nce-detection-for-exceptions-with-colliding.xml | 13 + .../fix-log-disruptor-initialization-errors.xml | 13 + ...r.xml => fix_configuration_source_url_leak.xml} | 4 +- ...> fix_kafka_appender_retry_error_reporting.xml} | 4 +- ...ix_logger_context_admin_config_stream_leak.xml} | 6 +- ...-watcher.xml => fix_xml_parse_appender_npe.xml} | 4 +- .../.2.x.x/harden_message_deserialization.xml | 12 + .../.2.x.x/regexfilter_patternflags_builder.xml | 15 + ..._hsqldb_hsqldb.xml => update_actions_stale.xml} | 4 +- ...ate_biz.aqute.bnd_biz.aqute.bnd.annotation.xml} | 4 +- ...date_co.elastic.clients_elasticsearch-java.xml} | 4 +- ...pdate_co.elastic.logging_log4j2-ecs-layout.xml} | 4 +- ...=> update_com.code-intelligence_jazzer-api.xml} | 4 +- ...xml => update_com.code-intelligence_jazzer.xml} | 4 +- ...> update_com.fasterxml.jackson_jackson-bom.xml} | 4 +- ...r_ffi.xml => update_com.github.jnr_jnr-ffi.xml} | 4 +- ...-instrumenter_java-allocation-instrumenter.xml} | 4 +- ....google.errorprone_error_prone_annotations.xml} | 4 +- ...l => update_com.google.guava_guava-testlib.xml} | 4 +- ...d_jni.xml => update_com.google.guava_guava.xml} | 4 +- ....xml => update_commons-codec_commons-codec.xml} | 4 +- ...ons_io.xml => update_commons-io_commons-io.xml} | 4 +- ... => update_commons-logging_commons-logging.xml} | 4 +- ...l => update_io.fabric8_docker-maven-plugin.xml} | 4 +- ..._jakarta.activation_jakarta.activation-api.xml} | 4 +- ...ml => update_jakarta.mail_jakarta.mail-api.xml} | 4 +- ...jna_jna.xml => update_net.java.dev.jna_jna.xml} | 4 +- ...update_org.apache.activemq_activemq-broker.xml} | 4 +- ...update_org.apache.commons_commons-compress.xml} | 4 +- ...l => update_org.apache.commons_commons-csv.xml} | 4 +- ...=> update_org.apache.commons_commons-dbcp2.xml} | 4 +- ...=> update_org.apache.commons_commons-lang3.xml} | 4 +- ...=> update_org.apache.commons_commons-pool2.xml} | 4 +- ...l => update_org.apache.kafka_kafka-clients.xml} | 4 +- ....xml => update_org.apache.maven_maven-core.xml} | 4 +- ...xml => update_org.apache.maven_maven-model.xml} | 4 +- ...jna.xml => update_org.assertj_assertj-core.xml} | 4 +- ... => update_org.bouncycastle_bcpkix-jdk18on.xml} | 4 +- ...=> update_org.codehaus.plexus_plexus-utils.xml} | 4 +- ... => update_org.codehaus.woodstox_stax2-api.xml} | 4 +- ... update_org.eclipse.angus_angus-activation.xml} | 4 +- ...l => update_org.eclipse.angus_jakarta.mail.xml} | 4 +- ...date_org.eclipse.platform_org.eclipse.osgi.xml} | 4 +- ...ticsearch.client_elasticsearch-rest-client.xml} | 4 +- ...radlex_gradle-module-metadata-maven-plugin.xml} | 4 +- ...jna.xml => update_org.jctools_jctools-core.xml} | 4 +- ..._jmdns_jmdns.xml => update_org.jmdns_jmdns.xml} | 4 +- ...ate_org.junit.jupiter_junit-jupiter-engine.xml} | 4 +- ...unit_bom.xml => update_org.junit_junit-bom.xml} | 4 +- ...ongodb_bson.xml => update_org.mongodb_bson.xml} | 4 +- ... => update_org.mongodb_mongodb-driver-core.xml} | 4 +- ... => update_org.mongodb_mongodb-driver-sync.xml} | 4 +- ...=> update_org.openjdk.nashorn_nashorn-core.xml} | 4 +- ...unit_bom.xml => update_org.slf4j_slf4j-api.xml} | 4 +- ...lf4j_nop.xml => update_org.slf4j_slf4j-nop.xml} | 4 +- ...ogging_parent.xml => update_org.tukaani_xz.xml} | 3 +- ...jna.xml => update_org.xmlunit_xmlunit-core.xml} | 4 +- ...xml => update_org.xmlunit_xmlunit-matchers.xml} | 4 +- .../.2.x.x/update_org_apache_groovy_groovy_bom.xml | 8 - ...g4j_transform_maven_shade_plugin_extensions.xml | 8 - ..._org_apache_maven_surefire_surefire_junit47.xml | 8 - ..._org_openrewrite_maven_rewrite_maven_plugin.xml | 8 - ...enrewrite_recipe_rewrite_logging_frameworks.xml | 8 - ...org_openrewrite_recipe_rewrite_migrate_java.xml | 8 - ...update_org_ops4j_pax_exam_exam_maven_plugin.xml | 8 - .../.2.x.x/update_org_ops4j_pax_exam_pax_exam.xml | 8 - src/changelog/.2.x.x/xinclude_fixup_attributes.xml | 12 + src/changelog/2.23.0/.release-notes.adoc.ftl | 10 +- .../2.23.0/add_support_for_disruptor_4.xml | 2 +- .../revamp_StatusLogger.xml} | 4 +- .../{2.23.0 => 2.24.3}/.release-notes.adoc.ftl | 4 +- .../changelog/2.24.3/.release.xml | 16 +- .../3234_concurrent-logger-modification.xml} | 5 +- .../2.24.3/3239_npe_fix_regex_filter_creator.xml | 11 + .../3252_recursive_property_sources.xml} | 5 +- src/changelog/2.25.0/.release-notes.adoc.ftl | 76 ++ .../changelog/2.25.0/.release.xml | 16 +- .../1736_split_jansi_support.xml | 0 .../{.2.x.x => 2.25.0}/2229_mongodb_docker.xml | 0 .../2295_add_JMS_Jakarta_Appender.xml | 0 ...ix_RollingFileManager_unsuccessful_rollover.xml | 0 ...91_change_PatternLayout_exception_rendering.xml | 0 .../2691_deprecate_ThrowableProxy.xml | 0 .../2691_fix_PatternLayout_exception_rendering.xml | 0 .../{.2.x.x => 2.25.0}/2767_reload_key_stores.xml | 0 .../2767_simplify_SSL_config_logic.xml | 0 .../2769_pluginAttribute_publicSetterWarning.xml | 0 .../2916_rewrite_jansi_renderer.xml | 0 ...eprecate_AbstractLogger_checkMessageFactory.xml | 0 .../{.2.x.x => 2.25.0}/2937-http-watcher.xml | 0 .../2942_fix_ThreadContext_putAll.xml | 0 .../{.2.x.x => 2.25.0}/2949_add_fuzzing.xml | 0 .../3011_http_appender_validation.xml} | 4 +- .../3030_fix_log4j1_getLogger.xml | 0 .../3045_change_PatternLayout_prefix.xml | 0 .../3045_fix_PatternLayout_rEx_property.xml | 0 .../3045_remove_PatternLayout_ex_ansi.xml | 0 .../3048_fix_ThreadContext_remove.xml | 0 .../{.2.x.x => 2.25.0}/3053_graalvm_processor.xml | 0 .../{.2.x.x => 2.25.0}/3056_android_support.xml | 0 .../3066_fix_bom.xml} | 5 +- .../2.25.0/3074_monitor_additional_files.xml | 9 + .../3085_fix_log4j_1_priority.xml | 0 .../{.2.x.x => 2.25.0}/3118_default_layout.xml | 0 .../3119_set_level_call_parent.xml | 0 .../3121_deprecate_FixedDateFormat.xml | 0 .../{.2.x.x => 2.25.0}/3121_instant_format.xml | 0 ...123_change_PatternLayout_exception_renderer.xml | 0 ...127_JDBC_appender_IOException_stream_closed.xml | 0 .../{.2.x.x => 2.25.0}/3143_logger_registry.xml | 0 .../3149_change_StatusData_prefix.xml | 0 ...51_fix_mongodb_appender_deprecation_warning.xml | 0 .../3153_fix_StringMatchFilter_guardNPE.xml | 0 ...ix_AsyncWaitStrategyFactoryConfig_guardNPE.xml} | 4 +- .../3206_fix_rootLogger_shorthand_npe.xml} | 6 +- .../3212_fix_JTL_StackTraceStringResolver.xml | 0 .../3215_fix-RegexReplacement.xml} | 4 +- src/changelog/2.25.0/3217_precise_clock.xml | 10 + .../3257_fix_AsyncAppender_requiresLocation.xml} | 4 +- ...3257_fix_FailoverAppender_requiresLocation.xml} | 4 +- .../3300_fix-javadoc.xml} | 6 +- .../3359_fix-javadoc.xml} | 4 +- ...3369_fix_typo_in_RootLogger_Builder_method.xml} | 7 +- .../3398_fix_JTL_RecyclerFactoryConverter.xml} | 4 +- .../3399_logger_registry.xml} | 6 +- ..._InternalLoggerRegistry_stale_entry_expunge.xml | 13 + .../3431_default_config_name.xml} | 6 +- .../3437_transtive_compile_only_dependencies.xml} | 5 +- .../3467_add_mongodb_conn_db_name.xml} | 4 +- .../3508_LoggerContext_shutdownDisable.xml} | 8 +- .../3562_StatusData_ArrayIndexOutOfBounds.xml} | 4 +- .../3586_improve_GcpLayout.xml} | 5 +- .../3601_deprecate_or_remove_hiding_methods.xml} | 6 +- ...e_optimization_for_filling_the_stack_trace.xml} | 4 +- .../3645_speedup_array_logging.xml} | 4 +- ..._stack_traces_in_ExtendedThreadInformation.xml} | 4 +- .../3665_fix_StatusLogger_writing_to_stdout.xml} | 4 +- ...3669_generalize_ReadOnlyStringMap_equality.xml} | 4 +- ...il_base64_directly_instead_of_reflectively.xml} | 4 +- .../3706_osgi-disruptor.xml} | 4 +- .../fix_JsonWriter_surrogate_handling.xml | 0 .../throwable-proxy-clean-up.xml} | 5 +- .../update_actions_stale.xml} | 3 +- .../update_ch_qos_logback_logback_core.xml | 4 +- .../update_com_fasterxml_jackson_jackson_bom.xml | 4 +- ...e_com_github_spotbugs_spotbugs_annotations.xml} | 4 +- .../update_io_fabric8_docker_maven_plugin.xml | 4 +- .../update_org_apache_cassandra_cassandra_all.xml} | 4 +- .../update_org_apache_commons_commons_csv.xml | 4 +- .../update_org_apache_commons_commons_dbcp2.xml | 0 .../update_org_apache_commons_commons_pool2.xml} | 4 +- .../update_org_apache_kafka_kafka_clients.xml | 4 +- .../update_org_apache_logging_logging_parent.xml | 2 +- .../update_org_apache_tomcat_tomcat_juli.xml | 0 .../update_org_eclipse_jetty_jetty_util.xml} | 4 +- .../{.2.x.x => 2.25.0}/update_org_jmdns_jmdns.xml | 4 +- .../{.2.x.x => 2.25.0}/update_org_mongodb_bson.xml | 4 +- .../update_org_slf4j_slf4j_api.xml} | 4 +- ..._springframework_cloud_spring_cloud_context.xml | 4 +- .../{2.23.0 => 2.25.1}/.release-notes.adoc.ftl | 9 +- .../changelog/2.25.1/.release.xml | 16 +- src/changelog/2.25.1/3706_disruptor-tccl.xml | 12 + .../3754_fix-gradle-build.xml} | 4 +- src/changelog/2.25.1/3758_fix_jspecify_dep.xml | 13 + src/changelog/2.25.1/3770_LoggerContext_start.xml | 12 + .../3771_graalvm-params.xml} | 4 +- ...ta-web_relax_the_import_package_constraints.xml | 12 + .../2.25.1/3790_allow-resource-protocol.xml | 12 + .../2.25.1/3792_formatted-datetime-sharing.xml | 13 + .../2.25.1/3796_annotated-array-parameters.xml | 13 + .../2.25.1/3800_graalvm-misc-reflection.xml | 12 + .../3929_ThrowableStackTraceRenderer-npe.xml | 13 + .../{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 + .../{2.23.0 => 2.25.3}/.release-notes.adoc.ftl | 8 +- .../changelog/2.25.3/.release.xml | 16 +- src/changelog/2.25.3/3871_graalvm_binary_name.xml | 13 + ...35_optimize_DefaultThreadContextMap_getCopy.xml | 13 + .../3947_fix_SslSocketManager_null_keystore.xml | 13 + .../2.25.3/3985_remove_spotbugs_annotations.xml | 13 + .../4002_fix_SslSocketAppender_verifyHostName.xml | 12 + .../{2.23.0 => 2.25.4}/.release-notes.adoc.ftl | 11 +- .../changelog/2.25.4/.release.xml | 16 +- ...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 + .../{2.23.0 => 2.25.5}/.release-notes.adoc.ftl | 4 +- .../changelog/2.25.5/.release.xml | 16 +- ...2006_Fix_RollingFileAppender_createOnDemand.xml | 14 + ...atePatternConverter_locale_without_timezone.xml | 14 + .../fix-MapMessage-JSON-non-finite-number.xml | 12 + .../fix-StructuredDataMessage-XML-encoding.xml | 12 + ...nce-detection-for-exceptions-with-colliding.xml | 13 + .../fix-log-disruptor-initialization-errors.xml | 13 + .../fix_configuration_source_url_leak.xml} | 4 +- .../fix_kafka_appender_retry_error_reporting.xml} | 4 +- .../{2.23.0 => 2.26.0}/.release-notes.adoc.ftl | 6 +- .../changelog/2.26.0/.release.xml | 16 +- .../3176_validate_scripts_in_ScriptsPlugin.xml | 12 + .../2.26.0/3336_script_resolution_order_fix.xml | 12 + src/changelog/2.26.0/3750_deprecate_withers.xml | 13 + .../2.26.0/3874_remove_jvmrunargs_lookup.xml | 12 + ...raceRenderer_ArrayIndexOutOfBoundsException.xml | 13 + .../2.26.0/3968_refactor_manager_factories.xml | 12 + .../4068_fix_SLF4JLogger_atFatal_wrong_level.xml | 14 + src/changelog/2.26.0/4099_javadoc-cross-link.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 + .../prevent_configexception_non_used_config.xml | 13 + src/changelog/2.26.0/rfc5424-setters.xml | 11 + .../update_org_junit_junit_bom.xml | 4 +- .../{.2.x.x => 2.26.0}/update_org_mongodb_bson.xml | 4 +- .../update_org_xerial_snappy_snappy_java.xml} | 4 +- .../{2.23.0 => 2.26.1}/.release-notes.adoc.ftl | 6 +- .../changelog/2.26.1/.release.xml | 16 +- ...2006_Fix_RollingFileAppender_createOnDemand.xml | 14 + ...atePatternConverter_locale_without_timezone.xml | 14 + .../fix-MapMessage-JSON-non-finite-number.xml | 12 + .../fix-StructuredDataMessage-XML-encoding.xml | 12 + ...nce-detection-for-exceptions-with-colliding.xml | 13 + .../fix-log-disruptor-initialization-errors.xml | 13 + .../fix_configuration_source_url_leak.xml} | 4 +- .../fix_kafka_appender_retry_error_reporting.xml} | 4 +- .../ROOT/examples/cloud/logstash/log4j2.json | 4 +- .../ROOT/examples/cloud/logstash/log4j2.properties | 1 - .../ROOT/examples/cloud/logstash/log4j2.xml | 2 +- .../ROOT/examples/cloud/logstash/log4j2.yaml | 3 +- .../appenders/database/nosql-mongo-keys.json | 4 +- .../appenders/database/nosql-mongo-keys.properties | 4 +- .../manual/appenders/database/nosql-mongo-keys.xml | 4 +- .../appenders/database/nosql-mongo-keys.yaml | 4 +- .../manual/appenders/database/nosql-mongo.json | 4 +- .../appenders/database/nosql-mongo.properties | 4 +- .../manual/appenders/database/nosql-mongo.xml | 4 +- .../manual/appenders/database/nosql-mongo.yaml | 4 +- .../manual/configuration/monitor-resources.json | 15 + .../configuration/monitor-resources.properties} | 18 +- .../configuration/monitor-resources.xml} | 22 +- .../configuration/monitor-resources.yaml} | 21 +- .../configuration/xinclude-xpointer-appenders.xml | 25 +- .../configuration/xinclude-xpointer-main.xml} | 22 +- src/site/antora/modules/ROOT/nav.adoc | 3 +- .../antora/modules/ROOT/pages/development.adoc | 8 +- src/site/antora/modules/ROOT/pages/download.adoc | 299 +++++++- src/site/antora/modules/ROOT/pages/faq.adoc | 2 +- src/site/antora/modules/ROOT/pages/manual/api.adoc | 8 +- .../modules/ROOT/pages/manual/appenders.adoc | 14 + .../ROOT/pages/manual/appenders/database.adoc | 32 +- .../ROOT/pages/manual/appenders/delegating.adoc | 99 ++- .../ROOT/pages/manual/appenders/message-queue.adoc | 35 +- .../ROOT/pages/manual/appenders/network.adoc | 19 +- .../ROOT/pages/manual/appenders/rolling-file.adoc | 17 + .../modules/ROOT/pages/manual/architecture.adoc | 14 +- .../antora/modules/ROOT/pages/manual/async.adoc | 54 +- .../modules/ROOT/pages/manual/configuration.adoc | 125 ++-- .../antora/modules/ROOT/pages/manual/filters.adoc | 21 +- .../modules/ROOT/pages/manual/garbagefree.adoc | 2 + .../modules/ROOT/pages/manual/installation.adoc | 7 +- .../ROOT/pages/manual/json-template-layout.adoc | 7 + .../antora/modules/ROOT/pages/manual/layouts.adoc | 6 + .../antora/modules/ROOT/pages/manual/lookups.adoc | 25 +- .../modules/ROOT/pages/manual/pattern-layout.adoc | 39 +- .../antora/modules/ROOT/pages/manual/plugins.adoc | 61 +- .../modules/ROOT/pages/manual/thread-context.adoc | 17 +- src/site/antora/modules/ROOT/pages/soa.adoc | 3 +- src/site/antora/modules/ROOT/pages/versioning.adoc | 144 ++++ .../modules/ROOT/partials/log4j-features.adoc | 6 +- .../partials/manual/configuration-xml-format.adoc | 111 +++ .../properties-async-logger-config.adoc | 2 +- .../properties-context-selector.adoc | 17 +- .../properties-log4j-core-misc.adoc | 25 +- .../properties-transport-security.adoc | 16 +- .../partials/manual/trust-store-guideline.adoc} | 17 +- 914 files changed, 18701 insertions(+), 6147 deletions(-)
