(logging-log4j2) branch 2.x updated (6c242302be -> 400c65bdbe)

[vy]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 6c242302be Generate changelog
     new ab813d7921 Update `org.apache.logging:logging-parent` to version 
`10.4.0`
     new 400c65bdbe Apply Palantir formatter

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/log4j/Appender.java   |    3 -
 .../java/org/apache/log4j/AppenderSkeleton.java    |   38 +-
 .../java/org/apache/log4j/BasicConfigurator.java   |    3 +-
 .../src/main/java/org/apache/log4j/Category.java   |   86 +-
 .../main/java/org/apache/log4j/CategoryKey.java    |    4 +-
 .../java/org/apache/log4j/ConsoleAppender.java     |    4 +-
 .../org/apache/log4j/DefaultCategoryFactory.java   |    3 +-
 .../org/apache/log4j/DefaultThrowableRenderer.java |    6 +-
 .../main/java/org/apache/log4j/FileAppender.java   |   23 +-
 .../src/main/java/org/apache/log4j/Hierarchy.java  |   74 +-
 .../src/main/java/org/apache/log4j/Layout.java     |    3 +-
 .../src/main/java/org/apache/log4j/Level.java      |   47 +-
 .../src/main/java/org/apache/log4j/LogManager.java |   38 +-
 .../src/main/java/org/apache/log4j/Logger.java     |    2 -
 .../src/main/java/org/apache/log4j/MDC.java        |   27 +-
 .../src/main/java/org/apache/log4j/NDC.java        |    9 +-
 .../main/java/org/apache/log4j/PatternLayout.java  |    8 +-
 .../src/main/java/org/apache/log4j/Priority.java   |    9 +-
 .../org/apache/log4j/PropertyConfigurator.java     |  147 +-
 .../java/org/apache/log4j/RenderedMessage.java     |    1 -
 .../java/org/apache/log4j/RollingFileAppender.java |   20 +-
 .../main/java/org/apache/log4j/SimpleLayout.java   |    1 -
 .../main/java/org/apache/log4j/VectorAppender.java |    1 -
 .../main/java/org/apache/log4j/WriterAppender.java |   19 +-
 .../org/apache/log4j/bridge/AppenderAdapter.java   |    9 +-
 .../org/apache/log4j/bridge/LayoutAdapter.java     |    1 -
 .../org/apache/log4j/bridge/LayoutWrapper.java     |    2 +-
 .../org/apache/log4j/bridge/LogEventAdapter.java   |   15 +-
 .../org/apache/log4j/bridge/LogEventWrapper.java   |   21 +-
 .../apache/log4j/bridge/RewritePolicyAdapter.java  |    2 -
 .../apache/log4j/bridge/RewritePolicyWrapper.java  |    4 +-
 .../org/apache/log4j/builders/AbstractBuilder.java |   29 +-
 .../org/apache/log4j/builders/BuilderManager.java  |   70 +-
 .../java/org/apache/log4j/builders/Holder.java     |    3 +-
 .../java/org/apache/log4j/builders/Parser.java     |    1 -
 .../log4j/builders/appender/AppenderBuilder.java   |   11 +-
 .../builders/appender/AsyncAppenderBuilder.java    |   57 +-
 .../builders/appender/ConsoleAppenderBuilder.java  |   57 +-
 .../appender/DailyRollingFileAppenderBuilder.java  |   72 +-
 .../EnhancedRollingFileAppenderBuilder.java        |  112 +-
 .../builders/appender/FileAppenderBuilder.java     |   58 +-
 .../builders/appender/NullAppenderBuilder.java     |   15 +-
 .../builders/appender/RewriteAppenderBuilder.java  |   55 +-
 .../appender/RollingFileAppenderBuilder.java       |   72 +-
 .../builders/appender/SocketAppenderBuilder.java   |  131 +-
 .../builders/appender/SyslogAppenderBuilder.java   |   71 +-
 .../builders/filter/DenyAllFilterBuilder.java      |    4 +-
 .../builders/filter/LevelMatchFilterBuilder.java   |   14 +-
 .../builders/filter/LevelRangeFilterBuilder.java   |   18 +-
 .../builders/filter/StringMatchFilterBuilder.java  |   12 +-
 .../log4j/builders/layout/HtmlLayoutBuilder.java   |   13 +-
 .../builders/layout/PatternLayoutBuilder.java      |   12 +-
 .../log4j/builders/layout/SimpleLayoutBuilder.java |    4 +-
 .../log4j/builders/layout/TTCCLayoutBuilder.java   |   35 +-
 .../log4j/builders/layout/XmlLayoutBuilder.java    |   13 +-
 .../rolling/CompositeTriggeringPolicyBuilder.java  |    7 +-
 .../rolling/SizeBasedTriggeringPolicyBuilder.java  |    9 +-
 .../rolling/TimeBasedRollingPolicyBuilder.java     |    5 +-
 .../apache/log4j/component/helpers/Constants.java  |   65 +-
 .../apache/log4j/config/InputStreamWrapper.java    |    1 -
 .../apache/log4j/config/Log4j1Configuration.java   |    4 +-
 .../log4j/config/Log4j1ConfigurationConverter.java |   47 +-
 .../log4j/config/Log4j1ConfigurationFactory.java   |    4 +-
 .../log4j/config/Log4j1ConfigurationParser.java    |  247 +--
 .../log4j/config/PropertiesConfiguration.java      |   78 +-
 .../config/PropertiesConfigurationFactory.java     |    5 +-
 .../org/apache/log4j/config/PropertySetter.java    |   25 +-
 .../log4j/helpers/AbsoluteTimeDateFormat.java      |    6 +-
 .../log4j/helpers/AppenderAttachableImpl.java      |    1 -
 .../java/org/apache/log4j/helpers/BoundedFIFO.java |    3 +-
 .../apache/log4j/helpers/CountingQuietWriter.java  |    2 -
 .../java/org/apache/log4j/helpers/DateLayout.java  |   15 +-
 .../org/apache/log4j/helpers/FileWatchdog.java     |   12 +-
 .../apache/log4j/helpers/ISO8601DateFormat.java    |   85 +-
 .../main/java/org/apache/log4j/helpers/Loader.java |    6 +-
 .../main/java/org/apache/log4j/helpers/LogLog.java |    2 +-
 .../org/apache/log4j/helpers/NullEnumeration.java  |    3 +-
 .../org/apache/log4j/helpers/OptionConverter.java  |   89 +-
 .../org/apache/log4j/helpers/PatternConverter.java |  154 +-
 .../org/apache/log4j/helpers/PatternParser.java    |  402 +++--
 .../java/org/apache/log4j/helpers/QuietWriter.java |    9 +-
 .../org/apache/log4j/helpers/UtilLoggingLevel.java |   38 +-
 .../org/apache/log4j/jmx/AbstractDynamicMBean.java |   23 +-
 .../src/main/java/org/apache/log4j/jmx/Agent.java  |    5 +-
 .../org/apache/log4j/jmx/AppenderDynamicMBean.java |   67 +-
 .../apache/log4j/jmx/HierarchyDynamicMBean.java    |   75 +-
 .../org/apache/log4j/jmx/LayoutDynamicMBean.java   |   48 +-
 .../org/apache/log4j/jmx/LoggerDynamicMBean.java   |   60 +-
 .../java/org/apache/log4j/jmx/MethodUnion.java     |    1 -
 .../apache/log4j/layout/Log4j1SyslogLayout.java    |   29 +-
 .../org/apache/log4j/layout/Log4j1XmlLayout.java   |    9 +-
 .../org/apache/log4j/legacy/core/CategoryUtil.java |    4 +-
 .../org/apache/log4j/legacy/core/ContextUtil.java  |    3 +-
 .../java/org/apache/log4j/or/DefaultRenderer.java  |    3 +-
 .../java/org/apache/log4j/or/ObjectRenderer.java   |    2 +-
 .../main/java/org/apache/log4j/or/RendererMap.java |   28 +-
 .../org/apache/log4j/or/ThreadGroupRenderer.java   |    7 +-
 .../org/apache/log4j/or/jms/MessageRenderer.java   |   17 +-
 .../log4j/pattern/Log4j1LevelPatternConverter.java |    1 -
 .../log4j/pattern/Log4j1MdcPatternConverter.java   |    5 +-
 .../log4j/pattern/Log4j1NdcPatternConverter.java   |    7 +-
 .../org/apache/log4j/pattern/NameAbbreviator.java  |    9 +-
 .../org/apache/log4j/rewrite/MapRewritePolicy.java |   16 +-
 .../log4j/rewrite/PropertyRewritePolicy.java       |   19 +-
 .../org/apache/log4j/spi/AppenderAttachable.java   |    4 -
 .../main/java/org/apache/log4j/spi/ErrorCode.java  |   17 +-
 .../java/org/apache/log4j/spi/ErrorHandler.java    |    2 -
 .../src/main/java/org/apache/log4j/spi/Filter.java |    2 -
 .../apache/log4j/spi/HierarchyEventListener.java   |    8 +-
 .../java/org/apache/log4j/spi/LocationInfo.java    |    3 +-
 .../java/org/apache/log4j/spi/LoggerFactory.java   |    1 -
 .../org/apache/log4j/spi/LoggerRepository.java     |    1 -
 .../java/org/apache/log4j/spi/LoggingEvent.java    |   96 +-
 .../main/java/org/apache/log4j/spi/NOPLogger.java  |    2 -
 .../org/apache/log4j/spi/NOPLoggerRepository.java  |    1 -
 .../java/org/apache/log4j/spi/OptionHandler.java   |    1 -
 .../java/org/apache/log4j/spi/RendererSupport.java |    1 -
 .../main/java/org/apache/log4j/spi/RootLogger.java |    1 -
 .../org/apache/log4j/spi/ThrowableInformation.java |    1 -
 .../apache/log4j/varia/FallbackErrorHandler.java   |    5 +-
 .../log4j/varia/ReloadingPropertyConfigurator.java |    5 +-
 .../java/org/apache/log4j/xml/DOMConfigurator.java |   34 +-
 .../org/apache/log4j/xml/Log4jEntityResolver.java  |    4 +-
 .../log4j/xml/UnrecognizedElementHandler.java      |    1 -
 .../org/apache/log4j/xml/XmlConfiguration.java     |   80 +-
 .../apache/log4j/xml/XmlConfigurationFactory.java  |    5 +-
 .../apache/log4j/BasicConfigurationFactory.java    |   13 +-
 .../org/apache/log4j/BasicConfiguratorTest.java    |    3 +-
 .../org/apache/log4j/CallerInformationTest.java    |    5 +-
 .../test/java/org/apache/log4j/CategoryTest.java   |   67 +-
 .../java/org/apache/log4j/ConsoleAppenderTest.java |    6 +-
 .../java/org/apache/log4j/CustomFileAppender.java  |    1 -
 .../java/org/apache/log4j/CustomNoopAppender.java  |    1 -
 .../src/test/java/org/apache/log4j/LayoutTest.java |   14 +-
 .../src/test/java/org/apache/log4j/LevelTest.java  |   22 +-
 .../test/java/org/apache/log4j/ListAppender.java   |   13 +-
 .../test/java/org/apache/log4j/LogManagerTest.java |    9 +-
 .../test/java/org/apache/log4j/LogWithMDCTest.java |    7 +-
 .../java/org/apache/log4j/LogWithRouteTest.java    |    7 +-
 .../java/org/apache/log4j/LoggerJira3410Test.java  |   11 +-
 .../src/test/java/org/apache/log4j/LoggerTest.java |   72 +-
 .../test/java/org/apache/log4j/LoggingTest.java    |    7 +-
 .../test/java/org/apache/log4j/MDCTestCase.java    |    1 -
 .../src/test/java/org/apache/log4j/NDCTest.java    |    1 -
 .../test/java/org/apache/log4j/PriorityTest.java   |   10 +-
 .../org/apache/log4j/PropertyConfiguratorTest.java |   76 +-
 .../test/java/org/apache/log4j/VelocityTest.java   |    3 +-
 .../apache/log4j/bridge/LogEventWrapperTest.java   |    6 +-
 .../apache/log4j/builders/BuilderManagerTest.java  |   13 +-
 .../log4j/builders/Log4j2ListAppenderBuilder.java  |   40 +-
 .../filter/LevelRangeFilterBuilderTest.java        |   18 +-
 .../builders/layout/PatternLayoutBuilderTest.java  |   29 +-
 .../AbstractLog4j1ConfigurationConverterTest.java  |   17 +-
 .../config/AbstractLog4j1ConfigurationTest.java    |   89 +-
 .../org/apache/log4j/config/AsyncAppenderTest.java |   20 +-
 .../org/apache/log4j/config/AutoConfigTest.java    |   11 +-
 .../Log4j1ConfigurationConverterHadoopTest.java    |    2 -
 .../Log4j1ConfigurationConverterSparkTest.java     |    2 -
 .../config/Log4j1ConfigurationFactoryTest.java     |   21 +-
 .../log4j/config/MapRewriteAppenderTest.java       |   15 +-
 .../apache/log4j/config/NeutralFilterFixture.java  |    1 -
 .../config/PropertiesConfigurationFactoryTest.java |   10 +-
 .../log4j/config/PropertiesConfigurationTest.java  |   40 +-
 .../config/PropertiesReconfigurationTest.java      |   47 +-
 .../PropertiesRollingWithPropertiesTest.java       |   16 +-
 .../apache/log4j/config/RewriteAppenderTest.java   |   15 +-
 .../config/SocketAppenderConfigurationTest.java    |   17 +-
 .../org/apache/log4j/config/StartsWithFilter.java  |    1 -
 .../config/SyslogAppenderConfigurationTest.java    |   12 +-
 .../apache/log4j/config/SyslogAppenderTest.java    |    9 +-
 .../org/apache/log4j/config/TestConfigurator.java  |    8 +-
 .../log4j/config/XmlConfigurationFactoryTest.java  |   10 +-
 .../apache/log4j/config/XmlConfigurationTest.java  |    9 +-
 .../log4j/config/XmlReconfigurationTest.java       |   10 +-
 .../log4j/config/XmlRollingWithPropertiesTest.java |   15 +-
 .../org/apache/log4j/defaultInit/TestCase1.java    |   44 +-
 .../org/apache/log4j/defaultInit/TestCase2.java    |   51 +-
 .../org/apache/log4j/defaultInit/TestCase3.java    |   10 +-
 .../org/apache/log4j/defaultInit/TestCase4.java    |   53 +-
 .../apache/log4j/helpers/BoundedFIFOTestCase.java  |    4 +-
 .../apache/log4j/helpers/CyclicBufferTestCase.java |    6 +-
 .../org/apache/log4j/helpers/DateLayoutTest.java   |   12 +-
 .../log4j/helpers/OptionConverterLevelTest.java    |   21 +-
 .../log4j/helpers/OptionConverterTestCase.java     |    3 -
 .../log4j/helpers/PatternParserTestCase.java       |    2 +-
 .../apache/log4j/helpers/UtilLoggingLevelTest.java |   11 +-
 .../log4j/layout/Log4j1SyslogLayoutTest.java       |   24 +-
 .../apache/log4j/layout/Log4j1XmlLayoutTest.java   |   31 +-
 .../apache/log4j/pattern/FormattingInfoTest.java   |    1 -
 .../pattern/Log4j1LevelPatternConverterTest.java   |    8 +-
 .../pattern/Log4j1MdcPatternConverterTest.java     |    5 +-
 .../pattern/Log4j1NdcPatternConverterTest.java     |    5 +-
 .../apache/log4j/pattern/NameAbbreviatorTest.java  |    2 -
 .../org/apache/log4j/spi/LocationInfoTest.java     |    3 -
 .../apache/log4j/spi/ThrowableInformationTest.java |   25 +-
 .../test/java/org/apache/log4j/util/Compare.java   |   20 +-
 .../java/org/apache/log4j/util/ControlFilter.java  |    1 -
 .../log4j/util/EnhancedJunitTestRunnerFilter.java  |   17 +-
 .../test/java/org/apache/log4j/util/Filter.java    |    6 +-
 .../apache/log4j/util/SerializationTestHelper.java |   16 +-
 .../java/org/apache/log4j/util/Transformer.java    |    7 +-
 .../java/org/apache/log4j/xml/DOMTestCase.java     |   85 +-
 .../src/test/java/org/apache/log4j/xml/XLevel.java |   13 +-
 .../main/java/org/apache/logging/log4j/Dummy.java  |    3 +-
 .../org/apache/logging/log4j/message/Dummy.java    |    3 +-
 .../logging/log4j/message/ThreadDumpMessage.java   |    4 +-
 .../org/apache/logging/log4j/simple/Dummy.java     |    3 +-
 .../org/apache/logging/log4j/spi/Provider.java     |    3 +-
 .../org/apache/logging/log4j/status/Dummy.java     |    3 +-
 .../org/apache/logging/log4j/util/Base64Util.java  |    4 +-
 .../log4j/util/EnvironmentPropertySource.java      |    3 +-
 .../apache/logging/log4j/util/ProcessIdUtil.java   |    2 +-
 .../apache/logging/log4j/util/PropertySource.java  |    4 +-
 .../apache/logging/log4j/util/StackLocator.java    |   59 +-
 .../log4j/util/SystemPropertiesPropertySource.java |    3 +-
 .../util/internal/DefaultObjectInputFilter.java    |    5 +-
 .../log4j/util/java9/ProcessIdUtilTest.java        |    4 +-
 .../logging/log4j/util/java9/StackLocatorTest.java |   14 +-
 .../log4j/test/AbstractSerializationTest.java      |    7 +-
 .../logging/log4j/test/ListStatusListener.java     |    4 +-
 .../logging/log4j/test/SerializableMatchers.java   |   10 +-
 .../org/apache/logging/log4j/test/TestLogger.java  |  134 +-
 .../logging/log4j/test/TestLoggerContext.java      |    2 -
 .../log4j/test/TestLoggerContextFactory.java       |   17 +-
 .../logging/log4j/test/ThreadContextHolder.java    |    1 -
 .../log4j/test/ThreadContextUtilityClass.java      |   13 +-
 .../log4j/test/junit/AbstractFileCleaner.java      |    5 +-
 .../logging/log4j/test/junit/BundleTestInfo.java   |    2 -
 .../log4j/test/junit/CleanUpDirectories.java       |    1 -
 .../logging/log4j/test/junit/CleanUpFiles.java     |    1 -
 .../logging/log4j/test/junit/DirectoryCleaner.java |    7 +-
 .../log4j/test/junit/ExtensionContextAnchor.java   |    5 +-
 .../logging/log4j/test/junit/FileCleaner.java      |    4 +-
 .../log4j/test/junit/InitializesThreadContext.java |    6 +-
 .../junit/LogManagerLoggerContextFactoryRule.java  |    1 -
 .../log4j/test/junit/SecurityManagerTestRule.java  |    2 -
 .../logging/log4j/test/junit/SerialUtil.java       |    4 +-
 .../logging/log4j/test/junit/SetTestProperty.java  |   13 +-
 .../log4j/test/junit/StatusLoggerExtension.java    |   67 +-
 .../log4j/test/junit/StatusLoggerLevel.java        |    1 -
 .../test/junit/StatusLoggerLevelExtension.java     |    3 +-
 .../logging/log4j/test/junit/TempLoggingDir.java   |   11 +-
 .../log4j/test/junit/TempLoggingDirectory.java     |   25 +-
 .../log4j/test/junit/TestPropertyResolver.java     |   11 +-
 .../log4j/test/junit/TestPropertySource.java       |    6 +-
 .../log4j/test/junit/ThreadContextInitializer.java |   17 +-
 .../test/junit/ThreadContextMapExtension.java      |    4 +-
 .../log4j/test/junit/ThreadContextRule.java        |    1 -
 .../test/junit/TypeBasedParameterResolver.java     |    4 +-
 .../log4j/test/junit/UsingAnyThreadContext.java    |    4 +-
 .../log4j/test/junit/UsingStatusListener.java      |   14 +-
 .../log4j/test/junit/UsingTestProperties.java      |   14 +-
 .../log4j/test/junit/UsingThreadContextMap.java    |    4 +-
 .../log4j/test/junit/UsingThreadContextStack.java  |    4 +-
 .../log4j/test/util/OsgiServiceLocatorTest.java    |    1 -
 .../apache/logging/log4j/AbstractLoggerTest.java   |  320 +++-
 .../logging/log4j/CloseableThreadContextTest.java  |   34 +-
 .../org/apache/logging/log4j/EventLoggerTest.java  |    9 +-
 .../org/apache/logging/log4j/LambdaLoggerTest.java |  135 +-
 .../java/org/apache/logging/log4j/LevelTest.java   |    5 +-
 .../org/apache/logging/log4j/LogManagerTest.java   |   11 +-
 .../apache/logging/log4j/LoggerSupplierTest.java   |   43 +-
 .../java/org/apache/logging/log4j/LoggerTest.java  |  151 +-
 .../java/org/apache/logging/log4j/MarkerTest.java  |   11 +-
 .../logging/log4j/NoopThreadContextTest.java       |    6 +-
 .../log4j/ThreadContextInheritanceTest.java        |   11 +-
 .../apache/logging/log4j/ThreadContextTest.java    |   11 +-
 .../org/apache/logging/log4j/TraceLoggingTest.java |  236 ++-
 .../log4j/internal/DefaultLogBuilderTest.java      |   18 +-
 .../log4j/message/FormattedMessageTest.java        |    9 +-
 .../log4j/message/LocalizedMessageFactoryTest.java |   32 +-
 .../log4j/message/LocalizedMessageTest.java        |   17 +-
 .../logging/log4j/message/MapMessageTest.java      |  169 +-
 .../MessageFormatMessageSerializationTest.java     |    3 +-
 .../log4j/message/MessageFormatMessageTest.java    |   12 +-
 .../log4j/message/MessageFormatsPerfTest.java      |   24 +-
 .../log4j/message/ObjectArrayMessageTest.java      |    7 +-
 .../logging/log4j/message/ObjectMapMessage.java    |    1 -
 .../logging/log4j/message/ObjectMessageTest.java   |    7 +-
 .../log4j/message/ParameterFormatterTest.java      |  181 +-
 .../log4j/message/ParameterizedMessageTest.java    |   27 +-
 .../log4j/message/ReusableMessageFactoryTest.java  |   45 +-
 .../log4j/message/ReusableObjectMessageTest.java   |   13 +-
 .../message/ReusableParameterizedMessageTest.java  |   52 +-
 .../log4j/message/ReusableSimpleMessageTest.java   |   11 +-
 .../logging/log4j/message/SimpleMessageTest.java   |   10 +-
 .../log4j/message/StringFormattedMessageTest.java  |   12 +-
 .../log4j/message/StructuredDataMessageTest.java   |   32 +-
 .../log4j/message/ThreadDumpMessageTest.java       |   19 +-
 .../logging/log4j/simple/SimpleLoggerTest.java     |    5 +-
 .../log4j/spi/DefaultThreadContextMapTest.java     |   13 +-
 .../log4j/spi/DefaultThreadContextStackTest.java   |   19 +-
 .../logging/log4j/spi/LoggerAdapterTest.java       |   26 +-
 .../log4j/spi/MutableThreadContextStackTest.java   |    9 +-
 .../log4j/status/StatusConsoleListenerTest.java    |   53 +-
 .../status/StatusLoggerSerializationTest.java      |    4 +-
 .../apache/logging/log4j/test/BetterService.java   |    3 +-
 .../org/apache/logging/log4j/test/Service.java     |    3 +-
 .../org/apache/logging/log4j/test/Service1.java    |    3 +-
 .../org/apache/logging/log4j/test/Service2.java    |    3 +-
 .../log4j/test/junit/TempLoggingDirectoryTest.java |   13 +-
 .../log4j/test/junit/TestPropertySourceTest.java   |    4 +-
 .../org/apache/logging/log4j/util/CharsTest.java   |   17 +-
 .../apache/logging/log4j/util/ConstantsTest.java   |    5 +-
 .../logging/log4j/util/DeserializerHelper.java     |    4 +-
 ...EnvironmentPropertySourceSecurityManagerIT.java |    1 -
 .../log4j/util/EnvironmentPropertySourceTest.java  |   10 +-
 .../apache/logging/log4j/util/LambdaUtilTest.java  |   24 +-
 .../util/LegacyPropertiesCompatibilityTest.java    |    7 +-
 .../log4j/util/Log4jCharsetsPropertiesTest.java    |   10 +-
 .../logging/log4j/util/ProcessIdUtilTest.java      |    4 +-
 .../log4j/util/PropertiesPropertySourceTest.java   |    7 +-
 .../log4j/util/PropertiesUtilOrderTest.java        |   18 +-
 .../logging/log4j/util/PropertiesUtilTest.java     |   35 +-
 ...ropertyFilePropertySourceSecurityManagerIT.java |    7 +-
 .../log4j/util/PropertySourceCamelCaseTest.java    |    7 +-
 .../log4j/util/PropertySourceTokenizerTest.java    |    7 +-
 .../logging/log4j/util/ProviderUtilTest.java       |    8 +-
 .../logging/log4j/util/ServiceLoaderUtilTest.java  |   39 +-
 .../log4j/util/SortedArrayStringMapTest.java       |   51 +-
 .../logging/log4j/util/StackLocatorTestIT.java     |   38 +-
 .../logging/log4j/util/StackLocatorUtilTest.java   |   19 +-
 .../logging/log4j/util/StringBuildersTest.java     |    4 +-
 .../org/apache/logging/log4j/util/StringsTest.java |    6 +-
 .../logging/log4j/util/SystemPropertiesMain.java   |    4 +-
 ...mPropertiesPropertySourceSecurityManagerIT.java |    9 +-
 .../util/SystemPropertiesPropertySourceTest.java   |    2 -
 .../org/apache/logging/log4j/util/Unbox1Test.java  |   26 +-
 .../logging/log4j/util/Unbox2ConfigurableTest.java |   11 +-
 .../logging/log4j/CloseableThreadContext.java      |   10 +-
 .../main/java/org/apache/logging/log4j/Level.java  |    7 +-
 .../java/org/apache/logging/log4j/LogBuilder.java  |   82 +-
 .../java/org/apache/logging/log4j/LogManager.java  |   81 +-
 .../main/java/org/apache/logging/log4j/Logger.java |  523 +++++-
 .../org/apache/logging/log4j/MarkerManager.java    |    7 +-
 .../org/apache/logging/log4j/ThreadContext.java    |    5 +-
 .../logging/log4j/internal/DefaultLogBuilder.java  |   99 +-
 .../log4j/message/AbstractMessageFactory.java      |   84 +-
 .../log4j/message/AsynchronouslyFormattable.java   |    5 +-
 .../log4j/message/BasicThreadInformation.java      |    4 +-
 .../apache/logging/log4j/message/Clearable.java    |    1 -
 .../log4j/message/DefaultFlowMessageFactory.java   |    2 -
 .../logging/log4j/message/FormattedMessage.java    |   16 +-
 .../log4j/message/FormattedMessageFactory.java     |   66 +-
 .../logging/log4j/message/LocalizedMessage.java    |   17 +-
 .../log4j/message/LocalizedMessageFactory.java     |    5 +-
 .../apache/logging/log4j/message/MapMessage.java   |   32 +-
 .../log4j/message/MapMessageJsonFormatter.java     |   60 +-
 .../org/apache/logging/log4j/message/Message.java  |    1 -
 .../log4j/message/MessageCollectionMessage.java    |    5 +-
 .../logging/log4j/message/MessageFactory2.java     |   31 +-
 .../log4j/message/MessageFormatMessage.java        |    2 -
 .../log4j/message/MessageFormatMessageFactory.java |   66 +-
 .../logging/log4j/message/ObjectArrayMessage.java  |    1 -
 .../logging/log4j/message/ObjectMessage.java       |    5 +-
 .../logging/log4j/message/ParameterConsumer.java   |    1 -
 .../logging/log4j/message/ParameterFormatter.java  |   51 +-
 .../logging/log4j/message/ParameterVisitable.java  |    1 -
 .../log4j/message/ParameterizedMessage.java        |   26 +-
 .../log4j/message/ParameterizedMessageFactory.java |   66 +-
 .../ParameterizedNoReferenceMessageFactory.java    |    3 +-
 .../log4j/message/ReusableMessageFactory.java      |   79 +-
 .../message/ReusableParameterizedMessage.java      |   79 +-
 .../log4j/message/ReusableSimpleMessage.java       |    3 +-
 .../logging/log4j/message/SimpleMessage.java       |    7 +-
 .../log4j/message/SimpleMessageFactory.java        |   64 +-
 .../log4j/message/StringFormattedMessage.java      |   18 +-
 .../message/StringFormatterMessageFactory.java     |   67 +-
 .../logging/log4j/message/StringMapMessage.java    |    4 +-
 .../message/StructuredDataCollectionMessage.java   |   11 +-
 .../logging/log4j/message/StructuredDataId.java    |   31 +-
 .../log4j/message/StructuredDataMessage.java       |   32 +-
 .../logging/log4j/message/ThreadDumpMessage.java   |   19 +-
 .../logging/log4j/message/ThreadInformation.java   |    1 -
 .../apache/logging/log4j/simple/SimpleLogger.java  |  139 +-
 .../logging/log4j/simple/SimpleLoggerContext.java  |   26 +-
 .../log4j/simple/SimpleLoggerContextFactory.java   |   13 +-
 .../apache/logging/log4j/spi/AbstractLogger.java   | 1574 +++++++++++++----
 .../logging/log4j/spi/AbstractLoggerAdapter.java   |   23 +-
 .../log4j/spi/CleanableThreadContextMap.java       |    3 +-
 .../org/apache/logging/log4j/spi/CopyOnWrite.java  |    3 +-
 .../CopyOnWriteSortedArrayThreadContextMap.java    |    1 -
 .../logging/log4j/spi/DefaultThreadContextMap.java |   13 +-
 .../log4j/spi/DefaultThreadContextStack.java       |    3 +-
 .../apache/logging/log4j/spi/ExtendedLogger.java   |  166 +-
 .../logging/log4j/spi/ExtendedLoggerWrapper.java   |  117 +-
 .../GarbageFreeSortedArrayThreadContextMap.java    |    3 +-
 .../logging/log4j/spi/LocationAwareLogger.java     |    9 +-
 .../apache/logging/log4j/spi/LoggerContext.java    |    1 -
 .../logging/log4j/spi/LoggerContextFactory.java    |    9 +-
 .../apache/logging/log4j/spi/LoggerContextKey.java |    9 +-
 .../log4j/spi/LoggerContextShutdownEnabled.java    |    2 +-
 .../apache/logging/log4j/spi/LoggerRegistry.java   |    5 +-
 .../logging/log4j/spi/MessageFactory2Adapter.java  |   69 +-
 .../log4j/spi/MutableThreadContextStack.java       |    2 +-
 .../logging/log4j/spi/NoOpThreadContextMap.java    |    9 +-
 .../logging/log4j/spi/ObjectThreadContextMap.java  |    1 -
 .../org/apache/logging/log4j/spi/Provider.java     |   20 +-
 .../log4j/spi/ReadOnlyThreadContextMap.java        |    1 -
 .../apache/logging/log4j/spi/ThreadContextMap.java |    1 -
 .../logging/log4j/spi/ThreadContextMap2.java       |    1 -
 .../logging/log4j/spi/ThreadContextMapFactory.java |   19 +-
 .../logging/log4j/status/SimpleLoggerFactory.java  |    7 +-
 .../log4j/status/StatusConsoleListener.java        |   15 +-
 .../apache/logging/log4j/status/StatusData.java    |   16 +-
 .../logging/log4j/status/StatusListener.java       |    1 -
 .../apache/logging/log4j/status/StatusLogger.java  |  123 +-
 .../org/apache/logging/log4j/util/Activator.java   |   38 +-
 .../org/apache/logging/log4j/util/Base64Util.java  |    6 +-
 .../java/org/apache/logging/log4j/util/Cast.java   |    6 +-
 .../java/org/apache/logging/log4j/util/Chars.java  |    3 +-
 .../org/apache/logging/log4j/util/Constants.java   |   14 +-
 .../apache/logging/log4j/util/EnglishEnums.java    |    5 +-
 .../log4j/util/EnvironmentPropertySource.java      |    6 +-
 .../log4j/util/FilteredObjectInputStream.java      |   11 +-
 .../org/apache/logging/log4j/util/InternalApi.java |    3 +-
 .../org/apache/logging/log4j/util/LambdaUtil.java  |    4 +-
 .../org/apache/logging/log4j/util/LoaderUtil.java  |   31 +-
 .../apache/logging/log4j/util/LowLevelLogUtil.java |    9 +-
 .../util/MultiFormatStringBuilderFormattable.java  |    1 -
 .../logging/log4j/util/OsgiServiceLocator.java     |   16 +-
 .../util/PrivateSecurityManagerStackTraceUtil.java |    1 -
 .../apache/logging/log4j/util/ProcessIdUtil.java   |    3 +-
 .../log4j/util/PropertiesPropertySource.java       |    1 -
 .../apache/logging/log4j/util/PropertiesUtil.java  |   70 +-
 .../log4j/util/PropertyFilePropertySource.java     |    7 +-
 .../apache/logging/log4j/util/PropertySource.java  |   16 +-
 .../logging/log4j/util/ProviderActivator.java      |    2 -
 .../apache/logging/log4j/util/ProviderUtil.java    |   14 +-
 .../logging/log4j/util/ServiceLoaderUtil.java      |   49 +-
 .../logging/log4j/util/SortedArrayStringMap.java   |   13 +-
 .../apache/logging/log4j/util/StackLocator.java    |    3 +-
 .../logging/log4j/util/StackLocatorUtil.java       |    4 +-
 .../apache/logging/log4j/util/StringBuilders.java  |   39 +-
 .../org/apache/logging/log4j/util/Strings.java     |    6 +-
 .../log4j/util/SystemPropertiesPropertySource.java |    6 +-
 .../java/org/apache/logging/log4j/util/Timer.java  |   55 +-
 .../java/org/apache/logging/log4j/util/Unbox.java  |   18 +-
 .../log4j/util/internal/SerializationUtil.java     |   25 +-
 .../log4j/appserver/jetty/Log4j2Logger.java        |    1 -
 .../log4j/appserver/tomcat/TomcatLogger.java       |    8 +-
 .../logging/log4j/cassandra/CassandraAppender.java |   37 +-
 .../logging/log4j/cassandra/CassandraManager.java  |  108 +-
 .../log4j/cassandra/CassandraAppenderIT.java       |   32 +-
 .../logging/log4j/cassandra/CassandraRule.java     |   22 +-
 .../logging/log4j/FilterPerformanceComparison.java |   32 +-
 .../logging/log4j/PerformanceComparison.java       |    9 +-
 .../org/apache/logging/log4j/PerformanceRun.java   |    2 -
 .../apache/logging/log4j/core/SimplePerfTest.java  |   22 +-
 .../logging/log4j/core/ThreadedPerfTest.java       |   14 +-
 .../apache/logging/log4j/core/ThreadedTest.java    |   31 +-
 .../core/async/perftest/AbstractRunQueue.java      |   13 +-
 .../log4j/core/async/perftest/Histogram.java       |  127 +-
 .../log4j/core/async/perftest/IPerfTestRunner.java |   11 +-
 .../core/async/perftest/MultiThreadPerfTest.java   |   18 +-
 .../core/async/perftest/NoOpIdleStrategy.java      |    4 +-
 .../log4j/core/async/perftest/PerfTest.java        |   32 +-
 .../log4j/core/async/perftest/PerfTestDriver.java  |   49 +-
 .../async/perftest/PerfTestResultFormatter.java    |   50 +-
 .../core/async/perftest/ResponseTimeTest.java      |  103 +-
 .../log4j/core/async/perftest/RunConversant.java   |    6 +-
 .../log4j/core/async/perftest/RunJCTools.java      |    6 +-
 .../log4j/core/async/perftest/RunLog4j1.java       |    4 +-
 .../log4j/core/async/perftest/RunLog4j2.java       |    7 +-
 .../log4j/core/async/perftest/RunLogback.java      |    4 +-
 .../log4j/core/async/perftest/SimplePerfTest.java  |   35 +-
 .../logging/log4j/core/impl/ExtendedClassInfo.java |    8 +-
 .../log4j/core/impl/ExtendedStackTraceElement.java |   31 +-
 .../jackson/ExtendedStackTraceElementMixIn.java    |   14 +-
 .../Log4jStackTraceElementDeserializer.java        |   20 +-
 .../core/jackson/StackTraceElementConstants.java   |    1 -
 .../log4j/core/jackson/StackTraceElementMixIn.java |    7 +-
 .../logging/log4j/core/pattern/TextRenderer.java   |    1 -
 .../logging/log4j/core/time/MutableInstant.java    |    7 +-
 .../logging/log4j/core/util/SystemClock.java       |    1 -
 .../log4j/core/util/internal/UnsafeUtil.java       |    1 -
 .../org/apache/logging/log4j/core/util/Dummy.java  |    3 +-
 .../log4j/core/test/AvailablePortFinder.java       |    2 -
 .../test/AvailablePortSystemPropertyTestRule.java  |    1 -
 .../log4j/core/test/BasicConfigurationFactory.java |    4 +-
 .../apache/logging/log4j/core/test/Compiler.java   |   14 +-
 .../log4j/core/test/CoreLoggerContexts.java        |    5 +-
 .../logging/log4j/core/test/ExtendedLevels.java    |    2 +-
 .../log4j/core/test/GcFreeLoggingTestUtil.java     |   39 +-
 .../logging/log4j/core/test/ListErrorHandler.java  |    4 +-
 .../log4j/core/test/SystemPropertyTestRule.java    |    2 -
 .../logging/log4j/core/test/TestMarkers.java       |    4 +-
 .../core/test/appender/AlwaysFailAppender.java     |    4 +-
 .../log4j/core/test/appender/BlockingAppender.java |    5 +-
 .../core/test/appender/EncodingListAppender.java   |    9 +-
 .../log4j/core/test/appender/FailOnceAppender.java |   39 +-
 .../log4j/core/test/appender/InMemoryAppender.java |   21 +-
 .../log4j/core/test/appender/ListAppender.java     |   23 +-
 .../test/appender/db/jdbc/JdbcH2TestHelper.java    |    4 +-
 .../rolling/action/DummyFileAttributes.java        |    4 +-
 .../log4j/core/test/categories/Appenders.java      |    9 +
 .../log4j/core/test/categories/AsyncLoggers.java   |    3 +-
 .../log4j/core/test/categories/Configurations.java |    1 +
 .../log4j/core/test/categories/Layouts.java        |    4 +
 .../core/test/categories/PerformanceTests.java     |    3 +-
 .../log4j/core/test/hamcrest/FileMatchers.java     |   17 +-
 .../log4j/core/test/hamcrest/MapMatchers.java      |    8 +-
 .../test/junit/AbstractExternalFileCleaner.java    |   26 +-
 .../log4j/core/test/junit/AppenderResolver.java    |   19 +-
 .../logging/log4j/core/test/junit/CleanFiles.java  |    1 -
 .../core/test/junit/ConfigurationResolver.java     |    7 +-
 .../logging/log4j/core/test/junit/JdbcRule.java    |   10 +-
 .../logging/log4j/core/test/junit/JndiRule.java    |    3 -
 .../core/test/junit/LoggerContextResolver.java     |   56 +-
 .../log4j/core/test/junit/LoggerContextRule.java   |   48 +-
 .../log4j/core/test/junit/LoggerContextSource.java |    1 -
 .../log4j/core/test/junit/TestPropertyLookup.java  |    1 -
 .../test/junit/URLStreamHandlerFactoryRule.java    |   14 +-
 .../log4j/core/test/layout/Log4j2_1482_Test.java   |    8 +-
 .../log4j/core/test/net/mock/MockSyslogServer.java |    2 +-
 .../test/net/mock/MockSyslogServerFactory.java     |    9 +-
 .../core/test/net/mock/MockTlsSyslogServer.java    |   16 +-
 .../core/test/net/mock/MockUdpSyslogServer.java    |    1 -
 .../ssl/LegacyBsdTlsSyslogInputStreamReader.java   |    4 +-
 .../test/net/ssl/TlsSyslogInputStreamReader.java   |    7 +-
 .../net/ssl/TlsSyslogInputStreamReaderBase.java    |    3 +-
 .../log4j/core/test/smtp/SimpleSmtpServer.java     |    3 -
 .../logging/log4j/core/test/smtp/SmtpMessage.java  |    5 +-
 .../logging/log4j/core/test/smtp/SmtpRequest.java  |   10 +-
 .../logging/log4j/core/test/util/Profiler.java     |   21 +-
 .../log4j/FormatterLoggerManualExample.java        |    7 +-
 .../org/apache/logging/log4j/LogRolloverTest.java  |    7 +-
 .../apache/logging/log4j/LogbackSubstitution.java  |    2 -
 .../apache/logging/log4j/MarkerMixInJsonTest.java  |    1 -
 .../org/apache/logging/log4j/MarkerMixInTest.java  |    3 +-
 .../apache/logging/log4j/MarkerMixInXmlTest.java   |    1 -
 .../apache/logging/log4j/MarkerMixInYamlTest.java  |    1 -
 .../log4j/core/AppenderRefLevelJsonTest.java       |   11 +-
 .../logging/log4j/core/AppenderRefLevelTest.java   |   10 +-
 .../logging/log4j/core/CollectionLoggingTest.java  |    2 -
 .../apache/logging/log4j/core/CronRolloverApp.java |    3 +-
 .../log4j/core/CustomLevelsOverrideTest.java       |    9 +-
 .../logging/log4j/core/CustomLevelsTest.java       |    9 +-
 .../log4j/core/CustomLevelsWithFiltersTest.java    |    5 +-
 .../log4j/core/EventParameterMemoryLeakTest.java   |   10 +-
 .../logging/log4j/core/ExtendedLevelTest.java      |    9 +-
 .../log4j/core/GarbageCollectionHelper.java        |   10 +-
 .../apache/logging/log4j/core/HostNameTest.java    |   27 +-
 .../apache/logging/log4j/core/LateConfigTest.java  |   13 +-
 .../org/apache/logging/log4j/core/LevelTest.java   |   52 +-
 .../apache/logging/log4j/core/Log4j1222Test.java   |   13 +-
 .../logging/log4j/core/LogEventFactoryTest.java    |   65 +-
 .../apache/logging/log4j/core/LogEventTest.java    |   13 +-
 .../apache/logging/log4j/core/LoggerDateTest.java  |    5 +-
 .../log4j/core/LoggerSerializationTest.java        |   11 +-
 .../org/apache/logging/log4j/core/LoggerTest.java  |   59 +-
 .../logging/log4j/core/LoggerUpdateTest.java       |    9 +-
 .../org/apache/logging/log4j/core/LookupTest.java  |    8 +-
 ...rnResolverDoesNotEvaluateThreadContextTest.java |   38 +-
 .../logging/log4j/core/PatternSelectorTest.java    |   47 +-
 .../log4j/core/PatternVariableResolverTest.java    |    6 +-
 .../log4j/core/PropertiesFileConfigTest.java       |    7 +-
 ...ReusableParameterizedMessageMemoryLeakTest.java |   10 +-
 .../logging/log4j/core/ShutdownDisabledTest.java   |    5 +-
 .../core/ShutdownTimeoutConfigurationTest.java     |    5 +-
 .../logging/log4j/core/StrictXmlConfigTest.java    |    5 +-
 .../logging/log4j/core/TestPatternConverters.java  |    4 +-
 .../logging/log4j/core/TimestampMessageTest.java   |    7 +-
 .../org/apache/logging/log4j/core/XmlEvents.java   |    1 -
 .../core/appender/AbstractAppenderBuilderTest.java |    9 +-
 .../appender/AsyncAppenderQueueFullPolicyTest.java |    8 +-
 .../log4j/core/appender/AsyncAppenderTest.java     |   18 +-
 .../core/appender/ConfigurationTestUtils.java      |    1 -
 .../appender/ConsoleAppenderAnsiMessagesMain.java  |    6 +-
 .../ConsoleAppenderAnsiStyleJira180Main.java       |    5 +-
 .../ConsoleAppenderAnsiStyleJira272Main.java       |    4 +-
 .../ConsoleAppenderAnsiStyleJira319Main.java       |    5 +-
 .../ConsoleAppenderAnsiStyleLayoutMain.java        |    9 +-
 .../ConsoleAppenderAnsiStyleNameLayoutMain.java    |    5 +-
 .../core/appender/ConsoleAppenderBuilderTest.java  |   14 +-
 .../ConsoleAppenderDefaultSuppressedThrowable.java |   10 +-
 .../ConsoleAppenderHighlightLayoutDefaultMain.java |    5 +-
 .../ConsoleAppenderHighlightLayoutLogbackMain.java |    5 +-
 .../ConsoleAppenderHighlightLayoutMain.java        |    6 +-
 .../appender/ConsoleAppenderJAnsiMessageMain.java  |   18 +-
 .../ConsoleAppenderJAnsiXExceptionMain.java        |    6 +-
 ...leAppenderJira1002ShortThrowableLayoutMain.java |    2 -
 .../ConsoleAppenderNoAnsiStyleLayoutMain.java      |    6 +-
 .../log4j/core/appender/ConsoleAppenderTest.java   |   38 +-
 .../CsvJsonParameterLayoutFileAppenderTest.java    |    7 +-
 .../log4j/core/appender/FailoverAppenderTest.java  |   11 +-
 .../FailoverFailedPrimaryAppenderTest.java         |    7 +-
 .../core/appender/FileAppenderBuilderTest.java     |   22 +-
 .../core/appender/FileAppenderPermissionsTest.java |   96 +-
 .../log4j/core/appender/FileAppenderTest.java      |  134 +-
 .../log4j/core/appender/HangingAppender.java       |   11 +-
 .../log4j/core/appender/HttpAppenderTest.java      |  223 +--
 .../log4j/core/appender/InMemoryAppenderTest.java  |   10 +-
 .../core/appender/JansiConsoleAppenderJira965.java |    1 -
 .../logging/log4j/core/appender/Jira739Test.java   |    5 +-
 .../appender/JsonCompleteFileAppenderTest.java     |   33 +-
 .../appender/MemoryMappedFileAppenderTest.java     |   28 +-
 .../core/appender/MemoryMappedFileManagerTest.java |   19 +-
 .../core/appender/OutputStreamAppenderTest.java    |   23 +-
 .../core/appender/OutputStreamManagerTest.java     |   23 +-
 .../log4j/core/appender/ProgressConsoleTest.java   |    5 +-
 .../appender/RandomAccessFileAppenderTest.java     |   27 +-
 .../core/appender/RandomAccessFileManagerTest.java |   31 +-
 .../core/appender/ReconfigureAppenderTest.java     |   61 +-
 ...ollingRandomAccessFileAppenderRolloverTest.java |    8 +-
 .../core/appender/ScriptAppenderSelectorTest.java  |   11 +-
 .../SecureSocketAppenderSocketOptionsTest.java     |   12 +-
 .../log4j/core/appender/SmtpAppenderAsyncTest.java |    7 +-
 .../log4j/core/appender/SmtpAppenderTest.java      |   40 +-
 .../appender/SocketAppenderBufferSizeTest.java     |    1 -
 .../core/appender/SocketAppenderBuilderTest.java   |    7 +-
 .../appender/SocketAppenderSocketOptionsTest.java  |    8 +-
 .../log4j/core/appender/SocketAppenderTest.java    |   85 +-
 .../appender/SyslogAppenderCustomLayoutTest.java   |    9 +-
 .../log4j/core/appender/SyslogAppenderTest.java    |   53 +-
 .../core/appender/SyslogAppenderTestBase.java      |   27 +-
 .../log4j/core/appender/TlsSyslogAppenderTest.java |   20 +-
 .../log4j/core/appender/TlsSyslogFrameTest.java    |    7 +-
 .../log4j/core/appender/WriterAppenderTest.java    |   12 +-
 .../core/appender/XmlCompactFileAppenderTest.java  |    9 +-
 .../XmlCompactFileAppenderValidationTest.java      |    6 +-
 .../XmlCompactFileAsyncAppenderValidationTest.java |    7 +-
 .../core/appender/XmlCompleteFileAppenderTest.java |   66 +-
 .../log4j/core/appender/XmlFileAppenderTest.java   |   13 +-
 .../appender/XmlRandomAccessFileAppenderTest.java  |    8 +-
 .../appender/db/AbstractDatabaseAppenderTest.java  |   31 +-
 .../appender/db/AbstractDatabaseManagerTest.java   |   10 +-
 .../core/appender/db/jdbc/AbstractH2Test.java      |    2 -
 .../jdbc/AbstractJdbcAppenderDataSourceTest.java   |   40 +-
 .../AbstractJdbcAppenderFactoryMethodTest.java     |   47 +-
 .../db/jdbc/AbstractJdbcDataSourceTest.java        |    2 -
 .../core/appender/db/jdbc/ColumnConfigTest.java    |  120 +-
 .../db/jdbc/DataSourceConnectionSourceTest.java    |   32 +-
 .../jdbc/DriverManagerH2ConnectionSourceTest.java  |   23 +-
 .../db/jdbc/FactoryMethodConnectionSourceTest.java |   38 +-
 .../jdbc/JdbcAppenderColumnMappingLiteralTest.java |   27 +-
 .../jdbc/JdbcAppenderColumnMappingPatternTest.java |   32 +-
 .../JdbcAppenderColumnMappingPropertiesTest.java   |    9 +-
 .../db/jdbc/JdbcAppenderH2DataSourceTest.java      |    4 +-
 .../db/jdbc/JdbcAppenderH2FactoryMethodTest.java   |   14 +-
 .../db/jdbc/JdbcAppenderHsqldbDataSourceTest.java  |   24 +-
 .../jdbc/JdbcAppenderHsqldbFactoryMethodTest.java  |   30 +-
 .../jdbc/JdbcAppenderMapMessageDataSourceTest.java |   32 +-
 .../jdbc/JdbcAppenderStringSubstitutionTest.java   |    4 +-
 .../log4j/core/appender/mom/JmsAppenderTest.java   |   33 +-
 .../appender/mom/jeromq/JeroMqAppenderTest.java    |   33 +-
 .../core/appender/mom/jeromq/JeroMqTestClient.java |    6 +-
 .../mom/kafka/KafkaAppenderCloseTimeoutTest.java   |   55 +-
 .../core/appender/mom/kafka/KafkaAppenderTest.java |  113 +-
 .../kafka/KafkaManagerProducerThreadLeakTest.java  |   11 +-
 .../core/appender/nosql/NoSqlAppenderTest.java     |   17 +-
 .../appender/nosql/NoSqlDatabaseManagerTest.java   |  177 +-
 .../rewrite/LoggerNameLevelRewritePolicyTest.java  |   66 +-
 .../appender/rewrite/MapRewritePolicyTest.java     |   48 +-
 .../core/appender/rewrite/RewriteAppenderTest.java |   11 +-
 .../appender/rolling/CronTriggeringPolicyTest.java |   60 +-
 .../core/appender/rolling/EligibleFilesTest.java   |    8 +-
 .../log4j/core/appender/rolling/FileSizeTest.java  |   41 +-
 .../rolling/OnStartupTriggeringPolicyTest.java     |   37 +-
 .../appender/rolling/PatternProcessorTest.java     |   63 +-
 .../RandomRollingAppenderOnStartupTest.java        |   17 +-
 .../appender/rolling/RollingAppenderCountTest.java |    5 +-
 .../RollingAppenderCronAndSizeLookupTest.java      |   29 +-
 .../rolling/RollingAppenderCronAndSizeTest.java    |   37 +-
 .../RollingAppenderCronEvery2DirectTest.java       |   19 +-
 .../rolling/RollingAppenderCronEvery2Test.java     |   17 +-
 .../rolling/RollingAppenderCronOnStartupTest.java  |   14 +-
 .../rolling/RollingAppenderCronOnceADayTest.java   |   56 +-
 .../appender/rolling/RollingAppenderCronTest.java  |   25 +-
 .../RollingAppenderCustomDeleteActionTest.java     |   16 +-
 ...RollingAppenderDeleteAccumulatedCount1Test.java |   12 +-
 ...RollingAppenderDeleteAccumulatedCount2Test.java |   12 +-
 .../RollingAppenderDeleteAccumulatedSizeTest.java  |   10 +-
 .../rolling/RollingAppenderDeleteMaxDepthTest.java |   13 +-
 .../rolling/RollingAppenderDeleteNestedTest.java   |   12 +-
 .../RollingAppenderDeleteScriptFri13thTest.java    |   12 +-
 .../rolling/RollingAppenderDeleteScriptTest.java   |    8 +-
 .../rolling/RollingAppenderDirectCronTest.java     |   21 +-
 ...ollingAppenderDirectCustomDeleteActionTest.java |   22 +-
 .../RollingAppenderDirectWrite1906Test.java        |   40 +-
 .../RollingAppenderDirectWriteStartupSizeTest.java |   54 +-
 ...erDirectWriteTempCompressedFilePatternTest.java |    4 +-
 .../rolling/RollingAppenderDirectWriteTest.java    |   16 +-
 ...RollingAppenderDirectWriteWithFilenameTest.java |    8 +-
 ...llingAppenderDirectWriteWithHtmlLayoutTest.java |   21 +-
 ...lingAppenderDirectWriteWithReconfigureTest.java |   17 +-
 .../RollingAppenderNoUnconditionalDeleteTest.java  |   15 +-
 .../rolling/RollingAppenderOnStartup2Test.java     |   12 +-
 .../RollingAppenderOnStartupDirectTest.java        |   11 +-
 .../rolling/RollingAppenderOnStartupTest.java      |    9 +-
 .../rolling/RollingAppenderReconfigureTest.java    |   20 +-
 .../rolling/RollingAppenderRestartTest.java        |   30 +-
 ...RollingAppenderSizeCompressPermissionsTest.java |   27 +-
 .../rolling/RollingAppenderSizeMaxWidthTest.java   |   73 +-
 .../rolling/RollingAppenderSizeNoCompressTest.java |   20 +-
 .../appender/rolling/RollingAppenderSizeTest.java  |   32 +-
 .../rolling/RollingAppenderSizeWithTimeTest.java   |   13 +-
 ...llingAppenderTempCompressedFilePatternTest.java |   30 +-
 .../RollingAppenderTimeAndSizeDirectTest.java      |   18 +-
 .../rolling/RollingAppenderTimeAndSizeTest.java    |   34 +-
 .../appender/rolling/RollingAppenderTimeTest.java  |   18 +-
 .../rolling/RollingAppenderUncompressedTest.java   |   10 +-
 .../rolling/RollingDirectSize3490Test.java         |   14 +-
 .../RollingDirectSizeTimeNewDirectoryTest.java     |   15 +-
 .../rolling/RollingDirectTimeNewDirectoryTest.java |   22 +-
 .../rolling/RollingFileAppenderAccessTest.java     |   25 +-
 .../RollingFileAppenderInterruptedThreadTest.java  |   11 +-
 .../rolling/RollingFileAppenderLayoutTest.java     |    6 +-
 ...nderReconfigureUndefinedSystemPropertyTest.java |    3 +-
 .../rolling/RollingFileAppenderUpdateDataTest.java |   13 +-
 .../appender/rolling/RollingFileManagerTest.java   |   23 +-
 .../appender/rolling/RollingNewDirectoryTest.java  |   11 +-
 ...ingRandomAccessFileManagerHeaderFooterTest.java |   11 +-
 .../RollingRandomAccessFileManagerTest.java        |  184 +-
 ...omAppenderDirectWriteAndSwitchDirectorTest.java |    8 +-
 .../RollingRandomAppenderDirectWriteTest.java      |   18 +-
 ...gRandomAppenderDirectWriteWithFilenameTest.java |    8 +-
 .../appender/rolling/RolloverFilePatternTest.java  |   33 +-
 .../appender/rolling/RolloverWithPaddingTest.java  |   15 +-
 .../rolling/action/AbstractActionTest.java         |   23 +-
 .../rolling/action/Bzip2CompressActionTest.java    |  157 +-
 .../appender/rolling/action/DeleteActionTest.java  |   26 +-
 .../rolling/action/DeletingVisitorTest.java        |   18 +-
 .../core/appender/rolling/action/DurationTest.java |   33 +-
 .../rolling/action/FileRenameActionTest.java       |    9 +-
 .../core/appender/rolling/action/FileSizeTest.java |    5 +-
 .../appender/rolling/action/FixedCondition.java    |    3 +-
 .../rolling/action/IfAccumulatedFileCountTest.java |    9 +-
 .../rolling/action/IfAccumulatedFileSizeTest.java  |    9 +-
 .../core/appender/rolling/action/IfAllTest.java    |   12 +-
 .../core/appender/rolling/action/IfAnyTest.java    |   12 +-
 .../appender/rolling/action/IfFileNameTest.java    |   11 +-
 .../rolling/action/IfLastModifiedTest.java         |   15 +-
 .../core/appender/rolling/action/IfNotTest.java    |   16 +-
 .../appender/rolling/action/PathConditionTest.java |    5 +-
 .../action/PathSortByModificationTimeTest.java     |    6 +-
 .../rolling/action/ScriptConditionTest.java        |   14 +-
 .../rolling/action/SortingVisitorTest.java         |    9 +-
 .../routing/DefaultRouteScriptAppenderTest.java    |   17 +-
 .../appender/routing/JsonRoutingAppender2Test.java |    7 +-
 .../appender/routing/JsonRoutingAppenderTest.java  |    7 +-
 .../routing/PropertiesRoutingAppenderTest.java     |    7 +-
 .../appender/routing/RoutesScriptAppenderTest.java |   24 +-
 .../appender/routing/RoutingAppender2767Test.java  |   10 +-
 .../appender/routing/RoutingAppender3350Test.java  |    9 +-
 .../RoutingAppenderKeyLookupEvaluationTest.java    |    6 +-
 .../core/appender/routing/RoutingAppenderTest.java |    5 +-
 .../routing/RoutingAppenderWithJndiTest.java       |   41 +-
 .../routing/RoutingAppenderWithPurgingTest.java    |   84 +-
 .../routing/RoutingDefaultAppenderTest.java        |    7 +-
 .../async/AbstractAsyncThreadContextTestBase.java  |   41 +-
 .../async/AsyncAppenderExceptionHandlingTest.java  |   26 +-
 .../async/AsyncLoggerClassLoadDeadlockTest.java    |    6 +-
 .../core/async/AsyncLoggerConfigAutoFlushTest.java |    8 +-
 .../core/async/AsyncLoggerConfigErrorOnFormat.java |   14 +-
 .../log4j/core/async/AsyncLoggerConfigTest.java    |   25 +-
 .../log4j/core/async/AsyncLoggerConfigTest2.java   |    9 +-
 .../log4j/core/async/AsyncLoggerConfigTest3.java   |   13 +-
 .../log4j/core/async/AsyncLoggerConfigTest4.java   |   31 +-
 .../AsyncLoggerConfigUseAfterShutdownTest.java     |    2 +-
 .../AsyncLoggerConfigWithAsyncEnabledTest.java     |   12 +-
 ...AsyncLoggerContextSelectorInitialStateTest.java |    4 +-
 .../core/async/AsyncLoggerContextSelectorTest.java |    5 +-
 .../log4j/core/async/AsyncLoggerContextTest.java   |    7 +-
 .../AsyncLoggerCustomSelectorLocationTest.java     |   22 +-
 .../core/async/AsyncLoggerDefaultLocationTest.java |   14 +-
 .../AsyncLoggerEventTranslationExceptionTest.java  |   25 +-
 .../log4j/core/async/AsyncLoggerLocationTest.java  |   12 +-
 .../logging/log4j/core/async/AsyncLoggerTest.java  |   11 +-
 .../async/AsyncLoggerTestArgumentFreedOnError.java |   12 +-
 .../async/AsyncLoggerTestCachedThreadName.java     |   12 +-
 .../log4j/core/async/AsyncLoggerTestNanoTime.java  |   12 +-
 .../async/AsyncLoggerTestUncachedThreadName.java   |   12 +-
 .../core/async/AsyncLoggerThreadContextTest.java   |    9 +-
 .../async/AsyncLoggerThreadNameStrategyTest.java   |    5 +-
 .../async/AsyncLoggerTimestampMessageTest.java     |   17 +-
 .../async/AsyncLoggerUseAfterShutdownTest.java     |    7 +-
 .../async/AsyncLoggersWithAsyncAppenderTest.java   |    9 +-
 .../AsyncLoggersWithAsyncLoggerConfigTest.java     |    9 +-
 .../async/AsyncQueueFullPolicyFactoryTest.java     |   73 +-
 .../async/AsyncRootLoggerDefaultLocationTest.java  |   13 +-
 .../log4j/core/async/AsyncRootReloadTest.java      |    1 -
 .../async/AsyncThreadContextCopyOnWriteTest.java   |    1 -
 .../core/async/AsyncThreadContextDefaultTest.java  |    1 -
 .../async/AsyncThreadContextGarbageFreeTest.java   |    1 -
 ...WaitStrategyFactoryConfigGlobalLoggersTest.java |   24 +-
 .../async/AsyncWaitStrategyFactoryConfigTest.java  |   44 +-
 ...egyFactoryIncorrectConfigGlobalLoggersTest.java |   25 +-
 .../async/BasicAsyncLoggerContextSelectorTest.java |   14 +-
 .../logging/log4j/core/async/BlockingAppender.java |    5 +-
 .../async/DefaultAsyncQueueFullPolicyTest.java     |    4 +-
 .../async/DiscardingAsyncQueueFullPolicyTest.java  |    7 +-
 .../log4j/core/async/Log4j2Jira1688AsyncTest.java  |   13 +-
 .../log4j/core/async/Log4j2Jira1688Test.java       |   10 +-
 .../log4j/core/async/QueueFullAbstractTest.java    |   90 +-
 .../core/async/QueueFullAsyncAppenderTest.java     |    7 +-
 .../core/async/QueueFullAsyncAppenderTest2.java    |    1 -
 ...llAsyncLoggerConfigLoggingFromToStringTest.java |   10 +-
 ...lAsyncLoggerConfigLoggingFromToStringTest2.java |    5 +-
 .../core/async/QueueFullAsyncLoggerConfigTest.java |    7 +-
 .../async/QueueFullAsyncLoggerConfigTest2.java     |    2 -
 ...ueueFullAsyncLoggerLoggingFromToStringTest.java |   12 +-
 ...eueFullAsyncLoggerLoggingFromToStringTest2.java |    6 +-
 .../log4j/core/async/QueueFullAsyncLoggerTest.java |   10 +-
 .../core/async/QueueFullAsyncLoggerTest2.java      |    2 -
 .../core/async/QueueFullAsyncLoggerTest3.java      |   22 +-
 .../log4j/core/async/RingBufferLogEventTest.java   |  157 +-
 .../logging/log4j/core/config/AdvertiserTest.java  |   11 +-
 .../core/config/AppenderControlArraySetTest.java   |   26 +-
 .../config/CompositeConfigurationMissingTest.java  |   11 +-
 .../core/config/CompositeConfigurationTest.java    |  186 +-
 .../core/config/ConfigurationFactoryTest.java      |   18 +-
 .../core/config/ConfigurationPropertyTest.java     |    6 +-
 .../log4j/core/config/ConfigurationSourceTest.java |   25 +-
 .../core/config/ConfiguratorSetLevelTest.java      |    5 +-
 .../log4j/core/config/ConfiguratorTest.java        |   25 +-
 .../log4j/core/config/CustomConfigurationTest.java |   16 +-
 .../logging/log4j/core/config/FileOutputTest.java  |    6 +-
 .../log4j/core/config/InMemoryAdvertiser.java      |    1 -
 .../log4j/core/config/JiraLog4j2_2134Test.java     |   48 +-
 .../log4j/core/config/LoggerConfigTest.java        |   40 +-
 .../log4j/core/config/LoggersPluginTest.java       |    6 +-
 .../log4j/core/config/MissingRootLoggerTest.java   |   22 +-
 .../log4j/core/config/MockReliabilityStrategy.java |   19 +-
 .../core/config/MultipleTriggeringPolicyTest.java  |    6 +-
 .../log4j/core/config/NestedLoggerConfigTest.java  |   10 +-
 .../log4j/core/config/PropertiesPluginTest.java    |    4 +-
 .../logging/log4j/core/config/PropertyTest.java    |   75 +-
 .../core/config/ReconfigurationDeadlockTest.java   |   45 +-
 .../core/config/ReconfigurationFailureTest.java    |   13 +-
 .../log4j/core/config/ReliabilityStrategyTest.java |    7 +-
 .../log4j/core/config/TestConfigurator.java        |  141 +-
 .../log4j/core/config/TestConfiguratorError.java   |   11 +-
 .../log4j/core/config/TestMissingLanguage.java     |   51 +-
 .../logging/log4j/core/config/TestNoLanguages.java |   48 +-
 .../core/config/arbiters/BasicArbiterTest.java     |    7 +-
 .../config/arbiters/EnvironmentArbiterTest.java    |    7 +-
 .../core/config/arbiters/ScriptArbiterTest.java    |    6 +-
 .../core/config/arbiters/SelectArbiterTest.java    |    6 +-
 .../config/arbiters/SystemPropertyArbiterTest.java |    7 +-
 .../config/builder/ConfigurationAssemblerTest.java |   31 +-
 .../config/builder/ConfigurationBuilderTest.java   |  116 +-
 .../config/builder/CustomConfigurationFactory.java |   37 +-
 .../plugins/convert/DateTypeConverterTest.java     |    7 +-
 .../plugins/convert/TypeConverterRegistryTest.java |   19 +-
 .../config/plugins/convert/TypeConvertersTest.java |  303 ++--
 .../AnnotationProcessorCompilerErrorTest.java      |   36 +-
 .../core/config/plugins/processor/FakePlugin.java  |    3 +-
 .../config/plugins/processor/PluginCacheTest.java  |   10 +-
 .../plugins/processor/PluginProcessorTest.java     |    9 +-
 .../plugins/util/PluginManagerPackagesTest.java    |    9 +-
 .../util/ResolverUtilCustomProtocolTest.java       |   42 +-
 .../core/config/plugins/util/ResolverUtilTest.java |   34 +-
 .../AbstractPluginWithGenericBuilder.java          |    3 +-
 .../config/plugins/validation/HostAndPort.java     |    9 +-
 .../PluginWithGenericSubclassFoo1Builder.java      |    2 -
 .../plugins/validation/ValidatingPlugin.java       |    3 +-
 .../ValidatingPluginWithGenericBuilder.java        |    6 +-
 .../ValidatingPluginWithTypedBuilder.java          |    6 +-
 .../validators/RequiredValidatorTest.java          |   16 +-
 .../validators/ValidHostValidatorTest.java         |   10 +-
 .../validators/ValidPortValidatorTest.java         |   11 +-
 .../ValidatingPluginWithFailoverTest.java          |   18 +-
 .../ValidatingPluginWithGenericBuilderTest.java    |   25 +-
 ...ngPluginWithGenericSubclassFoo1BuilderTest.java |   25 +-
 .../ValidatingPluginWithTypedBuilderTest.java      |   26 +-
 .../properties/PropertiesConfigurationTest.java    |   19 +-
 .../core/config/xml/XmlConfigurationPropsTest.java |   17 +-
 .../core/config/xml/XmlConfigurationSecurity.java  |    9 +-
 .../log4j/core/config/xml/XmlLoggerPropsTest.java  |   53 +-
 .../log4j/core/config/xml/XmlSchemaTest.java       |   21 +-
 .../log4j/core/filter/AbstractFilterTest.java      |   17 +-
 .../log4j/core/filter/AbstractFilterableTest.java  |   21 +-
 .../core/filter/AbstractScriptFilterTest.java      |    9 +-
 .../log4j/core/filter/BurstFilterLogDelayTest.java |   16 +-
 .../logging/log4j/core/filter/BurstFilterTest.java |   17 +-
 .../log4j/core/filter/CompositeFilterTest.java     |    8 +-
 .../core/filter/DynamicThresholdFilterTest.java    |   38 +-
 .../filter/HttpThreadContextMapFilterTest.java     |   21 +-
 .../log4j/core/filter/LevelRangeFilterTest.java    |   14 +-
 .../logging/log4j/core/filter/MapFilterTest.java   |   11 +-
 .../log4j/core/filter/MarkerFilterTest.java        |   10 +-
 .../filter/MutableThreadContextMapFilterTest.java  |    8 +-
 .../log4j/core/filter/NoMarkerFilterTest.java      |   11 +-
 .../logging/log4j/core/filter/RegexFilterTest.java |   39 +-
 .../filter/ScriptFileFilterPropertiesTest.java     |    3 +-
 .../log4j/core/filter/ScriptFileFilterTest.java    |    3 +-
 .../log4j/core/filter/ScriptFilterTest.java        |    3 +-
 .../log4j/core/filter/ScriptRefFilterTest.java     |    3 +-
 .../core/filter/StructuredDataFilterTest.java      |   12 +-
 .../core/filter/ThreadContextMapFilterTest.java    |    8 +-
 .../log4j/core/filter/ThresholdFilterTest.java     |    4 +-
 .../logging/log4j/core/filter/TimeFilterTest.java  |  162 +-
 ...taFactoryPropertySetMissingConstructorTest.java |    5 +-
 .../impl/ContextDataFactoryPropertySetTest.java    |    4 +-
 .../log4j/core/impl/ContextDataFactoryTest.java    |    5 +-
 .../log4j/core/impl/FactoryTestStringMap.java      |    4 +-
 .../FactoryTestStringMapWithoutIntConstructor.java |   32 +-
 .../core/impl/JdkMapAdapterStringMapTest.java      |   28 +-
 .../log4j/core/impl/Log4jLogEventNanoTimeTest.java |    9 +-
 .../logging/log4j/core/impl/Log4jLogEventTest.java |   46 +-
 .../log4j/core/impl/MutableLogEventTest.java       |   34 +-
 .../NestedLoggingFromThrowableMessageTest.java     |    8 +-
 .../core/impl/NestedLoggingFromToStringTest.java   |   48 +-
 .../core/impl/ReusableLogEventFactoryTest.java     |   14 +-
 .../core/impl/ThreadContextDataInjectorTest.java   |   59 +-
 .../core/impl/ThrowableFormatOptionsTest.java      |  179 +-
 .../log4j/core/impl/ThrowableProxyHelperTest.java  |  103 +-
 .../core/impl/ThrowableProxyRendererTest.java      |   10 +-
 .../log4j/core/impl/ThrowableProxyTest.java        |  102 +-
 .../core/jackson/JacksonIssue429MyNamesTest.java   |   25 +-
 .../log4j/core/jackson/JacksonIssue429Test.java    |   12 +-
 .../log4j/core/jackson/LevelMixInJsonTest.java     |    1 -
 .../logging/log4j/core/jackson/LevelMixInTest.java |   10 +-
 .../log4j/core/jackson/LevelMixInXmlTest.java      |    4 +-
 .../log4j/core/jackson/LevelMixInYamlTest.java     |    1 -
 .../core/jackson/StackTraceElementMixInTest.java   |   21 +-
 .../apache/logging/log4j/core/jmx/ServerTest.java  |    5 +-
 .../core/layout/AbstractStringLayoutTest.java      |   20 +-
 .../ConcurrentLoggingWithGelfLayoutTest.java       |   14 +-
 .../ConcurrentLoggingWithJsonLayoutTest.java       |    8 +-
 .../log4j/core/layout/CsvLogEventLayoutTest.java   |   16 +-
 .../layout/CsvParameterLayoutAllAsyncTest.java     |    7 +-
 .../log4j/core/layout/CsvParameterLayoutTest.java  |   30 +-
 .../logging/log4j/core/layout/GelfLayout2Test.java |    6 +-
 .../logging/log4j/core/layout/GelfLayout3Test.java |    9 +-
 .../core/layout/GelfLayoutPatternSelectorTest.java |   14 +-
 .../logging/log4j/core/layout/GelfLayoutTest.java  |  140 +-
 .../logging/log4j/core/layout/HtmlLayoutTest.java  |   60 +-
 .../log4j/core/layout/JsonLayoutMillisTest.java    |   12 +-
 .../logging/log4j/core/layout/JsonLayoutTest.java  |  125 +-
 .../log4j/core/layout/Log4j2_1482_CoreTest.java    |    1 -
 .../log4j/core/layout/Log4j2_2195_Test.java        |    5 +-
 .../log4j/core/layout/LogEventFixtures.java        |   27 +-
 .../core/layout/PatternLayoutLookupDateTest.java   |    5 +-
 .../layout/PatternLayoutMainMapLookupTest.java     |    8 +-
 .../core/layout/PatternLayoutNoLookupDateTest.java |    1 -
 .../log4j/core/layout/PatternLayoutTest.java       |  517 ++++--
 .../log4j/core/layout/PatternSelectorTest.java     |   54 +-
 .../log4j/core/layout/Rfc5424LayoutTest.java       |  341 +++-
 .../log4j/core/layout/SerializedLayoutTest.java    |   17 +-
 .../core/layout/StringBuilderEncoderTest.java      |   37 +-
 .../log4j/core/layout/SyslogLayoutTest.java        |   10 +-
 .../logging/log4j/core/layout/XmlLayoutTest.java   |   32 +-
 .../logging/log4j/core/layout/YamlLayoutTest.java  |   62 +-
 .../logging/log4j/core/lookup/CaseLookupTest.java  |    5 +-
 .../log4j/core/lookup/ContextMapLookupTest.java    |   38 +-
 .../logging/log4j/core/lookup/DateLookupTest.java  |   11 +-
 .../log4j/core/lookup/EnvironmentLookupTest.java   |    4 +-
 .../logging/log4j/core/lookup/EventLookupTest.java |   23 +-
 .../log4j/core/lookup/InterpolatorTest.java        |   44 +-
 .../log4j/core/lookup/JndiDisabledLookupTest.java  |    4 +-
 .../logging/log4j/core/lookup/JndiExploit.java     |    8 +-
 .../logging/log4j/core/lookup/JndiLookupTest.java  |    5 +-
 .../core/lookup/JndiRestrictedLookupTest.java      |    5 +-
 .../logging/log4j/core/lookup/Log4jLookupTest.java |   15 +-
 .../core/lookup/Log4jLookupWithSpacesTest.java     |   17 +-
 .../lookup/MainInputArgumentsJmxLookupTest.java    |    5 +-
 .../core/lookup/MainInputArgumentsLookupApp.java   |    5 +-
 .../core/lookup/MainInputArgumentsMapLookup.java   |    1 -
 .../logging/log4j/core/lookup/MainLookupTest.java  |   10 +-
 .../logging/log4j/core/lookup/MapLookupTest.java   |   41 +-
 .../log4j/core/lookup/MarkerLookupConfigTest.java  |   10 +-
 .../log4j/core/lookup/MarkerLookupTest.java        |   17 +-
 .../log4j/core/lookup/PropertiesLookupTest.java    |   23 +-
 .../core/lookup/ResourceBundleLookupTest.java      |    4 +-
 .../log4j/core/lookup/StrSubstitutorTest.java      |   14 +-
 .../core/lookup/StructuredDataLookupTest.java      |   16 +-
 .../core/lookup/SystemPropertiesLookupTest.java    |    4 +-
 .../message/ExtendedThreadInformationTest.java     |    6 +-
 .../logging/log4j/core/net/JndiManagerTest.java    |   12 +-
 .../logging/log4j/core/net/PriorityTest.java       |    4 +-
 .../logging/log4j/core/net/SmtpManagerTest.java    |   51 +-
 .../core/net/SocketAppenderReconnectTest.java      |   99 +-
 .../log4j/core/net/UrlConnectionFactoryTest.java   |   41 +-
 .../net/ssl/EnvironmentPasswordProviderTest.java   |    4 +-
 .../core/net/ssl/FilePasswordProviderTest.java     |    5 +-
 .../core/net/ssl/KeyStoreConfigurationTest.java    |   91 +-
 .../core/net/ssl/MemoryPasswordProviderTest.java   |    5 +-
 .../core/net/ssl/SslConfigurationFactoryTest.java  |    9 +-
 .../log4j/core/net/ssl/SslConfigurationTest.java   |   61 +-
 .../log4j/core/net/ssl/StoreConfigurationTest.java |    4 +-
 .../logging/log4j/core/net/ssl/TestConstants.java  |   33 +-
 .../core/net/ssl/TrustStoreConfigurationTest.java  |   39 +-
 .../log4j/core/parser/JsonLogEventParserTest.java  |   93 +-
 .../log4j/core/parser/LogEventParserTest.java      |   15 +-
 .../log4j/core/parser/XmlLogEventParserTest.java   |   94 +-
 .../log4j/core/parser/YamlLogEventParserTest.java  |   85 +-
 .../log4j/core/pattern/CallerInformationTest.java  |    5 +-
 .../core/pattern/DatePatternConverterTest.java     |   76 +-
 .../log4j/core/pattern/DisableAnsiTest.java        |   11 +-
 .../core/pattern/DynamicWordAbbreviatorTest.java   |   29 +-
 .../core/pattern/EncodingPatternConverterTest.java |   66 +-
 .../pattern/EndOfBatchPatternConverterTest.java    |   11 +-
 .../EqualsIgnoreCaseReplacementConverterTest.java  |   10 +-
 .../pattern/EqualsReplacementConverterTest.java    |   32 +-
 .../ExtendedThrowablePatternConverterTest.java     |   42 +-
 .../log4j/core/pattern/ExtendedThrowableTest.java  |    5 +-
 .../log4j/core/pattern/FormattingInfoTest.java     |    7 +-
 .../log4j/core/pattern/HighlightConverterTest.java |  104 +-
 .../core/pattern/LevelPatternConverterTest.java    |   45 +-
 .../core/pattern/LiteralPatternConverterTest.java  |    5 +-
 .../pattern/LoggerFqcnPatternConverterTest.java    |    7 +-
 .../core/pattern/MapPatternConverterTest.java      |    4 +-
 .../core/pattern/MarkerPatternConverterTest.java   |   12 +-
 .../MarkerSimpleNamePatternConverterTest.java      |   12 +-
 .../log4j/core/pattern/MaxLengthConverterTest.java |   32 +-
 .../core/pattern/MdcPatternConverterTest.java      |   15 +-
 .../core/pattern/MessageJansiConverterTest.java    |   12 +-
 .../core/pattern/MessagePatternConverterTest.java  |   86 +-
 .../core/pattern/MessageStyledConverterTest.java   |   12 +-
 .../log4j/core/pattern/NameAbbreviatorTest.java    |   35 +-
 .../core/pattern/NanoTimePatternConverterTest.java |    7 +-
 .../core/pattern/NdcPatternConverterTest.java      |    5 +-
 .../log4j/core/pattern/NoConsoleNoAnsiTest.java    |   11 +-
 .../log4j/core/pattern/PatternParserTest.java      |   23 +-
 .../log4j/core/pattern/PatternParserTest2.java     |   15 +-
 .../pattern/ProcessIdPatternConverterTest.java     |    7 +-
 .../pattern/RegexReplacementConverterTest.java     |   18 +-
 .../log4j/core/pattern/RegexReplacementTest.java   |   20 +-
 .../core/pattern/RepeatPatternConverterTest.java   |   11 +-
 .../pattern/RootThrowablePatternConverterTest.java |   25 +-
 .../log4j/core/pattern/RootThrowableTest.java      |    5 +-
 .../SequenceNumberPatternConverterTest.java        |    7 +-
 ...quenceNumberPatternConverterZeroPaddedTest.java |    7 +-
 .../pattern/SimpleLiteralPatternConverterTest.java |    4 +-
 .../log4j/core/pattern/StyleConverterTest.java     |   29 +-
 .../core/pattern/ThreadIdPatternConverterTest.java |    7 +-
 .../pattern/ThreadNamePatternConverterTest.java    |    7 +-
 .../ThreadPriorityPatternConverterTest.java        |    7 +-
 .../pattern/ThrowablePatternConverterTest.java     |   63 +-
 .../logging/log4j/core/pattern/ThrowableTest.java  |    5 +-
 .../VariablesNotEmptyReplacementConverterTest.java |   11 +-
 .../core/selector/BasicContextSelectorTest.java    |    9 +-
 .../selector/ClassLoaderContextSelectorTest.java   |    8 +-
 .../log4j/core/selector/TestClassLoader.java       |    1 -
 .../logging/log4j/core/test/LogBuilderTest.java    |   15 +-
 .../log4j/core/time/MutableInstantTest.java        |   10 +-
 .../log4j/core/tools/GenerateCustomLoggerTest.java |   35 +-
 .../core/tools/GenerateExtendedLoggerTest.java     |   35 +-
 .../apache/logging/log4j/core/util/AssertTest.java |   10 +-
 .../logging/log4j/core/util/ClockFactoryTest.java  |    8 +-
 .../log4j/core/util/ContextDataProviderTest.java   |    6 +-
 .../log4j/core/util/CronExpressionTest.java        |    6 +-
 .../logging/log4j/core/util/CyclicBufferTest.java  |    9 +-
 .../log4j/core/util/DummyNanoClockTest.java        |    5 +-
 .../logging/log4j/core/util/FileUtilsTest.java     |    5 +-
 .../apache/logging/log4j/core/util/InitTest.java   |    4 +-
 .../logging/log4j/core/util/IntegersTest.java      |    5 +-
 .../logging/log4j/core/util/JsonUtilsTest.java     |   19 +-
 .../apache/logging/log4j/core/util/LoaderTest.java |   10 +-
 .../logging/log4j/core/util/NetUtilsTest.java      |    8 +-
 .../log4j/core/util/OptionConverterTest.java       |   29 +-
 .../core/util/ShutdownCallbackRegistryTest.java    |   14 +-
 .../apache/logging/log4j/core/util/SourceTest.java |   48 +-
 .../logging/log4j/core/util/SystemClockTest.java   |    5 +-
 .../log4j/core/util/SystemNanoClockTest.java       |    6 +-
 .../logging/log4j/core/util/ThrowablesTest.java    |    4 +-
 .../log4j/core/util/UnexpectedFormatException.java |    8 +-
 .../apache/logging/log4j/core/util/UuidTest.java   |   37 +-
 .../logging/log4j/core/util/WatchHttpTest.java     |   39 +-
 .../logging/log4j/core/util/WatchManagerTest.java  |    5 +-
 .../core/util/datetime/FixedDateFormatTest.java    |  185 +-
 .../MutableLogEventWithReusableParamMsgTest.java   |    8 +-
 .../logging/log4j/core/AbstractLifeCycle.java      |    2 -
 .../logging/log4j/core/AbstractLogEvent.java       |    2 -
 .../org/apache/logging/log4j/core/Appender.java    |    1 -
 .../logging/log4j/core/ContextDataInjector.java    |    1 -
 .../java/org/apache/logging/log4j/core/Core.java   |    1 -
 .../log4j/core/DefaultLoggerContextAccessor.java   |    1 -
 .../java/org/apache/logging/log4j/core/Filter.java |   93 +-
 .../java/org/apache/logging/log4j/core/Layout.java |    1 -
 .../org/apache/logging/log4j/core/LifeCycle.java   |    1 -
 .../org/apache/logging/log4j/core/LogEvent.java    |    1 -
 .../logging/log4j/core/LogEventListener.java       |    1 -
 .../java/org/apache/logging/log4j/core/Logger.java |  245 ++-
 .../apache/logging/log4j/core/LoggerContext.java   |   82 +-
 .../logging/log4j/core/LoggerContextAccessor.java  |    1 -
 .../apache/logging/log4j/core/StringLayout.java    |    1 -
 .../org/apache/logging/log4j/core/Version.java     |    1 -
 .../log4j/core/appender/AbstractAppender.java      |   25 +-
 .../log4j/core/appender/AbstractFileAppender.java  |   15 +-
 .../log4j/core/appender/AbstractManager.java       |   21 +-
 .../appender/AbstractOutputStreamAppender.java     |   22 +-
 .../core/appender/AbstractWriterAppender.java      |   21 +-
 .../logging/log4j/core/appender/AppenderSet.java   |    6 +-
 .../logging/log4j/core/appender/AsyncAppender.java |   80 +-
 .../appender/AsyncAppenderEventDispatcher.java     |   19 +-
 .../core/appender/ConfigurationFactoryData.java    |    1 -
 .../log4j/core/appender/ConsoleAppender.java       |   88 +-
 .../log4j/core/appender/CountingNoOpAppender.java  |    3 +-
 .../log4j/core/appender/DefaultErrorHandler.java   |    6 +-
 .../log4j/core/appender/FailoverAppender.java      |   21 +-
 .../log4j/core/appender/FailoversPlugin.java       |    3 +-
 .../logging/log4j/core/appender/FileAppender.java  |   71 +-
 .../logging/log4j/core/appender/FileManager.java   |  135 +-
 .../logging/log4j/core/appender/HttpAppender.java  |   33 +-
 .../logging/log4j/core/appender/HttpManager.java   |    1 -
 .../core/appender/HttpURLConnectionManager.java    |   28 +-
 .../core/appender/MemoryMappedFileAppender.java    |   75 +-
 .../core/appender/MemoryMappedFileManager.java     |   96 +-
 .../logging/log4j/core/appender/NullAppender.java  |    7 +-
 .../log4j/core/appender/OutputStreamAppender.java  |   37 +-
 .../log4j/core/appender/OutputStreamManager.java   |   45 +-
 .../core/appender/RandomAccessFileAppender.java    |   60 +-
 .../core/appender/RandomAccessFileManager.java     |   68 +-
 .../log4j/core/appender/RollingFileAppender.java   |  104 +-
 .../appender/RollingRandomAccessFileAppender.java  |   91 +-
 .../core/appender/ScriptAppenderSelector.java      |   23 +-
 .../logging/log4j/core/appender/SmtpAppender.java  |   36 +-
 .../log4j/core/appender/SocketAppender.java        |  179 +-
 .../log4j/core/appender/SyslogAppender.java        |  120 +-
 .../log4j/core/appender/TlsSyslogFrame.java        |    2 -
 .../log4j/core/appender/WriterAppender.java        |   33 +-
 .../logging/log4j/core/appender/WriterManager.java |   12 +-
 .../core/appender/db/AbstractDatabaseAppender.java |   37 +-
 .../core/appender/db/AbstractDatabaseManager.java  |   18 +-
 .../log4j/core/appender/db/ColumnMapping.java      |   49 +-
 .../appender/db/DbAppenderLoggingException.java    |    1 -
 .../AbstractDriverManagerConnectionSource.java     |   26 +-
 .../log4j/core/appender/db/jdbc/ColumnConfig.java  |   45 +-
 .../core/appender/db/jdbc/ConnectionSource.java    |    1 -
 .../db/jdbc/DataSourceConnectionSource.java        |    9 +-
 .../db/jdbc/DriverManagerConnectionSource.java     |   21 +-
 .../db/jdbc/FactoryMethodConnectionSource.java     |   13 +-
 .../log4j/core/appender/db/jdbc/JdbcAppender.java  |   55 +-
 .../core/appender/db/jdbc/JdbcDatabaseManager.java |  351 ++--
 .../log4j/core/appender/mom/JmsAppender.java       |   48 +-
 .../log4j/core/appender/mom/JmsManager.java        |   96 +-
 .../core/appender/mom/jeromq/JeroMqAppender.java   |  118 +-
 .../core/appender/mom/jeromq/JeroMqManager.java    |  143 +-
 .../mom/kafka/DefaultKafkaProducerFactory.java     |    2 -
 .../core/appender/mom/kafka/KafkaAppender.java     |   58 +-
 .../core/appender/mom/kafka/KafkaManager.java      |   87 +-
 .../appender/mom/kafka/KafkaProducerFactory.java   |    2 -
 .../appender/nosql/AbstractNoSqlConnection.java    |    1 -
 .../core/appender/nosql/DefaultNoSqlObject.java    |    3 +-
 .../log4j/core/appender/nosql/NoSqlAppender.java   |   22 +-
 .../core/appender/nosql/NoSqlDatabaseManager.java  |   46 +-
 .../rewrite/LoggerNameLevelRewritePolicy.java      |   17 +-
 .../core/appender/rewrite/MapRewritePolicy.java    |    4 +-
 .../appender/rewrite/PropertiesRewritePolicy.java  |   18 +-
 .../core/appender/rewrite/RewriteAppender.java     |   17 +-
 .../log4j/core/appender/rewrite/RewritePolicy.java |    1 -
 .../appender/rolling/AbstractRolloverStrategy.java |   26 +-
 .../rolling/CompositeTriggeringPolicy.java         |    4 +-
 .../appender/rolling/CronTriggeringPolicy.java     |   14 +-
 .../appender/rolling/DefaultRolloverStrategy.java  |  123 +-
 .../rolling/DirectWriteRolloverStrategy.java       |   85 +-
 .../log4j/core/appender/rolling/FileExtension.java |   62 +-
 .../log4j/core/appender/rolling/FileSize.java      |    6 +-
 .../appender/rolling/NoOpTriggeringPolicy.java     |    1 -
 .../rolling/OnStartupTriggeringPolicy.java         |    8 +-
 .../core/appender/rolling/PatternProcessor.java    |   30 +-
 .../core/appender/rolling/RollingFileManager.java  |  272 ++-
 .../rolling/RollingRandomAccessFileManager.java    |  186 +-
 .../appender/rolling/RolloverDescriptionImpl.java  |    5 +-
 .../core/appender/rolling/RolloverStrategy.java    |    2 +-
 .../rolling/SizeBasedTriggeringPolicy.java         |    2 -
 .../rolling/TimeBasedTriggeringPolicy.java         |   15 +-
 .../core/appender/rolling/TriggeringPolicy.java    |    1 -
 .../appender/rolling/action/AbstractAction.java    |    6 +-
 .../rolling/action/AbstractPathAction.java         |   23 +-
 .../log4j/core/appender/rolling/action/Action.java |    1 -
 .../rolling/action/CommonsCompressAction.java      |   23 +-
 .../appender/rolling/action/CompositeAction.java   |    4 +-
 .../core/appender/rolling/action/DeleteAction.java |   22 +-
 .../appender/rolling/action/DeletingVisitor.java   |    5 +-
 .../core/appender/rolling/action/Duration.java     |   18 +-
 .../appender/rolling/action/FileRenameAction.java  |   89 +-
 .../appender/rolling/action/GzCompressAction.java  |   23 +-
 .../rolling/action/IfAccumulatedFileCount.java     |   10 +-
 .../rolling/action/IfAccumulatedFileSize.java      |   12 +-
 .../log4j/core/appender/rolling/action/IfAll.java  |    8 +-
 .../log4j/core/appender/rolling/action/IfAny.java  |    4 +-
 .../core/appender/rolling/action/IfFileName.java   |    7 +-
 .../appender/rolling/action/IfLastModified.java    |    5 +-
 .../log4j/core/appender/rolling/action/IfNot.java  |    4 +-
 .../rolling/action/PathSortByModificationTime.java |    1 -
 .../core/appender/rolling/action/PathSorter.java   |    4 +-
 .../rolling/action/PosixViewAttributeAction.java   |   40 +-
 .../appender/rolling/action/ScriptCondition.java   |    8 +-
 .../appender/rolling/action/SortingVisitor.java    |    1 -
 .../appender/rolling/action/ZipCompressAction.java |    8 +-
 .../core/appender/routing/IdlePurgePolicy.java     |   15 +-
 .../log4j/core/appender/routing/PurgePolicy.java   |    1 -
 .../log4j/core/appender/routing/Routes.java        |   21 +-
 .../core/appender/routing/RoutingAppender.java     |   52 +-
 .../core/async/ArrayBlockingQueueFactory.java      |    1 -
 .../logging/log4j/core/async/AsyncLogger.java      |  238 ++-
 .../log4j/core/async/AsyncLoggerConfig.java        |   91 +-
 .../AsyncLoggerConfigDefaultExceptionHandler.java  |    3 +-
 .../core/async/AsyncLoggerConfigDisruptor.java     |   66 +-
 .../log4j/core/async/AsyncLoggerContext.java       |   13 +-
 .../core/async/AsyncLoggerContextSelector.java     |    6 +-
 .../async/AsyncLoggerDefaultExceptionHandler.java  |    3 +-
 .../log4j/core/async/AsyncLoggerDisruptor.java     |  113 +-
 .../core/async/AsyncQueueFullMessageUtil.java      |    4 +-
 .../core/async/AsyncQueueFullPolicyFactory.java    |   12 +-
 .../core/async/AsyncWaitStrategyFactoryConfig.java |    1 -
 .../async/BasicAsyncLoggerContextSelector.java     |   11 +-
 .../async/DefaultAsyncWaitStrategyFactory.java     |   22 +-
 .../core/async/DiscardingAsyncQueueFullPolicy.java |   11 +-
 .../core/async/DisruptorBlockingQueueFactory.java  |    6 +-
 .../logging/log4j/core/async/DisruptorUtil.java    |   33 +-
 .../logging/log4j/core/async/EventRoute.java       |   38 +-
 .../core/async/JCToolsBlockingQueueFactory.java    |   14 +-
 .../core/async/LinkedTransferQueueFactory.java     |    1 -
 .../log4j/core/async/RingBufferLogEvent.java       |   30 +-
 .../core/async/RingBufferLogEventHandler.java      |   13 +-
 .../core/async/RingBufferLogEventTranslator.java   |   41 +-
 .../core/async/ThreadNameCachingStrategy.java      |   18 +-
 .../core/async/TimeoutBlockingWaitStrategy.java    |    8 +-
 .../log4j/core/config/AbstractConfiguration.java   |  103 +-
 .../logging/log4j/core/config/AppenderControl.java |    1 -
 .../log4j/core/config/AppenderControlArraySet.java |    4 +-
 .../logging/log4j/core/config/AppendersPlugin.java |    8 +-
 .../config/AwaitCompletionReliabilityStrategy.java |   28 +-
 .../AwaitUnconditionallyReliabilityStrategy.java   |   28 +-
 .../logging/log4j/core/config/Configuration.java   |    1 -
 .../log4j/core/config/ConfigurationException.java  |    1 -
 .../log4j/core/config/ConfigurationFactory.java    |   59 +-
 .../core/config/ConfigurationFileWatcher.java      |   16 +-
 .../log4j/core/config/ConfigurationScheduler.java  |   27 +-
 .../log4j/core/config/ConfigurationSource.java     |   21 +-
 .../logging/log4j/core/config/Configurator.java    |  128 +-
 .../log4j/core/config/CustomLevelConfig.java       |    6 +-
 .../logging/log4j/core/config/CustomLevels.java    |    3 +-
 .../log4j/core/config/DefaultAdvertiser.java       |    4 +-
 .../log4j/core/config/DefaultConfiguration.java    |    3 +-
 .../core/config/DefaultReliabilityStrategy.java    |   24 +-
 .../logging/log4j/core/config/HttpWatcher.java     |   23 +-
 .../config/LocationAwareReliabilityStrategy.java   |   11 +-
 .../core/config/LockingReliabilityStrategy.java    |   28 +-
 .../logging/log4j/core/config/LoggerConfig.java    |  127 +-
 .../logging/log4j/core/config/LoggersPlugin.java   |    7 +-
 .../org/apache/logging/log4j/core/config/Node.java |    7 +-
 .../log4j/core/config/NullConfiguration.java       |    1 -
 .../log4j/core/config/PropertiesPlugin.java        |   15 +-
 .../apache/logging/log4j/core/config/Property.java |    6 +-
 .../log4j/core/config/ReliabilityStrategy.java     |   11 +-
 .../core/config/ReliabilityStrategyFactory.java    |   18 +-
 .../logging/log4j/core/config/Scheduled.java       |    3 +-
 .../logging/log4j/core/config/ScriptsPlugin.java   |    3 +-
 .../log4j/core/config/arbiters/ClassArbiter.java   |   10 +-
 .../log4j/core/config/arbiters/DefaultArbiter.java |    8 +-
 .../core/config/arbiters/EnvironmentArbiter.java   |    9 +-
 .../log4j/core/config/arbiters/ScriptArbiter.java  |    9 +-
 .../log4j/core/config/arbiters/SelectArbiter.java  |   10 +-
 .../config/arbiters/SystemPropertyArbiter.java     |    9 +-
 .../builder/api/AppenderRefComponentBuilder.java   |    3 +-
 .../log4j/core/config/builder/api/Component.java   |    3 +-
 .../api/CompositeFilterComponentBuilder.java       |    3 +-
 .../config/builder/api/ConfigurationBuilder.java   |   10 -
 .../builder/api/CustomLevelComponentBuilder.java   |    4 +-
 .../config/builder/api/FilterComponentBuilder.java |    4 +-
 .../builder/api/KeyValuePairComponentBuilder.java  |    4 +-
 .../config/builder/api/LayoutComponentBuilder.java |    4 +-
 .../config/builder/api/LoggerComponentBuilder.java |    3 +-
 .../builder/api/PropertyComponentBuilder.java      |    4 +-
 .../builder/api/RootLoggerComponentBuilder.java    |    3 +-
 .../config/builder/api/ScriptComponentBuilder.java |    4 +-
 .../config/builder/impl/BuiltConfiguration.java    |   12 +-
 .../impl/DefaultAppenderComponentBuilder.java      |    4 +-
 .../impl/DefaultAppenderRefComponentBuilder.java   |    5 +-
 .../DefaultComponentAndConfigurationBuilder.java   |   16 +-
 .../builder/impl/DefaultComponentBuilder.java      |    6 +-
 .../DefaultCompositeFilterComponentBuilder.java    |    7 +-
 .../builder/impl/DefaultConfigurationBuilder.java  |   38 +-
 .../impl/DefaultCustomLevelComponentBuilder.java   |    4 +-
 .../impl/DefaultFilterComponentBuilder.java        |    7 +-
 .../impl/DefaultKeyValuePairComponentBuilder.java  |    6 +-
 .../impl/DefaultLayoutComponentBuilder.java        |    3 +-
 .../impl/DefaultLoggerComponentBuilder.java        |   26 +-
 .../impl/DefaultPropertyComponentBuilder.java      |    4 +-
 .../impl/DefaultRootLoggerComponentBuilder.java    |   23 +-
 .../impl/DefaultScriptComponentBuilder.java        |    7 +-
 .../impl/DefaultScriptFileComponentBuilder.java    |    4 +-
 .../config/composite/CompositeConfiguration.java   |   43 +-
 .../config/composite/DefaultMergeStrategy.java     |   59 +-
 .../log4j/core/config/json/JsonConfiguration.java  |   26 +-
 .../core/config/json/JsonConfigurationFactory.java |   10 +-
 .../logging/log4j/core/config/plugins/Plugin.java  |    1 -
 .../log4j/core/config/plugins/PluginAttribute.java |    2 -
 .../config/plugins/PluginBuilderAttribute.java     |    1 -
 .../core/config/plugins/PluginConfiguration.java   |    1 -
 .../log4j/core/config/plugins/PluginElement.java   |    1 -
 .../core/config/plugins/PluginLoggerContext.java   |    1 -
 .../log4j/core/config/plugins/PluginNode.java      |    1 -
 .../log4j/core/config/plugins/PluginValue.java     |    1 -
 .../core/config/plugins/PluginVisitorStrategy.java |    1 -
 .../config/plugins/convert/Base64Converter.java    |    7 +-
 .../config/plugins/convert/DateTypeConverter.java  |   11 +-
 .../core/config/plugins/convert/HexConverter.java  |    3 +-
 .../plugins/convert/TypeConverterRegistry.java     |   24 +-
 .../config/plugins/convert/TypeConverters.java     |   26 +-
 .../core/config/plugins/processor/PluginCache.java |    7 +-
 .../config/plugins/processor/PluginProcessor.java  |   24 +-
 .../core/config/plugins/util/PluginBuilder.java    |   84 +-
 .../core/config/plugins/util/PluginManager.java    |   29 +-
 .../core/config/plugins/util/PluginRegistry.java   |   26 +-
 .../log4j/core/config/plugins/util/PluginType.java |   14 +-
 .../log4j/core/config/plugins/util/PluginUtil.java |    5 +-
 .../core/config/plugins/util/ResolverUtil.java     |   43 +-
 .../plugins/validation/ConstraintValidators.java   |   15 +-
 .../plugins/validation/constraints/NotBlank.java   |    3 +-
 .../plugins/validation/constraints/Required.java   |    1 -
 .../plugins/validation/constraints/ValidHost.java  |    1 -
 .../plugins/validation/constraints/ValidPort.java  |    1 -
 .../validation/validators/RequiredValidator.java   |    1 -
 .../validation/validators/ValidHostValidator.java  |    1 -
 .../plugins/visitors/AbstractPluginVisitor.java    |    6 +-
 .../plugins/visitors/PluginAttributeVisitor.java   |    5 +-
 .../visitors/PluginBuilderAttributeVisitor.java    |    5 +-
 .../visitors/PluginConfigurationVisitor.java       |    9 +-
 .../plugins/visitors/PluginElementVisitor.java     |   23 +-
 .../visitors/PluginLoggerContextVisitor.java       |    4 +-
 .../config/plugins/visitors/PluginNodeVisitor.java |    4 +-
 .../plugins/visitors/PluginValueVisitor.java       |   17 +-
 .../config/plugins/visitors/PluginVisitor.java     |    1 -
 .../config/plugins/visitors/PluginVisitors.java    |    4 +-
 .../config/properties/PropertiesConfiguration.java |    6 +-
 .../properties/PropertiesConfigurationBuilder.java |   71 +-
 .../properties/PropertiesConfigurationFactory.java |    4 +-
 .../core/config/status/StatusConfiguration.java    |    6 +-
 .../log4j/core/config/xml/XmlConfiguration.java    |   41 +-
 .../log4j/core/config/yaml/YamlConfiguration.java  |    3 +-
 .../core/config/yaml/YamlConfigurationFactory.java |   13 +-
 .../logging/log4j/core/filter/AbstractFilter.java  |  141 +-
 .../log4j/core/filter/AbstractFilterable.java      |    3 -
 .../logging/log4j/core/filter/BurstFilter.java     |  148 +-
 .../logging/log4j/core/filter/CompositeFilter.java |  140 +-
 .../logging/log4j/core/filter/DenyAllFilter.java   |  142 +-
 .../log4j/core/filter/DynamicThresholdFilter.java  |  157 +-
 .../log4j/core/filter/LevelMatchFilter.java        |  142 +-
 .../log4j/core/filter/LevelRangeFilter.java        |  144 +-
 .../logging/log4j/core/filter/MapFilter.java       |  134 +-
 .../logging/log4j/core/filter/MarkerFilter.java    |  139 +-
 .../core/filter/MutableThreadContextMapFilter.java |  183 +-
 .../logging/log4j/core/filter/NoMarkerFilter.java  |  146 +-
 .../logging/log4j/core/filter/RegexFilter.java     |   25 +-
 .../logging/log4j/core/filter/ScriptFilter.java    |   23 +-
 .../log4j/core/filter/StringMatchFilter.java       |  163 +-
 .../log4j/core/filter/StructuredDataFilter.java    |    9 +-
 .../log4j/core/filter/ThreadContextMapFilter.java  |  155 +-
 .../logging/log4j/core/filter/ThresholdFilter.java |  139 +-
 .../logging/log4j/core/filter/TimeFilter.java      |  184 +-
 .../logging/log4j/core/impl/ContextAnchor.java     |    3 +-
 .../log4j/core/impl/ContextDataFactory.java        |    3 +-
 .../log4j/core/impl/DefaultLogEventFactory.java    |   24 +-
 .../logging/log4j/core/impl/ExtendedClassInfo.java |    2 -
 .../log4j/core/impl/ExtendedStackTraceElement.java |   22 +-
 .../log4j/core/impl/JdkMapAdapterStringMap.java    |    4 +-
 .../core/impl/LocationAwareLogEventFactory.java    |   12 +-
 .../log4j/core/impl/Log4jContextFactory.java       |   94 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java     |  515 ++++--
 .../logging/log4j/core/impl/LogEventFactory.java   |   11 +-
 .../logging/log4j/core/impl/MementoMessage.java    |   10 +-
 .../logging/log4j/core/impl/MutableLogEvent.java   |   13 +-
 .../log4j/core/impl/ReusableLogEventFactory.java   |   27 +-
 .../log4j/core/impl/ThreadContextDataInjector.java |   15 +-
 .../log4j/core/impl/ThreadContextDataProvider.java |    3 +-
 .../log4j/core/impl/ThrowableFormatOptions.java    |   44 +-
 .../logging/log4j/core/impl/ThrowableProxy.java    |   81 +-
 .../log4j/core/impl/ThrowableProxyHelper.java      |    5 +-
 .../log4j/core/impl/ThrowableProxyRenderer.java    |  157 +-
 .../ContextDataAsEntryListDeserializer.java        |   18 +-
 .../jackson/ContextDataAsEntryListSerializer.java  |    8 +-
 .../core/jackson/ContextDataDeserializer.java      |   17 +-
 .../log4j/core/jackson/ContextDataSerializer.java  |   30 +-
 .../jackson/ExtendedStackTraceElementMixIn.java    |   21 +-
 .../logging/log4j/core/jackson/Initializers.java   |   33 +-
 .../logging/log4j/core/jackson/InstantMixIn.java   |    9 +-
 .../logging/log4j/core/jackson/LevelMixIn.java     |    3 +-
 .../core/jackson/ListOfMapEntryDeserializer.java   |   20 +-
 .../core/jackson/ListOfMapEntrySerializer.java     |   10 +-
 .../log4j/core/jackson/Log4jJsonModule.java        |    6 +-
 .../log4j/core/jackson/Log4jJsonObjectMapper.java  |   10 +-
 .../Log4jStackTraceElementDeserializer.java        |   10 +-
 .../log4j/core/jackson/Log4jXmlObjectMapper.java   |    1 -
 .../log4j/core/jackson/Log4jYamlModule.java        |    5 +-
 .../log4j/core/jackson/Log4jYamlObjectMapper.java  |    6 +-
 .../log4j/core/jackson/LogEventJsonMixIn.java      |   35 +-
 .../core/jackson/LogEventWithContextListMixIn.java |   31 +-
 .../logging/log4j/core/jackson/MapEntry.java       |    5 +-
 .../logging/log4j/core/jackson/MarkerMixIn.java    |   23 +-
 .../log4j/core/jackson/MessageSerializer.java      |    8 +-
 .../MutableThreadContextStackDeserializer.java     |   16 +-
 .../core/jackson/ObjectMessageSerializer.java      |    8 +-
 .../core/jackson/SimpleMessageDeserializer.java    |    8 +-
 .../core/jackson/StackTraceElementConstants.java   |    1 -
 .../log4j/core/jackson/StackTraceElementMixIn.java |    7 +-
 .../log4j/core/jackson/ThrowableProxyMixIn.java    |    1 -
 .../ThrowableProxyWithStacktraceAsStringMixIn.java |    1 -
 .../ThrowableProxyWithoutStacktraceMixIn.java      |    1 -
 .../logging/log4j/core/jmx/AppenderAdmin.java      |    2 -
 .../logging/log4j/core/jmx/AppenderAdminMBean.java |    1 -
 .../logging/log4j/core/jmx/AsyncAppenderAdmin.java |    2 -
 .../log4j/core/jmx/ContextSelectorAdmin.java       |    2 -
 .../logging/log4j/core/jmx/LoggerConfigAdmin.java  |    2 -
 .../log4j/core/jmx/LoggerConfigAdminMBean.java     |    1 -
 .../logging/log4j/core/jmx/LoggerContextAdmin.java |   19 +-
 .../log4j/core/jmx/LoggerContextAdminMBean.java    |    2 -
 .../logging/log4j/core/jmx/RingBufferAdmin.java    |    8 +-
 .../org/apache/logging/log4j/core/jmx/Server.java  |   60 +-
 .../logging/log4j/core/jmx/StatusLoggerAdmin.java  |   13 +-
 .../log4j/core/jmx/StatusLoggerAdminMBean.java     |    2 -
 .../log4j/core/layout/AbstractCsvLayout.java       |   33 +-
 .../log4j/core/layout/AbstractJacksonLayout.java   |   84 +-
 .../logging/log4j/core/layout/AbstractLayout.java  |    2 -
 .../log4j/core/layout/AbstractStringLayout.java    |   18 +-
 .../log4j/core/layout/ByteBufferDestination.java   |    1 -
 .../core/layout/ByteBufferDestinationHelper.java   |    7 +-
 .../log4j/core/layout/CsvLogEventLayout.java       |   19 +-
 .../log4j/core/layout/CsvParameterLayout.java      |   19 +-
 .../logging/log4j/core/layout/GelfLayout.java      |  134 +-
 .../logging/log4j/core/layout/HtmlLayout.java      |   79 +-
 .../logging/log4j/core/layout/JacksonFactory.java  |   45 +-
 .../logging/log4j/core/layout/JsonLayout.java      |  158 +-
 .../log4j/core/layout/LevelPatternSelector.java    |   45 +-
 .../core/layout/LockingStringBuilderEncoder.java   |   13 +-
 .../logging/log4j/core/layout/LoggerFields.java    |   14 +-
 .../log4j/core/layout/MarkerPatternSelector.java   |   45 +-
 .../logging/log4j/core/layout/MessageLayout.java   |    1 -
 .../logging/log4j/core/layout/PatternLayout.java   |   93 +-
 .../logging/log4j/core/layout/PatternMatch.java    |    1 -
 .../logging/log4j/core/layout/Rfc5424Layout.java   |  112 +-
 .../log4j/core/layout/ScriptPatternSelector.java   |   58 +-
 .../log4j/core/layout/SerializedLayout.java        |    4 +-
 .../log4j/core/layout/StringBuilderEncoder.java    |   12 +-
 .../logging/log4j/core/layout/SyslogLayout.java    |    9 +-
 .../log4j/core/layout/TextEncoderHelper.java       |   79 +-
 .../logging/log4j/core/layout/XmlLayout.java       |   97 +-
 .../logging/log4j/core/layout/YamlLayout.java      |  142 +-
 .../log4j/core/layout/internal/IncludeChecker.java |    1 +
 .../log4j/core/layout/internal/ListChecker.java    |    1 -
 .../logging/log4j/core/lookup/AbstractLookup.java  |    1 -
 .../core/lookup/ConfigurationStrSubstitutor.java   |    3 +-
 .../logging/log4j/core/lookup/DateLookup.java      |    1 -
 .../logging/log4j/core/lookup/Interpolator.java    |   34 +-
 .../logging/log4j/core/lookup/JavaLookup.java      |   29 +-
 .../lookup/JmxRuntimeInputArgumentsLookup.java     |    4 +-
 .../logging/log4j/core/lookup/JndiLookup.java      |    2 -
 .../logging/log4j/core/lookup/Log4jLookup.java     |    5 +-
 .../logging/log4j/core/lookup/LookupResult.java    |    1 -
 .../logging/log4j/core/lookup/LowerLookup.java     |    4 +-
 .../logging/log4j/core/lookup/MainMapLookup.java   |    2 -
 .../logging/log4j/core/lookup/MapLookup.java       |    2 -
 .../logging/log4j/core/lookup/MarkerLookup.java    |    1 -
 .../log4j/core/lookup/PropertiesLookup.java        |   17 +-
 .../log4j/core/lookup/ResourceBundleLookup.java    |    1 -
 .../log4j/core/lookup/RuntimeStrSubstitutor.java   |    3 +-
 .../logging/log4j/core/lookup/StrLookup.java       |    8 +-
 .../logging/log4j/core/lookup/StrMatcher.java      |   22 +-
 .../logging/log4j/core/lookup/StrSubstitutor.java  |  158 +-
 .../logging/log4j/core/lookup/UpperLookup.java     |    4 +-
 .../core/message/ExtendedThreadInfoFactory.java    |    9 +-
 .../core/message/ExtendedThreadInformation.java    |   22 +-
 .../log4j/core/net/AbstractSocketManager.java      |   11 +-
 .../apache/logging/log4j/core/net/Advertiser.java  |    1 +
 .../log4j/core/net/DatagramOutputStream.java       |    1 -
 .../log4j/core/net/DatagramSocketManager.java      |   26 +-
 .../apache/logging/log4j/core/net/Facility.java    |    1 -
 .../apache/logging/log4j/core/net/JndiManager.java |   40 +-
 .../apache/logging/log4j/core/net/MailManager.java |   59 +-
 .../logging/log4j/core/net/MimeMessageBuilder.java |    4 +-
 .../log4j/core/net/MulticastDnsAdvertiser.java     |   19 +-
 .../apache/logging/log4j/core/net/SmtpManager.java |   91 +-
 .../logging/log4j/core/net/SocketAddress.java      |    2 -
 .../logging/log4j/core/net/SocketOptions.java      |   12 +-
 .../core/net/SocketPerformancePreferences.java     |    2 -
 .../logging/log4j/core/net/SslSocketManager.java   |  246 ++-
 .../logging/log4j/core/net/TcpSocketManager.java   |  164 +-
 .../log4j/core/net/UrlConnectionFactory.java       |   30 +-
 .../net/ssl/AbstractKeyStoreConfiguration.java     |   21 +-
 .../core/net/ssl/EnvironmentPasswordProvider.java  |    4 +-
 .../log4j/core/net/ssl/FilePasswordProvider.java   |    8 +-
 .../log4j/core/net/ssl/KeyStoreConfiguration.java  |   66 +-
 .../log4j/core/net/ssl/LaxHostnameVerifier.java    |    6 +-
 .../log4j/core/net/ssl/SslConfiguration.java       |   58 +-
 .../core/net/ssl/SslConfigurationDefaults.java     |    1 -
 .../core/net/ssl/SslConfigurationFactory.java      |   36 +-
 .../log4j/core/net/ssl/StoreConfiguration.java     |    1 -
 .../core/net/ssl/TrustStoreConfiguration.java      |   67 +-
 .../apache/logging/log4j/core/osgi/Activator.java  |   11 +-
 .../log4j/core/osgi/BundleContextSelector.java     |   31 +-
 .../core/parser/AbstractJacksonLogEventParser.java |    3 +-
 .../log4j/core/parser/JsonLogEventParser.java      |    1 -
 .../log4j/core/parser/XmlLogEventParser.java       |    1 -
 .../log4j/core/parser/YamlLogEventParser.java      |    1 -
 .../core/pattern/AbstractPatternConverter.java     |    1 -
 .../core/pattern/AbstractStyleNameConverter.java   |   18 +-
 .../logging/log4j/core/pattern/AnsiEscape.java     |   14 +-
 .../log4j/core/pattern/CachedDateFormat.java       |   33 +-
 .../core/pattern/ClassNamePatternConverter.java    |    5 +-
 .../log4j/core/pattern/DatePatternConverter.java   |    1 -
 .../log4j/core/pattern/DynamicWordAbbreviator.java |    4 +-
 .../core/pattern/EncodingPatternConverter.java     |   25 +-
 .../core/pattern/EndOfBatchPatternConverter.java   |    8 +-
 .../pattern/EqualsBaseReplacementConverter.java    |   11 +-
 .../EqualsIgnoreCaseReplacementConverter.java      |   10 +-
 .../core/pattern/EqualsReplacementConverter.java   |   10 +-
 .../pattern/ExtendedThrowablePatternConverter.java |   11 +-
 .../core/pattern/FileDatePatternConverter.java     |   10 +-
 .../core/pattern/FileLocationPatternConverter.java |    6 +-
 .../logging/log4j/core/pattern/FormattingInfo.java |   17 +-
 .../core/pattern/FullLocationPatternConverter.java |    5 +-
 .../log4j/core/pattern/HighlightConverter.java     |   27 +-
 .../log4j/core/pattern/HtmlTextRenderer.java       |    1 -
 .../core/pattern/IntegerPatternConverter.java      |    3 +-
 .../log4j/core/pattern/JAnsiTextRenderer.java      |   78 +-
 .../log4j/core/pattern/LevelPatternConverter.java  |    5 +-
 .../core/pattern/LineLocationPatternConverter.java |    8 +-
 .../pattern/LineSeparatorPatternConverter.java     |    2 +-
 .../core/pattern/LiteralPatternConverter.java      |    2 -
 .../core/pattern/LogEventPatternConverter.java     |    1 -
 .../core/pattern/LoggerFqcnPatternConverter.java   |    8 +-
 .../log4j/core/pattern/LoggerPatternConverter.java |    9 +-
 .../log4j/core/pattern/MapPatternConverter.java    |    3 +-
 .../log4j/core/pattern/MarkerPatternConverter.java |    2 +-
 .../pattern/MarkerSimpleNamePatternConverter.java  |    2 +-
 .../log4j/core/pattern/MaxLengthConverter.java     |   11 +-
 .../log4j/core/pattern/MdcPatternConverter.java    |    9 +-
 .../core/pattern/MessagePatternConverter.java      |   31 +-
 .../pattern/MethodLocationPatternConverter.java    |    5 +-
 .../log4j/core/pattern/NameAbbreviator.java        |   22 +-
 .../log4j/core/pattern/NamePatternConverter.java   |    1 -
 .../core/pattern/NanoTimePatternConverter.java     |    2 +-
 .../log4j/core/pattern/NdcPatternConverter.java    |    5 +-
 .../logging/log4j/core/pattern/NotANumber.java     |    3 +-
 .../log4j/core/pattern/PatternFormatter.java       |    1 +
 .../logging/log4j/core/pattern/PatternParser.java  |  345 ++--
 .../log4j/core/pattern/PlainTextRenderer.java      |    3 +-
 .../core/pattern/ProcessIdPatternConverter.java    |    2 +-
 .../log4j/core/pattern/RegexReplacement.java       |    5 +-
 .../core/pattern/RegexReplacementConverter.java    |    8 +-
 .../core/pattern/RelativeTimePatternConverter.java |    3 +-
 .../log4j/core/pattern/RepeatPatternConverter.java |    4 +-
 .../pattern/RootThrowablePatternConverter.java     |    5 +-
 .../pattern/SequenceNumberPatternConverter.java    |    6 +-
 .../pattern/SimpleLiteralPatternConverter.java     |    1 -
 .../logging/log4j/core/pattern/StyleConverter.java |    6 +-
 .../logging/log4j/core/pattern/TextRenderer.java   |    1 -
 .../core/pattern/ThreadIdPatternConverter.java     |    8 +-
 .../core/pattern/ThreadNamePatternConverter.java   |    8 +-
 .../pattern/ThreadPriorityPatternConverter.java    |    8 +-
 .../core/pattern/ThrowablePatternConverter.java    |   47 +-
 .../log4j/core/pattern/UuidPatternConverter.java   |    3 +-
 .../VariablesNotEmptyReplacementConverter.java     |   19 +-
 .../logging/log4j/core/script/AbstractScript.java  |    1 -
 .../apache/logging/log4j/core/script/Script.java   |    3 +-
 .../logging/log4j/core/script/ScriptFile.java      |   24 +-
 .../logging/log4j/core/script/ScriptManager.java   |   37 +-
 .../logging/log4j/core/script/ScriptRef.java       |    7 +-
 .../log4j/core/selector/BasicContextSelector.java  |   10 +-
 .../core/selector/ClassLoaderContextSelector.java  |   37 +-
 .../log4j/core/selector/ContextSelector.java       |   16 +-
 .../log4j/core/selector/CoreContextSelectors.java  |    9 +-
 .../log4j/core/selector/JndiContextSelector.java   |   13 +-
 .../log4j/core/selector/NamedContextSelector.java  |    1 -
 .../logging/log4j/core/time/MutableInstant.java    |   70 +-
 .../core/tools/BasicCommandLineArguments.java      |    6 +-
 .../apache/logging/log4j/core/tools/Generate.java  |   54 +-
 .../log4j/core/tools/picocli/CommandLine.java      | 1819 ++++++++++++++------
 .../logging/log4j/core/util/AbstractWatcher.java   |   16 +-
 .../apache/logging/log4j/core/util/ArrayUtils.java |    1 -
 .../org/apache/logging/log4j/core/util/Assert.java |    3 +-
 .../core/util/BasicAuthorizationProvider.java      |   13 +-
 .../apache/logging/log4j/core/util/Booleans.java   |    4 +-
 .../logging/log4j/core/util/CachedClock.java       |   18 +-
 .../logging/log4j/core/util/ClockFactory.java      |    9 +-
 .../logging/log4j/core/util/CloseShieldWriter.java |    2 -
 .../org/apache/logging/log4j/core/util/Closer.java |    1 -
 .../apache/logging/log4j/core/util/Constants.java  |   20 +-
 .../log4j/core/util/ContextDataProvider.java       |    1 -
 .../logging/log4j/core/util/CronExpression.java    |  590 +++----
 .../core/util/DefaultShutdownCallbackRegistry.java |   12 +-
 .../logging/log4j/core/util/DummyNanoClock.java    |    1 -
 .../logging/log4j/core/util/ExecutorServices.java  |   14 +-
 .../log4j/core/util/ExtensionLanguageMapping.java  |   34 +-
 .../apache/logging/log4j/core/util/FileUtils.java  |   27 +-
 .../apache/logging/log4j/core/util/IOUtils.java    |    1 -
 .../apache/logging/log4j/core/util/Integers.java   |    3 +-
 .../apache/logging/log4j/core/util/JndiCloser.java |    4 +-
 .../apache/logging/log4j/core/util/JsonUtils.java  |    8 +-
 .../logging/log4j/core/util/KeyValuePair.java      |    2 -
 .../org/apache/logging/log4j/core/util/Loader.java |   25 +-
 .../logging/log4j/core/util/Log4jThread.java       |    1 -
 .../log4j/core/util/Log4jThreadFactory.java        |    4 +-
 .../apache/logging/log4j/core/util/NameUtil.java   |    8 +-
 .../apache/logging/log4j/core/util/NetUtils.java   |    8 +-
 .../log4j/core/util/ObjectArrayIterator.java       |    9 +-
 .../logging/log4j/core/util/OptionConverter.java   |  131 +-
 .../apache/logging/log4j/core/util/Patterns.java   |    3 +-
 .../logging/log4j/core/util/ReflectionUtil.java    |    6 +-
 .../org/apache/logging/log4j/core/util/Source.java |    9 +-
 .../log4j/core/util/StringBuilderWriter.java       |    1 -
 .../logging/log4j/core/util/StringEncoder.java     |   12 +-
 .../logging/log4j/core/util/SystemClock.java       |    1 -
 .../logging/log4j/core/util/SystemMillisClock.java |    1 -
 .../logging/log4j/core/util/SystemNanoClock.java   |    1 -
 .../apache/logging/log4j/core/util/Throwables.java |   10 +-
 .../apache/logging/log4j/core/util/Transform.java  |  130 +-
 .../apache/logging/log4j/core/util/TypeUtil.java   |   13 +-
 .../apache/logging/log4j/core/util/UuidUtil.java   |   12 +-
 .../logging/log4j/core/util/WatchManager.java      |   51 +-
 .../apache/logging/log4j/core/util/Watcher.java    |    1 -
 .../logging/log4j/core/util/WatcherFactory.java    |   36 +-
 .../log4j/core/util/WrappedFileWatcher.java        |   19 +-
 .../log4j/core/util/datetime/DatePrinter.java      |    3 +-
 .../log4j/core/util/datetime/FastDateFormat.java   |   33 +-
 .../log4j/core/util/datetime/FastDatePrinter.java  |  348 ++--
 .../log4j/core/util/datetime/FixedDateFormat.java  |   60 +-
 .../logging/log4j/core/util/datetime/Format.java   |    3 +-
 .../log4j/core/util/datetime/FormatCache.java      |   42 +-
 .../core/util/internal/HttpInputStreamUtil.java    |   30 +-
 .../core/util/internal/LastModifiedSource.java     |    1 -
 .../logging/log4j/core/util/internal/Status.java   |    6 +-
 .../log4j/core/util/internal/UnsafeUtil.java       |    2 +-
 .../logging/log4j/couchdb/CouchDbConnection.java   |    6 +-
 .../logging/log4j/couchdb/CouchDbProvider.java     |   26 +-
 .../apache/logging/log4j/docker/DockerLookup.java  |   14 +-
 .../logging/log4j/docker/model/Container.java      |    3 +-
 .../log4j/docker/model/NetworkSettings.java        |    4 +-
 .../apache/logging/log4j/flume/appender/Agent.java |    3 +-
 .../logging/log4j/flume/appender/BatchEvent.java   |    1 -
 .../log4j/flume/appender/FlumeAppender.java        |  166 +-
 .../log4j/flume/appender/FlumeAvroManager.java     |   78 +-
 .../log4j/flume/appender/FlumeEmbeddedManager.java |   45 +-
 .../logging/log4j/flume/appender/FlumeEvent.java   |   25 +-
 .../log4j/flume/appender/FlumeEventFactory.java    |   10 +-
 .../flume/appender/FlumePersistentManager.java     |  170 +-
 .../log4j/flume/appender/Log4jEventSource.java     |    1 -
 .../log4j/flume/appender/FlumeAppenderTest.java    |  156 +-
 .../flume/appender/FlumeEmbeddedAgentTest.java     |   41 +-
 .../flume/appender/FlumeEmbeddedAppenderTest.java  |   53 +-
 .../appender/FlumePersistentAppenderTest.java      |   55 +-
 .../log4j/flume/appender/FlumePersistentPerf.java  |   20 +-
 .../logging/log4j/flume/test/FlumeKeyProvider.java |    7 +-
 .../apache/logging/log4j/io/ByteStreamLogger.java  |   26 +-
 .../apache/logging/log4j/io/CharStreamLogger.java  |   31 +-
 .../org/apache/logging/log4j/io/IoBuilder.java     |   22 +-
 .../log4j/io/LoggerBufferedInputStream.java        |   25 +-
 .../logging/log4j/io/LoggerBufferedReader.java     |   18 +-
 .../logging/log4j/io/LoggerFilterOutputStream.java |   13 +-
 .../logging/log4j/io/LoggerFilterWriter.java       |    5 +-
 .../apache/logging/log4j/io/LoggerInputStream.java |   10 +-
 .../logging/log4j/io/LoggerOutputStream.java       |    9 +-
 .../apache/logging/log4j/io/LoggerPrintStream.java |   24 +-
 .../apache/logging/log4j/io/LoggerPrintWriter.java |   18 +-
 .../org/apache/logging/log4j/io/LoggerReader.java  |    9 +-
 .../org/apache/logging/log4j/io/LoggerWriter.java  |    1 -
 .../io/internal/InternalBufferedInputStream.java   |   21 +-
 .../log4j/io/internal/InternalBufferedReader.java  |   18 +-
 .../io/internal/InternalFilterOutputStream.java    |   10 +-
 .../log4j/io/internal/InternalFilterWriter.java    |    5 +-
 .../log4j/io/internal/InternalInputStream.java     |   10 +-
 .../log4j/io/internal/InternalLoggerReader.java    |    9 +-
 .../log4j/io/internal/InternalOutputStream.java    |    9 +-
 .../log4j/io/internal/InternalPrintStream.java     |   40 +-
 .../log4j/io/internal/InternalPrintWriter.java     |   18 +-
 .../logging/log4j/io/internal/InternalReader.java  |    9 +-
 .../logging/log4j/io/internal/InternalWriter.java  |    1 -
 .../log4j/io/AbstractLoggerOutputStreamTest.java   |   16 +-
 .../logging/log4j/io/AbstractLoggerWriterTest.java |   12 +-
 .../logging/log4j/io/AbstractStreamTest.java       |   15 +-
 .../log4j/io/IoBuilderCallerInfoTesting.java       |    6 +-
 .../org/apache/logging/log4j/io/IoBuilderTest.java |   13 +-
 .../LoggerBufferedInputStreamCallerInfoTest.java   |    4 +-
 .../log4j/io/LoggerBufferedInputStreamTest.java    |    9 +-
 .../io/LoggerBufferedReaderCallerInfoTest.java     |    4 +-
 .../logging/log4j/io/LoggerBufferedReaderTest.java |    8 +-
 .../log4j/io/LoggerFilterOutputStreamTest.java     |    8 +-
 .../logging/log4j/io/LoggerFilterWriterTest.java   |    7 +-
 .../log4j/io/LoggerInputStreamCallerInfoTest.java  |    7 +-
 .../logging/log4j/io/LoggerInputStreamTest.java    |   11 +-
 .../log4j/io/LoggerOutputStreamCallerInfoTest.java |    4 +-
 .../logging/log4j/io/LoggerOutputStreamTest.java   |    6 +-
 .../log4j/io/LoggerPrintStreamCallerInfoTest.java  |    5 +-
 .../logging/log4j/io/LoggerPrintStreamTest.java    |   13 +-
 .../log4j/io/LoggerPrintWriterCallerInfoTest.java  |    5 +-
 .../log4j/io/LoggerPrintWriterJdbcH2Test.java      |    1 -
 .../logging/log4j/io/LoggerPrintWriterTest.java    |   10 +-
 .../log4j/io/LoggerReaderCallerInfoTest.java       |    7 +-
 .../apache/logging/log4j/io/LoggerReaderTest.java  |   11 +-
 .../apache/logging/log4j/io/LoggerWriterTest.java  |    5 +-
 .../logging/log4j/smtp/MimeMessageBuilder.java     |    6 +-
 .../org/apache/logging/log4j/smtp/SmtpManager.java |   59 +-
 .../logging/log4j/smtp/SmtpAppenderAsyncTest.java  |    7 +-
 .../logging/log4j/smtp/SmtpAppenderTest.java       |   38 +-
 .../apache/logging/log4j/smtp/SmtpManagerTest.java |   34 +-
 .../web/Log4jServletContainerInitializer.java      |   26 +-
 .../log4j/web/Log4jServletContextListener.java     |   22 +-
 .../logging/log4j/web/Log4jServletFilter.java      |    4 +-
 .../Log4jShutdownOnContextDestroyedListener.java   |   24 +-
 .../logging/log4j/web/Log4jWebInitializerImpl.java |   41 +-
 .../log4j/web/ServletRequestThreadContext.java     |    4 +-
 .../logging/log4j/web/WebLoggerContextUtils.java   |   13 +-
 .../org/apache/logging/log4j/web/WebLookup.java    |    7 +-
 .../log4j/web/appender/ServletAppender.java        |   28 +-
 .../web/Log4jServletContainerInitializerTest.java  |   84 +-
 .../log4j/web/Log4jServletContextListenerTest.java |   32 +-
 .../logging/log4j/web/Log4jServletFilterTest.java  |   26 +-
 ...og4jShutdownOnContextDestroyedListenerTest.java |   13 +-
 .../log4j/web/Log4jWebInitializerImplTest.java     |  183 +-
 .../org/apache/logging/log4j/web/PropertyTest.java |    4 +-
 .../logging/log4j/web/ServletAppenderTest.java     |   66 +-
 .../apache/logging/log4j/web/TestAsyncServlet.java |   12 +-
 .../apache/logging/log4j/web/WebLookupTest.java    |  150 +-
 .../org/apache/logging/log4j/jcl/Log4jLog.java     |    1 -
 .../org/apache/logging/log4j/jcl/LogAdapter.java   |    8 +-
 .../apache/logging/log4j/jcl/LogFactoryImpl.java   |    6 +-
 .../logging/log4j/jcl/CallerInformationTest.java   |   15 +-
 .../org/apache/logging/log4j/jcl/LoggerTest.java   |   14 +-
 .../db/jdbc/PoolableConnectionFactoryConfig.java   |   75 +-
 .../db/jdbc/PoolingDriverConnectionSource.java     |   66 +-
 .../db/jdbc/PoolingDriverConnectionSourceTest.java |   81 +-
 .../db/jpa/AbstractLogEventWrapperEntity.java      |    4 +-
 .../core/appender/db/jpa/BasicLogEventEntity.java  |    5 +-
 .../log4j/core/appender/db/jpa/JpaAppender.java    |   20 +-
 .../core/appender/db/jpa/JpaDatabaseManager.java   |   54 +-
 .../converter/ContextDataAttributeConverter.java   |    1 -
 .../ContextDataJsonAttributeConverter.java         |   10 +-
 .../converter/ContextMapAttributeConverter.java    |    1 -
 .../ContextMapJsonAttributeConverter.java          |    8 +-
 .../converter/ContextStackAttributeConverter.java  |    1 -
 .../ContextStackJsonAttributeConverter.java        |    6 +-
 .../jpa/converter/InstantAttributeConverter.java   |    1 -
 .../db/jpa/converter/LevelAttributeConverter.java  |    1 -
 .../db/jpa/converter/MarkerAttributeConverter.java |    1 -
 .../jpa/converter/MessageAttributeConverter.java   |    1 -
 .../StackTraceElementAttributeConverter.java       |    1 -
 .../jpa/converter/ThrowableAttributeConverter.java |   28 +-
 .../appender/db/jpa/converter/package-info.java    |    4 +-
 .../appender/db/jpa/AbstractJpaAppenderTest.java   |   33 +-
 .../core/appender/db/jpa/JpaH2AppenderTest.java    |    1 -
 .../appender/db/jpa/JpaHsqldbAppenderTest.java     |   25 +-
 .../core/appender/db/jpa/LogEventEntityTest.java   |    1 -
 .../log4j/core/appender/db/jpa/TestBaseEntity.java |    5 +-
 .../core/appender/db/jpa/TestBasicEntity.java      |    5 +-
 .../ContextDataAttributeConverterTest.java         |   12 +-
 .../ContextDataJsonAttributeConverterTest.java     |    4 +-
 .../ContextMapAttributeConverterTest.java          |   13 +-
 .../ContextMapJsonAttributeConverterTest.java      |    5 +-
 .../ContextStackAttributeConverterTest.java        |   18 +-
 .../ContextStackJsonAttributeConverterTest.java    |   27 +-
 .../converter/InstantAttributeConverterTest.java   |    4 +-
 .../converter/MarkerAttributeConverterTest.java    |   11 +-
 .../converter/MessageAttributeConverterTest.java   |    4 +-
 .../StackTraceElementAttributeConverterTest.java   |   36 +-
 .../converter/ThrowableAttributeConverterTest.java |    5 +-
 .../logging/log4j/jpl/Log4jSystemLogger.java       |    1 -
 .../log4j/jpl/Log4jSystemLoggerAdapter.java        |    8 +-
 .../logging/log4j/jpl/Log4jSystemLoggerFinder.java |    3 +-
 .../logging/log4j/jpl/Log4jSystemLoggerTest.java   |   17 +-
 .../logging/log4j/jul/AbstractLoggerAdapter.java   |    9 +-
 .../org/apache/logging/log4j/jul/ApiLogger.java    |   72 +-
 .../apache/logging/log4j/jul/ApiLoggerAdapter.java |    1 -
 .../org/apache/logging/log4j/jul/Constants.java    |    3 +-
 .../logging/log4j/jul/CoreLoggerAdapter.java       |    1 -
 .../logging/log4j/jul/DefaultLevelConverter.java   |    3 +-
 .../apache/logging/log4j/jul/LevelTranslator.java  |    5 +-
 .../logging/log4j/jul/Log4jBridgeHandler.java      |   95 +-
 .../org/apache/logging/log4j/jul/LogManager.java   |    7 +-
 .../org/apache/logging/log4j/jul/NoOpLogger.java   |  185 +-
 .../logging/log4j/jul/AbstractLoggerTest.java      |   15 +-
 .../apache/logging/log4j/jul/ApiLoggerTest.java    |   13 +-
 .../logging/log4j/jul/AsyncLoggerThreadsTest.java  |    8 +-
 .../jul/BracketInNotInterpolatedMessageTest.java   |   17 +-
 .../logging/log4j/jul/CallerInformationTest.java   |    5 +-
 .../apache/logging/log4j/jul/CoreLoggerTest.java   |   12 +-
 .../logging/log4j/jul/JavaLevelTranslatorTest.java |   31 +-
 .../logging/log4j/jul/Log4jBridgeHandlerTest.java  |  277 +--
 .../log4j/jul/Log4jLevelTranslatorTest.java        |   30 +-
 .../logging/log4j/kubernetes/ContainerUtil.java    |   32 +-
 .../log4j/kubernetes/KubernetesClientBuilder.java  |    2 +-
 .../kubernetes/KubernetesClientProperties.java     |    5 +-
 .../logging/log4j/kubernetes/KubernetesLookup.java |   39 +-
 .../log4j/kubernetes/KubernetesLookupTest.java     |   22 +-
 .../json/BlackHoleByteBufferDestination.java       |    2 -
 .../layout/template/json/LogEventFixture.java      |   17 +-
 .../log4j/layout/template/json/EcsLayoutTest.java  |   43 +-
 .../log4j/layout/template/json/GcpLayoutTest.java  |   81 +-
 .../log4j/layout/template/json/GelfLayoutTest.java |   41 +-
 .../log4j/layout/template/json/JacksonFixture.java |    1 -
 .../log4j/layout/template/json/JsonLayoutTest.java |   24 +-
 .../JsonTemplateLayoutAdditionalFieldTest.java     |   34 +-
 .../JsonTemplateLayoutConcurrentEncodeTest.java    |   82 +-
 .../json/JsonTemplateLayoutGcFreeTest.java         |    5 +-
 .../JsonTemplateLayoutNullEventDelimiterTest.java  |   14 +-
 .../template/json/JsonTemplateLayoutTest.java      |  878 ++++------
 .../log4j/layout/template/json/LogstashIT.java     |  253 +--
 .../log4j/layout/template/json/TestHelpers.java    |   30 +-
 .../json/ThreadLocalRecyclerNestedLoggingTest.java |   13 +-
 .../json/resolver/CaseConverterResolverTest.java   |   97 +-
 .../json/resolver/CounterResolverTest.java         |   73 +-
 .../template/json/resolver/LevelResolverTest.java  |   23 +-
 .../template/json/resolver/MarkerResolverTest.java |   40 +-
 .../json/resolver/MessageResolverTest.java         |  112 +-
 .../resolver/ReadOnlyStringMapResolverTest.java    |  177 +-
 .../resolver/StackTraceStringResolverTest.java     |  339 ++--
 .../json/resolver/TimestampResolverTest.java       |   21 +-
 .../json/util/CharSequencePointerTest.java         |   41 +-
 .../template/json/util/InstantFormatterTest.java   |   45 +-
 .../layout/template/json/util/JsonReaderTest.java  |  162 +-
 .../layout/template/json/util/JsonWriterTest.java  |  544 +++---
 .../template/json/util/RecyclerFactoriesTest.java  |   82 +-
 .../json/util/StringParameterParserTest.java       |  315 ++--
 .../json/util/TruncatingBufferedWriterTest.java    |   68 +-
 .../log4j/layout/template/json/util/UrisTest.java  |    6 +-
 .../layout/template/json/JsonTemplateLayout.java   |  147 +-
 .../template/json/JsonTemplateLayoutDefaults.java  |   82 +-
 .../json/resolver/CaseConverterResolver.java       |   46 +-
 .../resolver/CaseConverterResolverFactory.java     |    8 +-
 .../template/json/resolver/CounterResolver.java    |   50 +-
 .../json/resolver/CounterResolverFactory.java      |    8 +-
 .../template/json/resolver/EndOfBatchResolver.java |    5 +-
 .../json/resolver/EndOfBatchResolverFactory.java   |    8 +-
 .../resolver/EventAdditionalFieldInterceptor.java  |   27 +-
 .../json/resolver/EventResolverContext.java        |   13 +-
 .../json/resolver/EventResolverFactories.java      |    9 +-
 .../json/resolver/EventResolverFactory.java        |    4 +-
 .../json/resolver/EventResolverInterceptor.java    |    4 +-
 .../json/resolver/EventResolverInterceptors.java   |    9 +-
 .../resolver/EventResolverStringSubstitutor.java   |    5 +-
 .../resolver/EventRootObjectKeyInterceptor.java    |   13 +-
 .../template/json/resolver/ExceptionResolver.java  |  117 +-
 .../json/resolver/ExceptionResolverFactory.java    |    8 +-
 .../json/resolver/ExceptionRootCauseResolver.java  |    5 +-
 .../ExceptionRootCauseResolverFactory.java         |    8 +-
 .../template/json/resolver/LevelResolver.java      |   46 +-
 .../json/resolver/LevelResolverFactory.java        |    5 +-
 .../template/json/resolver/LoggerResolver.java     |   26 +-
 .../json/resolver/LoggerResolverFactory.java       |    5 +-
 .../template/json/resolver/MainMapResolver.java    |   15 +-
 .../json/resolver/MainMapResolverFactory.java      |    5 +-
 .../layout/template/json/resolver/MapResolver.java |    5 +-
 .../template/json/resolver/MapResolverFactory.java |    5 +-
 .../template/json/resolver/MarkerResolver.java     |    9 +-
 .../json/resolver/MarkerResolverFactory.java       |    5 +-
 .../json/resolver/MessageParameterResolver.java    |   22 +-
 .../resolver/MessageParameterResolverFactory.java  |    8 +-
 .../template/json/resolver/MessageResolver.java    |   39 +-
 .../json/resolver/MessageResolverFactory.java      |    5 +-
 .../template/json/resolver/PatternResolver.java    |   14 +-
 .../json/resolver/PatternResolverFactory.java      |    5 +-
 .../json/resolver/ReadOnlyStringMapResolver.java   |   99 +-
 .../template/json/resolver/SourceResolver.java     |   57 +-
 .../json/resolver/SourceResolverFactory.java       |    5 +-
 .../json/resolver/StackTraceElementResolver.java   |    8 +-
 .../resolver/StackTraceElementResolverContext.java |   12 +-
 .../resolver/StackTraceElementResolverFactory.java |    7 +-
 ...StackTraceElementResolverStringSubstitutor.java |    8 +-
 .../json/resolver/StackTraceObjectResolver.java    |   11 +-
 .../json/resolver/StackTraceStringResolver.java    |  131 +-
 .../template/json/resolver/TemplateResolver.java   |    1 -
 .../json/resolver/TemplateResolverConfig.java      |   15 +-
 .../json/resolver/TemplateResolverContext.java     |    2 -
 .../json/resolver/TemplateResolverFactories.java   |   56 +-
 .../json/resolver/TemplateResolverFactory.java     |    1 -
 .../json/resolver/TemplateResolverInterceptor.java |    1 -
 .../resolver/TemplateResolverInterceptors.java     |   56 +-
 .../TemplateResolverStringSubstitutor.java         |    1 -
 .../template/json/resolver/TemplateResolvers.java  |  135 +-
 .../json/resolver/ThreadContextDataResolver.java   |    5 +-
 .../resolver/ThreadContextDataResolverFactory.java |    8 +-
 .../json/resolver/ThreadContextStackResolver.java  |   12 +-
 .../ThreadContextStackResolverFactory.java         |    8 +-
 .../template/json/resolver/ThreadResolver.java     |   35 +-
 .../json/resolver/ThreadResolverFactory.java       |    5 +-
 .../template/json/resolver/TimestampResolver.java  |  229 +--
 .../json/resolver/TimestampResolverFactory.java    |    5 +-
 .../template/json/util/CharSequencePointer.java    |    7 +-
 .../layout/template/json/util/DummyRecycler.java   |    1 -
 .../template/json/util/DummyRecyclerFactory.java   |    5 +-
 .../template/json/util/InstantFormatter.java       |  108 +-
 .../layout/template/json/util/JsonReader.java      |   70 +-
 .../layout/template/json/util/JsonWriter.java      |  109 +-
 .../layout/template/json/util/MapAccessor.java     |    7 +-
 .../template/json/util/QueueingRecycler.java       |    6 +-
 .../json/util/QueueingRecyclerFactory.java         |    5 +-
 .../log4j/layout/template/json/util/Recycler.java  |    1 -
 .../template/json/util/RecyclerFactories.java      |   76 +-
 .../layout/template/json/util/RecyclerFactory.java |    1 -
 .../json/util/RecyclerFactoryConverter.java        |    1 -
 .../template/json/util/StringParameterParser.java  |   48 +-
 .../template/json/util/ThreadLocalRecycler.java    |    5 +-
 .../json/util/ThreadLocalRecyclerFactory.java      |    8 +-
 .../json/util/TruncatingBufferedPrintWriter.java   |    8 +-
 .../json/util/TruncatingBufferedWriter.java        |    9 +-
 .../log4j/layout/template/json/util/Uris.java      |   37 +-
 .../apache/logging/log4j/mongodb3/LevelCodec.java  |    1 -
 .../logging/log4j/mongodb3/MongoDbConnection.java  |   27 +-
 .../log4j/mongodb3/MongoDbDocumentObject.java      |    1 -
 .../log4j/mongodb3/MongoDbDocumentObjectCodec.java |    6 +-
 .../logging/log4j/mongodb3/MongoDbProvider.java    |   80 +-
 .../mongodb3/MongoDb3AdditionalFieldsTest.java     |    6 +-
 .../log4j/mongodb3/MongoDb3AuthFailureTest.java    |    6 +-
 .../logging/log4j/mongodb3/MongoDb3Resolver.java   |   32 +-
 .../log4j/mongodb3/MongoDb3ResolverTest.java       |    5 +-
 .../logging/log4j/mongodb3/MongoDb3Test.java       |    7 +-
 .../log4j/mongodb3/MongoDb3TestConstants.java      |    1 -
 .../logging/log4j/mongodb3/UsingMongoDb3.java      |   15 +-
 .../logging/log4j/mongodb4/MongoDb4Connection.java |   39 +-
 .../log4j/mongodb4/MongoDb4DocumentObject.java     |    1 -
 .../mongodb4/MongoDb4DocumentObjectCodec.java      |    6 +-
 .../logging/log4j/mongodb4/MongoDb4LevelCodec.java |    1 -
 .../logging/log4j/mongodb4/MongoDb4Provider.java   |   12 +-
 .../mongodb4/MongoDb4AdditionalFieldsTest.java     |    5 +-
 .../log4j/mongodb4/MongoDb4AuthFailureTest.java    |    6 +-
 .../logging/log4j/mongodb4/MongoDb4Resolver.java   |   35 +-
 .../log4j/mongodb4/MongoDb4ResolverTest.java       |    5 +-
 .../logging/log4j/mongodb4/MongoDb4Test.java       |    8 +-
 .../log4j/mongodb4/MongoDb4TestConstants.java      |    1 -
 .../logging/log4j/mongodb4/UsingMongoDb4.java      |   15 +-
 .../log4j/osgi/tests/AbstractLoadBundleTest.java   |   41 +-
 .../logging/log4j/osgi/tests/CoreOsgiTest.java     |   13 +-
 .../log4j/osgi/tests/CustomConfiguration.java      |    8 +-
 .../osgi/tests/CustomConfigurationFactory.java     |    4 +-
 .../logging/log4j/osgi/tests/JULProviderTest.java  |   14 +-
 .../log4j/osgi/tests/SLF4JProviderTest.java        |   14 +-
 .../tests/equinox/EquinoxLoadApiBundleTest.java    |    1 -
 .../osgi/tests/felix/FelixLoadApiBundleTest.java   |    1 -
 .../logging/log4j/osgi/tests/junit/OsgiRule.java   |    1 -
 .../template/json/JsonTemplateLayoutBenchmark.java |  122 +-
 .../json/JsonTemplateLayoutBenchmarkReport.java    |   98 +-
 .../json/JsonTemplateLayoutBenchmarkState.java     |   63 +-
 .../log4j/message/ParameterFormatterBenchmark.java |    7 +-
 ...bstractStringLayoutStringEncodingBenchmark.java |   32 +-
 .../perf/jmh/AnnotationVsMarkerInterface.java      |    1 -
 .../perf/jmh/AsyncAppenderLog4j1Benchmark.java     |   20 +-
 .../jmh/AsyncAppenderLog4j1LocationBenchmark.java  |    1 -
 .../perf/jmh/AsyncAppenderLog4j2Benchmark.java     |   77 +-
 .../jmh/AsyncAppenderLog4j2LocationBenchmark.java  |    2 -
 .../perf/jmh/AsyncAppenderLogbackBenchmark.java    |   59 +-
 .../jmh/AsyncAppenderLogbackLocationBenchmark.java |    7 +-
 .../log4j/perf/jmh/AsyncLoggersBenchmark.java      |  130 +-
 .../perf/jmh/AsyncLoggersLocationBenchmark.java    |    6 +-
 .../logging/log4j/perf/jmh/ClocksBenchmark.java    |   24 +-
 .../log4j/perf/jmh/CollectionsBenchmark.java       |    4 +-
 .../jmh/ConcurrentAsyncLoggerToFileBenchmark.java  |   13 +-
 .../perf/jmh/ConfiguratorInitializeBenchmark.java  |   25 +-
 .../log4j/perf/jmh/DateTimeFormatBenchmark.java    |   23 +-
 .../log4j/perf/jmh/FileAppenderBenchmark.java      |   11 +-
 .../perf/jmh/FileAppenderParamsBenchmark.java      |   16 +-
 .../perf/jmh/FileAppenderThrowableBenchmark.java   |  102 +-
 .../jmh/FileAppenderWithLocationBenchmark.java     |    7 +-
 .../log4j/perf/jmh/FormatterLoggerBenchmark.java   |    1 -
 .../log4j/perf/jmh/GelfLayoutBenchmark.java        |    2 -
 .../log4j/perf/jmh/InstantFormatBenchmark.java     |   28 +-
 .../log4j/perf/jmh/JdbcAppenderBenchmark.java      |   11 +-
 .../log4j/perf/jmh/JpaAppenderBenchmark.java       |   11 +-
 .../jmh/Log4j2AppenderComparisonBenchmark.java     |   39 +-
 .../log4j/perf/jmh/Log4jLogEventBenchmark.java     |   29 +-
 .../perf/jmh/LogBuilderMarkerFilterBenchmark.java  |    2 -
 .../log4j/perf/jmh/LoggerConfigBenchmark.java      |    5 +-
 .../log4j/perf/jmh/LoggingDisabledBenchmark.java   |   29 +-
 .../logging/log4j/perf/jmh/MDCFilterBenchmark.java |    1 -
 .../log4j/perf/jmh/MemoryHandlerJULBenchmark.java  |   86 +-
 .../jmh/MemoryHandlerJULLocationBenchmark.java     |    1 -
 .../perf/jmh/NamePatternConverterBenchmark.java    |   17 +-
 .../logging/log4j/perf/jmh/NanotimeBenchmark.java  |    7 +-
 .../logging/log4j/perf/jmh/OutputBenchmark.java    |    4 +-
 .../perf/jmh/ParameterizedMessageBenchmark.java    |   12 +-
 .../jmh/ParameterizedMessageInliningBenchmark.java |   35 +-
 .../log4j/perf/jmh/PatternLayoutBenchmark.java     |   44 +-
 .../perf/jmh/PatternLayoutComparisonBenchmark.java |   25 +-
 .../log4j/perf/jmh/ReflectionBenchmark.java        |   17 +-
 .../logging/log4j/perf/jmh/SimpleBenchmark.java    |   10 +-
 .../perf/jmh/SortedArrayVsHashMapBenchmark.java    |    9 +-
 .../logging/log4j/perf/jmh/StackWalkBenchmark.java |   22 +-
 .../perf/jmh/StringBuilderEscapeBenchmark.java     |    1 -
 .../log4j/perf/jmh/StringEncodingBenchmark.java    |   16 +-
 .../log4j/perf/jmh/TextEncoderHelperBenchmark.java |  116 +-
 .../log4j/perf/jmh/ThreadContextBenchmark.java     |   23 +-
 .../ThreadLocalVsConcurrentHashMapBenchmark.java   |    1 -
 .../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java |   22 +-
 .../perf/jmh/ThreadsafeDateFormatBenchmark.java    |   15 +-
 .../log4j/perf/jmh/TimeFormatBenchmark.java        |    1 -
 .../logging/log4j/perf/jmh/UnboxBenchmark.java     |    1 -
 .../log4j/perf/jmh/UuidGeneratorBenchmark.java     |    1 -
 .../logging/log4j/perf/jmh/VarargsBenchmark.java   |   75 +-
 .../log4j/perf/jmh/jpa/TestBasicEntity.java        |    5 +-
 .../logging/log4j/perf/nogc/AbstractLogger.java    |    1 -
 .../logging/log4j/perf/nogc/ClassicLogger.java     |    8 +-
 .../logging/log4j/perf/nogc/DemoAppender.java      |    1 -
 .../apache/logging/log4j/perf/nogc/NoGcLayout.java |    8 +-
 .../apache/logging/log4j/perf/nogc/NoGcLogger.java |    2 -
 .../logging/log4j/perf/nogc/NoGcMessage.java       |    4 +-
 .../perf/nogc/NoGcMessagePatternConverter.java     |   10 +-
 .../logging/log4j/perf/nogc/OpenHashStringMap.java |   38 +-
 .../log4j/perf/nogc/ParameterizedMessage.java      |   38 +-
 .../org/apache/logging/log4j/perf/nogc/Test.java   |   20 +-
 .../log4j/perf/util/BenchmarkMessageParams.java    |    6 +-
 .../logging/log4j/perf/util/DemoAppender.java      |    1 -
 .../logging/log4j/perf/util/NoOpJULHandler.java    |    6 +-
 .../logging/log4j/perf/util/NoOpLog4jAppender.java |    5 +-
 .../log4j/perf/util/NoOpLogbackAppender.java       |    3 +-
 .../logging/log4j/perf/util/StackDriver.java       |    6 +-
 .../CopyOnWriteOpenHashMapThreadContextMap.java    |    4 +-
 .../GarbageFreeOpenHashMapThreadContextMap.java    |    4 +-
 .../apache/logging/slf4j/EventDataConverter.java   |    9 +-
 .../java/org/apache/logging/slf4j/Log4jLogger.java |   29 +-
 .../apache/logging/slf4j/Log4jLoggerFactory.java   |    5 +-
 .../org/apache/logging/slf4j/Log4jMDCAdapter.java  |    1 -
 .../java/org/apache/logging/slf4j/Log4jMarker.java |    3 +-
 .../apache/logging/slf4j/Log4jMarkerFactory.java   |    7 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |    3 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |    3 +-
 .../logging/other/pkg/LoggerContextAnchorTest.java |    8 +-
 .../logging/slf4j/CallerInformationTest.java       |    5 +-
 .../org/apache/logging/slf4j/CustomFlatMarker.java |    1 -
 .../org/apache/logging/slf4j/Log4j1222Test.java    |   14 +-
 .../logging/slf4j/Log4j2_1482_Slf4jTest.java       |    1 -
 .../org/apache/logging/slf4j/Log4jMarkerTest.java  |    1 -
 .../apache/logging/slf4j/LoggerContextTest.java    |    5 +-
 .../java/org/apache/logging/slf4j/LoggerTest.java  |   37 +-
 .../java/org/apache/logging/slf4j/MarkerTest.java  |   34 +-
 .../org/apache/logging/slf4j/OptionalTest.java     |    7 +-
 .../org/apache/logging/slf4j/OverflowTest.java     |    5 +-
 .../org/apache/logging/slf4j/SerializeTest.java    |    7 +-
 .../apache/logging/slf4j/Log4jEventBuilder.java    |    5 +-
 .../java/org/apache/logging/slf4j/Log4jLogger.java |   29 +-
 .../apache/logging/slf4j/Log4jLoggerFactory.java   |    5 +-
 .../org/apache/logging/slf4j/Log4jMDCAdapter.java  |    4 +-
 .../java/org/apache/logging/slf4j/Log4jMarker.java |    3 +-
 .../apache/logging/slf4j/Log4jMarkerFactory.java   |    7 +-
 .../apache/logging/slf4j/SLF4JServiceProvider.java |    2 -
 .../logging/other/pkg/LoggerContextAnchorTest.java |    8 +-
 .../logging/slf4j/CallerInformationTest.java       |    7 +-
 .../org/apache/logging/slf4j/CustomFlatMarker.java |    1 -
 .../org/apache/logging/slf4j/Log4j1222Test.java    |   14 +-
 .../logging/slf4j/Log4j2_1482_Slf4jTest.java       |    1 -
 .../logging/slf4j/Log4jEventBuilderTest.java       |    9 +-
 .../apache/logging/slf4j/Log4jMDCAdapterTest.java  |    6 +-
 .../org/apache/logging/slf4j/Log4jMarkerTest.java  |    1 -
 .../apache/logging/slf4j/LoggerContextTest.java    |    5 +-
 .../java/org/apache/logging/slf4j/LoggerTest.java  |   38 +-
 .../java/org/apache/logging/slf4j/MarkerTest.java  |   34 +-
 .../org/apache/logging/slf4j/OverflowTest.java     |    5 +-
 .../org/apache/logging/slf4j/SerializeTest.java    |    7 +-
 .../spring/boot/Log4j2SpringBootLoggingSystem.java |   34 +-
 .../logging/log4j/spring/boot/SpringLookup.java    |    8 +-
 .../log4j/spring/boot/SpringProfileArbiter.java    |   12 +-
 .../log4j/spring/boot/SpringPropertySource.java    |    2 +-
 .../spring/boot/Log4j2SpringBootInitTest.java      |   11 +-
 .../boot/Log4j2SpringBootLoggingSystemTest.java    |   15 +-
 .../log4j/spring/boot/SpringLookupTest.java        |    3 +-
 .../log4j/spring/boot/SpringProfileTest.java       |    6 +-
 .../cloud/config/client/WatchEventManager.java     |    6 +-
 .../config/client/Log4j2EventListenerTest.java     |   26 +-
 .../cloud/config/client/SpringConfiguration.java   |    3 +-
 .../apache/logging/log4j/taglib/CatchingTag.java   |    1 -
 .../org/apache/logging/log4j/taglib/DumpTag.java   |    1 -
 .../org/apache/logging/log4j/taglib/EntryTag.java  |    2 -
 .../org/apache/logging/log4j/taglib/ExitTag.java   |    1 -
 .../apache/logging/log4j/taglib/IfEnabledTag.java  |    1 -
 .../log4j/taglib/Log4jTaglibLoggerContext.java     |   10 +-
 .../log4j/taglib/LoggingMessageTagSupport.java     |    5 +-
 .../apache/logging/log4j/taglib/SetLoggerTag.java  |    1 -
 .../org/apache/logging/log4j/taglib/TagUtils.java  |   17 +-
 .../logging/log4j/taglib/CatchingTagTest.java      |   13 +-
 .../apache/logging/log4j/taglib/DumpTagTest.java   |   29 +-
 .../apache/logging/log4j/taglib/EnterTagTest.java  |   13 +-
 .../log4j/taglib/ExceptionAwareTagSupportTest.java |    4 +-
 .../apache/logging/log4j/taglib/ExitTagTest.java   |   13 +-
 .../logging/log4j/taglib/IfEnabledTagTest.java     |    5 +-
 .../apache/logging/log4j/taglib/LogTagTest.java    |    5 +-
 .../log4j/taglib/LoggerAwareTagSupportTest.java    |    6 +-
 .../log4j/taglib/LoggingMessageTagSupportTest.java |   45 +-
 .../logging/log4j/taglib/SetLoggerTagTest.java     |   29 +-
 .../apache/logging/log4j/taglib/TagLevelTest.java  |    7 +-
 .../logging/log4j/taglib/TagUtilsLevelTest.java    |   10 +-
 .../logging/log4j/taglib/TagUtilsScopeTest.java    |    9 +-
 .../org/apache/logging/log4j/tojul/JULLogger.java  |  147 +-
 .../logging/log4j/tojul/JULLoggerContext.java      |    5 +-
 .../log4j/tojul/JULLoggerContextFactory.java       |   17 +-
 .../logging/log4j/tojul/LazyLog4jLogRecord.java    |    1 -
 .../apache/logging/log4j/tojul/JULLoggerTest.java  |    7 +-
 .../org/apache/logging/log4j/tojul/LoggerTest.java |   77 +-
 .../java/org/apache/logging/slf4j/Activator.java   |    5 +-
 .../org/apache/logging/slf4j/MDCContextMap.java    |    3 +-
 .../org/apache/logging/slf4j/SLF4JLogBuilder.java  |   32 +-
 .../java/org/apache/logging/slf4j/SLF4JLogger.java |  153 +-
 .../apache/logging/slf4j/SLF4JLoggerContext.java   |    4 +-
 .../logging/slf4j/SLF4JLoggerContextFactory.java   |   17 +-
 .../logging/slf4j/CallerInformationTest.java       |    5 +-
 .../apache/logging/slf4j/Log4j2Jira1688Test.java   |    6 +-
 .../org/apache/logging/slf4j/LogBuilderTest.java   |   22 +-
 .../logging/slf4j/LoggerContextResolver.java       |   81 +-
 .../apache/logging/slf4j/LoggerContextSource.java  |    1 -
 .../org/apache/logging/slf4j/LoggerResolver.java   |   63 +-
 .../java/org/apache/logging/slf4j/LoggerTest.java  |   51 +-
 .../java/org/apache/logging/slf4j/TestUtil.java    |    6 +-
 .../web/Log4jServletContainerInitializer.java      |   22 +-
 .../log4j/web/Log4jServletContextListener.java     |   22 +-
 .../logging/log4j/web/Log4jServletFilter.java      |    2 -
 .../Log4jShutdownOnContextDestroyedListener.java   |   24 +-
 .../logging/log4j/web/Log4jWebInitializerImpl.java |   39 +-
 .../log4j/web/ServletRequestThreadContext.java     |    2 -
 .../logging/log4j/web/WebLoggerContextUtils.java   |   11 +-
 .../org/apache/logging/log4j/web/WebLookup.java    |    7 +-
 .../log4j/web/appender/ServletAppender.java        |   26 +-
 .../web/Log4jServletContainerInitializerTest.java  |   76 +-
 .../log4j/web/Log4jServletContextListenerTest.java |   32 +-
 .../logging/log4j/web/Log4jServletFilterTest.java  |   26 +-
 ...og4jShutdownOnContextDestroyedListenerTest.java |   13 +-
 .../log4j/web/Log4jWebInitializerImplTest.java     |  181 +-
 .../org/apache/logging/log4j/web/PropertyTest.java |    4 +-
 .../logging/log4j/web/ServletAppenderTest.java     |    5 +-
 .../apache/logging/log4j/web/TestAsyncServlet.java |   10 +-
 .../apache/logging/log4j/web/WebLookupTest.java    |    7 +-
 pom.xml                                            |    2 +-
 src/tools/add-sbom-references.xslt                 |  108 --
 2114 files changed, 33598 insertions(+), 25880 deletions(-)
 delete mode 100644 src/tools/add-sbom-references.xslt