You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2021/04/03 05:14:02 UTC
[logging-log4j2] 01/01: Merge pull request #480 from
apache/master-java11
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9811f0ac82e7325c224074617a3d171c4a9d2be1
Merge: 6027bae 210dce1
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Apr 2 22:13:53 2021 -0700
Merge pull request #480 from apache/master-java11
Master java11
.github/workflows/main.yml | 15 +-
log4j-1.2-api/pom.xml | 5 +
.../org/apache/log4j/CallerInformationTest.java | 2 +-
.../test/java/org/apache/log4j/LogWithMDCTest.java | 2 +-
.../java/org/apache/log4j/LogWithRouteTest.java | 2 +-
.../test/java/org/apache/log4j/LoggingTest.java | 2 +-
.../apache/log4j/layout/Log4j1XmlLayoutTest.java | 2 +-
.../pattern/Log4j1NdcPatternConverterTest.java | 2 +-
.../apache/log4j/util/SerializationTestHelper.java | 2 +
log4j-api-java9/pom.xml | 168 ---
log4j-api-java9/src/assembly/java9.xml | 44 -
.../apache/logging/log4j/util/StackLocator.java | 95 --
log4j-api-java9/src/test/java/module-info.java | 6 -
.../log4j/util/java9/ProcessIdUtilTest.java | 31 -
.../logging/log4j/util/java9/StackLocatorTest.java | 150 ---
log4j-api-test/pom.xml | 124 ++
.../test}/junit/AbstractExternalFileCleaner.java | 2 +-
.../log4j/test}/junit/AbstractFileCleaner.java | 2 +-
.../logging/log4j/test}/junit/CleanFiles.java | 4 +-
.../logging/log4j/test}/junit/CleanFolders.java | 4 +-
.../log4j/test}/junit/CleanUpDirectories.java | 2 +-
.../logging/log4j/test}/junit/CleanUpFiles.java | 2 +-
.../log4j/test}/junit/DirectoryCleaner.java | 2 +-
.../logging/log4j/test}/junit/FileCleaner.java | 2 +-
.../apache/logging/log4j/test}/junit/Mutable.java | 2 +-
.../log4j/test}/junit/SecurityManagerTestRule.java | 2 +-
.../logging/log4j/test}/junit/SerialUtil.java | 2 +-
.../test}/junit/URLStreamHandlerFactoryRule.java | 2 +-
log4j-api/pom.xml | 159 ++-
.../log4j}/internal/DefaultObjectInputFilter.java | 2 +-
.../message/ReusableParameterizedMessage.java | 22 +-
.../log4j/util/FilteredObjectInputStream.java | 1 +
.../org/apache/logging/log4j/util/LoaderUtil.java | 44 +-
.../apache/logging/log4j/util/ProcessIdUtil.java | 0
.../logging/log4j/util/SortedArrayStringMap.java | 3 +-
.../apache/logging/log4j/util/StackLocator.java | 223 +---
.../src/main/java9}/module-info.java | 2 +
log4j-api/src/main/resources/META-INF/MANIFEST.MF | 0
.../log4j/test}/AbstractSerializationTest.java | 4 +-
.../logging/log4j/test}/SerializableMatchers.java | 2 +-
.../org/apache/logging/log4j/test}/TestLogger.java | 5 +-
.../logging/log4j/test}/TestLoggerContext.java | 3 +-
.../log4j/test}/TestLoggerContextFactory.java | 2 +-
.../logging/log4j/test}/ThreadContextHolder.java | 3 +-
.../logging/log4j/test}/ThreadContextTest.java | 16 +-
.../log4j/test}/ThreadContextUtilityClass.java | 3 +-
.../test}/junit/AbstractExternalFileCleaner.java | 2 +-
.../log4j/test}/junit/AbstractFileCleaner.java | 10 +-
.../logging/log4j/test}/junit/ClassMatchers.java | 2 +-
.../logging/log4j/test}/junit/CleanFiles.java | 2 +-
.../logging/log4j/test}/junit/CleanFolders.java | 2 +-
.../log4j/test}/junit/CleanUpDirectories.java | 6 +-
.../logging/log4j/test}/junit/CleanUpFiles.java | 6 +-
.../log4j/test}/junit/DirectoryCleaner.java | 6 +-
.../logging/log4j/test}/junit/FileCleaner.java | 6 +-
.../junit/LogManagerLoggerContextFactoryRule.java | 2 +-
.../test}/junit/LoggerContextFactoryExtension.java | 2 +-
.../apache/logging/log4j/test/junit/Mutable.java | 18 +-
.../log4j/test}/junit/SecurityManagerTestRule.java | 2 +-
.../logging/log4j/test}/junit/SerialUtil.java | 4 +-
.../log4j/test}/junit/StatusLoggerLevel.java | 2 +-
.../test}/junit/StatusLoggerLevelExtension.java | 2 +-
.../log4j/test}/junit/StatusLoggerRule.java | 2 +-
.../log4j/test}/junit/ThreadContextExtension.java | 4 +-
.../log4j/test}/junit/ThreadContextMapRule.java | 2 +-
.../log4j/test}/junit/ThreadContextRule.java | 4 +-
.../log4j/test}/junit/ThreadContextStackRule.java | 2 +-
.../test}/junit/URLStreamHandlerFactoryRule.java | 2 +-
.../log4j/test}/junit/UsingAnyThreadContext.java | 2 +-
.../log4j/test}/junit/UsingThreadContextMap.java | 2 +-
.../log4j/test}/junit/UsingThreadContextStack.java | 2 +-
log4j-api/src/test/java/module-info.java | 18 +
.../apache/logging/log4j/AbstractLoggerTest.java | 2 +-
.../org/apache/logging/log4j/EventLoggerTest.java | 1 +
.../apache/logging/log4j/LoggerSupplierTest.java | 376 +++---
.../java/org/apache/logging/log4j/LoggerTest.java | 1265 ++++++++++----------
.../org/apache/logging/log4j/TestProvider.java | 1 +
.../log4j/ThreadContextInheritanceTest.java | 3 +-
.../log4j/message/FormattedMessageTest.java | 3 +-
.../log4j/message/LocalizedMessageTest.java | 2 +-
.../logging/log4j/message/MapMessageTest.java | 2 +-
.../MessageFormatMessageSerializationTest.java | 2 +-
.../log4j/message/MessageFormatMessageTest.java | 2 +-
.../log4j/message/ObjectArrayMessageTest.java | 84 +-
.../logging/log4j/message/ObjectMessageTest.java | 4 +-
.../log4j/message/ParameterizedMessageTest.java | 2 +-
.../message/ReusableParameterizedMessageTest.java | 2 +-
.../log4j/message/StringFormattedMessageTest.java | 3 +-
.../logging/log4j/simple/SimpleLoggerTest.java | 2 +-
.../log4j/spi/DefaultThreadContextMapTest.java | 2 +-
.../log4j/spi/DefaultThreadContextStackTest.java | 2 +-
.../logging/log4j/spi/LoggerAdapterTest.java | 6 +-
.../status/StatusLoggerSerializationTest.java | 2 +-
.../logging/log4j/util/DeserializerHelper.java | 1 +
...EnvironmentPropertySourceSecurityManagerIT.java | 2 +-
...ropertyFilePropertySourceSecurityManagerIT.java | 3 +-
.../logging/log4j/util/ProviderUtilTest.java | 2 +-
.../log4j/util/SortedArrayStringMapTest.java | 1 +
.../logging/log4j/util/StackLocatorUtilTest.java | 12 +-
...mPropertiesPropertySourceSecurityManagerIT.java | 3 +-
.../src/test/resources/Log4j-charsets.properties | 48 +
log4j-cassandra/pom.xml | 5 +
.../log4j/cassandra/CassandraAppenderIT.java | 4 +-
log4j-core-its/pom.xml | 4 +-
.../logging/log4j/FilterPerformanceComparison.java | 2 +-
.../logging/log4j/PerformanceComparison.java | 2 +-
.../org/apache/logging/log4j/PerformanceRun.java | 4 +-
.../apache/logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../apache/logging/log4j/core/ThreadedTest.java | 4 +-
.../log4j/core/appender/HttpAppenderTest.java | 2 +-
.../appender/JsonCompleteFileAppenderTest.java | 6 +-
.../SecureSocketAppenderSocketOptionsTest.java | 2 +-
.../appender/SocketAppenderBufferSizeTest.java | 2 +-
.../appender/SocketAppenderSocketOptionsTest.java | 2 +-
.../core/appender/XmlCompactFileAppenderTest.java | 2 +-
.../XmlCompactFileAppenderValidationTest.java | 2 +-
.../XmlCompactFileAsyncAppenderValidationTest.java | 2 +-
.../core/appender/XmlCompleteFileAppenderTest.java | 6 +-
.../log4j/core/appender/XmlFileAppenderTest.java | 2 +-
.../appender/XmlRandomAccessFileAppenderTest.java | 2 +-
log4j-core-java9/pom.xml | 166 ---
log4j-core-java9/src/assembly/java9.xml | 51 -
.../apache/logging/log4j/core/util/Instant.java | 75 --
.../logging/log4j/core/util/MutableInstant.java | 155 ---
.../logging/log4j/core/util/PreciseClock.java | 36 -
.../logging/log4j/core/util/SystemClock.java | 44 -
.../org/apache/logging/log4j/core/util/Dummy.java | 24 -
log4j-core/pom.xml | 56 -
.../core/appender/MemoryMappedFileManager.java | 12 +-
.../log4j/core/impl/ExtendedStackTraceElement.java | 29 +
.../log4j/core/time/internal/SystemClock.java | 23 +-
log4j-core/src/main/resources/Log4j-config.xsd | 33 +-
.../logging/log4j/ThreadContextTestAccess.java | 15 +-
.../log4j/core/AppenderRefLevelJsonTest.java | 4 +-
.../logging/log4j/core/AppenderRefLevelTest.java | 4 +-
.../logging/log4j/core/CollectionLoggingTest.java | 4 +-
.../log4j/core/CustomLevelsOverrideTest.java | 4 +-
.../logging/log4j/core/CustomLevelsTest.java | 4 +-
.../log4j/core/CustomLevelsWithFiltersTest.java | 4 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/ExtendedLevelTest.java | 4 +-
.../logging/log4j/core/GcFreeLoggingTestUtil.java | 5 +-
.../apache/logging/log4j/core/HostNameTest.java | 4 +-
.../org/apache/logging/log4j/core/LevelTest.java | 4 +-
.../apache/logging/log4j/core/Log4j1222Test.java | 2 +-
.../logging/log4j/core/LogEventFactoryTest.java | 2 +-
.../apache/logging/log4j/core/LogEventTest.java | 3 +
.../apache/logging/log4j/core/LoggerDateTest.java | 4 +-
.../log4j/core/LoggerSerializationTest.java | 2 +-
.../org/apache/logging/log4j/core/LoggerTest.java | 10 +-
.../logging/log4j/core/LoggerUpdateTest.java | 4 +-
.../org/apache/logging/log4j/core/LookupTest.java | 4 +-
.../logging/log4j/core/PatternSelectorTest.java | 4 +-
.../log4j/core/PropertiesFileConfigTest.java | 4 +-
.../logging/log4j/core/ShutdownDisabledTest.java | 2 +-
.../core/ShutdownTimeoutConfigurationTest.java | 2 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 4 +-
.../logging/log4j/core/TimestampMessageTest.java | 4 +-
.../org/apache/logging/log4j/core/XmlEvents.java | 2 +-
.../appender/AsyncAppenderQueueFullPolicyTest.java | 4 +-
.../log4j/core/appender/AsyncAppenderTest.java | 4 +-
.../core/appender/ConfigurationTestUtils.java | 74 +-
.../appender/ConsoleAppenderJAnsiMessageMain.java | 2 +-
.../ConsoleAppenderJAnsiXExceptionMain.java | 2 +-
.../log4j/core/appender/FailoverAppenderTest.java | 8 +-
.../core/appender/FileAppenderPermissionsTest.java | 4 +-
.../log4j/core/appender/FileAppenderTest.java | 2 +-
.../appender/MemoryMappedFileAppenderTest.java | 4 +-
.../core/appender/OutputStreamAppenderTest.java | 246 ++--
.../core/appender/OutputStreamManagerTest.java | 2 +-
.../appender/RandomAccessFileAppenderTest.java | 4 +-
.../core/appender/ScriptAppenderSelectorTest.java | 2 +-
.../appender/nosql/NoSqlDatabaseManagerTest.java | 2 +-
.../appender/rewrite/MapRewritePolicyTest.java | 2 +-
.../core/appender/rewrite/RewriteAppenderTest.java | 6 +-
.../RandomRollingAppenderOnStartupTest.java | 2 +-
.../appender/rolling/RollingAppenderCountTest.java | 2 +-
.../rolling/RollingAppenderCronAndSizeTest.java | 6 +-
.../RollingAppenderCronEvery2DirectTest.java | 6 +-
.../rolling/RollingAppenderCronEvery2Test.java | 6 +-
.../rolling/RollingAppenderCronOnceADayTest.java | 6 +-
.../appender/rolling/RollingAppenderCronTest.java | 6 +-
.../RollingAppenderCustomDeleteActionTest.java | 2 +-
...RollingAppenderDeleteAccumulatedCount1Test.java | 2 +-
...RollingAppenderDeleteAccumulatedCount2Test.java | 2 +-
.../RollingAppenderDeleteAccumulatedSizeTest.java | 2 +-
.../rolling/RollingAppenderDeleteMaxDepthTest.java | 2 +-
.../rolling/RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 2 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 2 +-
.../RollingAppenderDirectWrite1906Test.java | 6 +-
.../RollingAppenderDirectWriteStartupSizeTest.java | 4 +-
...erDirectWriteTempCompressedFilePatternTest.java | 6 +-
.../rolling/RollingAppenderDirectWriteTest.java | 6 +-
...RollingAppenderDirectWriteWithFilenameTest.java | 2 +-
...llingAppenderDirectWriteWithHtmlLayoutTest.java | 10 +-
...lingAppenderDirectWriteWithReconfigureTest.java | 2 +-
.../RollingAppenderNoUnconditionalDeleteTest.java | 2 +-
.../rolling/RollingAppenderReconfigureTest.java | 6 +-
.../rolling/RollingAppenderRestartTest.java | 6 +-
...RollingAppenderSizeCompressPermissionsTest.java | 2 +-
.../rolling/RollingAppenderSizeNoCompressTest.java | 2 +-
.../appender/rolling/RollingAppenderSizeTest.java | 6 +-
.../rolling/RollingAppenderSizeWithTimeTest.java | 2 +-
...llingAppenderTempCompressedFilePatternTest.java | 2 +-
.../RollingAppenderTimeAndSizeDirectTest.java | 6 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 6 +-
.../appender/rolling/RollingAppenderTimeTest.java | 6 +-
.../rolling/RollingAppenderUncompressedTest.java | 2 +-
.../RollingDirectSizeTimeNewDirectoryTest.java | 2 +-
.../rolling/RollingDirectTimeNewDirectoryTest.java | 2 +-
.../RollingFileAppenderReconfigureTest.java | 2 +-
...nderReconfigureUndefinedSystemPropertyTest.java | 2 +-
.../appender/rolling/RollingNewDirectoryTest.java | 2 +-
...ingRandomAccessFileManagerHeaderFooterTest.java | 2 +-
.../RollingRandomAccessFileManagerTest.java | 8 +-
.../RollingRandomAppenderDirectWriteTest.java | 6 +-
...gRandomAppenderDirectWriteWithFilenameTest.java | 2 +-
.../rolling/RolloverWithDeletedOldFileTest.java | 2 +-
.../appender/rolling/RolloverWithPaddingTest.java | 2 +-
.../rolling/action/AbstractActionTest.java | 2 +-
.../rolling/action/DummyFileAttributes.java | 172 +--
.../core/appender/rolling/action/IfAllTest.java | 104 +-
.../core/appender/rolling/action/IfAnyTest.java | 104 +-
.../appender/rolling/action/IfFileNameTest.java | 262 ++--
.../core/appender/rolling/action/IfNotTest.java | 104 +-
.../routing/DefaultRouteScriptAppenderTest.java | 2 +-
.../appender/routing/JsonRoutingAppender2Test.java | 2 +-
.../appender/routing/JsonRoutingAppenderTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutesScriptAppenderTest.java | 4 +-
.../appender/routing/RoutingAppender2767Test.java | 4 +-
.../core/appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithJndiTest.java | 4 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 2 +-
.../async/AsyncLoggerClassLoadDeadlockTest.java | 2 +-
.../core/async/AsyncLoggerConfigAutoFlushTest.java | 2 +-
.../core/async/AsyncLoggerConfigErrorOnFormat.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest2.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest3.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest4.java | 2 +-
...ncLoggerConfigThreadContextCopyOnWriteTest.java | 2 +-
.../AsyncLoggerConfigThreadContextDefaultTest.java | 2 +-
...ncLoggerConfigThreadContextGarbageFreeTest.java | 2 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 2 +-
...AsyncLoggerContextSelectorInitialStateTest.java | 2 +-
.../core/async/AsyncLoggerContextSelectorTest.java | 2 +-
.../log4j/core/async/AsyncLoggerContextTest.java | 2 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 2 +-
.../log4j/core/async/AsyncLoggerLocationTest.java | 2 +-
.../logging/log4j/core/async/AsyncLoggerTest.java | 2 +-
.../async/AsyncLoggerTestArgumentFreedOnError.java | 2 +-
.../async/AsyncLoggerTestCachedThreadName.java | 2 +-
.../log4j/core/async/AsyncLoggerTestNanoTime.java | 2 +-
.../async/AsyncLoggerTestUncachedThreadName.java | 2 +-
.../AsyncLoggerThreadContextCopyOnWriteTest.java | 2 +-
.../async/AsyncLoggerThreadContextDefaultTest.java | 2 +-
.../AsyncLoggerThreadContextGarbageFreeTest.java | 2 +-
.../core/async/AsyncLoggerThreadContextTest.java | 2 +-
.../async/AsyncLoggerThreadNameStrategyTest.java | 2 +-
.../async/AsyncLoggerTimestampMessageTest.java | 2 +-
.../async/AsyncLoggerUseAfterShutdownTest.java | 2 +-
.../async/AsyncLoggersWithAsyncAppenderTest.java | 4 +-
.../AsyncLoggersWithAsyncLoggerConfigTest.java | 4 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 2 +-
.../log4j/core/async/AsyncRootReloadTest.java | 6 +-
.../async/DefaultAsyncQueueFullPolicyTest.java | 2 +-
.../async/DiscardingAsyncQueueFullPolicyTest.java | 2 +-
.../log4j/core/async/Log4j2Jira1688AsyncTest.java | 4 +-
.../log4j/core/async/Log4j2Jira1688Test.java | 4 +-
.../core/async/QueueFullAsyncAppenderTest.java | 4 +-
.../core/async/QueueFullAsyncAppenderTest2.java | 4 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 4 +-
...lAsyncLoggerConfigLoggingFromToStringTest2.java | 4 +-
.../core/async/QueueFullAsyncLoggerConfigTest.java | 4 +-
.../async/QueueFullAsyncLoggerConfigTest2.java | 4 +-
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 4 +-
...eueFullAsyncLoggerLoggingFromToStringTest2.java | 4 +-
.../log4j/core/async/QueueFullAsyncLoggerTest.java | 4 +-
.../core/async/QueueFullAsyncLoggerTest2.java | 4 +-
.../core/async/QueueFullAsyncLoggerTest3.java | 4 +-
.../log4j/core/async/RingBufferLogEventTest.java | 3 +-
.../logging/log4j/core/categories/Appenders.java | 17 +-
.../log4j/core/categories/AsyncLoggers.java | 7 +-
.../log4j/core/categories/Configurations.java | 9 +-
.../logging/log4j/core/categories/Layouts.java | 12 +-
.../log4j/core/categories/PerformanceTests.java | 14 +-
.../logging/log4j/core/categories/Scripts.java | 8 +-
.../log4j/core/categories/package-info.java | 14 +-
.../core/config/CompositeConfigurationTest.java | 2 +-
.../core/config/ConfigurationFactoryTest.java | 4 +-
.../log4j/core/config/CustomConfigurationTest.java | 4 +-
.../logging/log4j/core/config/FileOutputTest.java | 4 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 2 +-
.../log4j/core/config/LoggersPluginTest.java | 2 +-
.../log4j/core/config/MissingRootLoggerTest.java | 4 +-
.../core/config/MultipleTriggeringPolicyTest.java | 2 +-
.../logging/log4j/core/config/PropertyTest.java | 4 +-
.../core/config/ReconfigurationDeadlockTest.java | 2 +-
.../log4j/core/config/ReliabilityStrategyTest.java | 4 +-
.../log4j/core/config/TestConfigurator.java | 2 +-
.../log4j/core/config/TestConfiguratorError.java | 2 +-
.../core/config/plugins/LegacyPluginTest.java | 2 +-
.../plugins/util/PluginManagerPackagesTest.java | 1 -
.../validators/RequiredValidatorTest.java | 2 +-
.../validators/ValidHostValidatorTest.java | 4 +-
.../validators/ValidPortValidatorTest.java | 2 +-
.../ValidatingPluginWithGenericBuilderTest.java | 2 +-
...ngPluginWithGenericSubclassFoo1BuilderTest.java | 2 +-
.../ValidatingPluginWithTypedBuilderTest.java | 2 +-
.../properties/PropertiesConfigurationTest.java | 2 +-
.../log4j/core/config/xml/XmlLoggerPropsTest.java | 4 +-
.../core/filter/AbstractScriptFilterTest.java | 4 +-
.../logging/log4j/core/filter/BurstFilterTest.java | 4 +-
.../core/filter/DynamicThresholdFilterTest.java | 4 +-
.../logging/log4j/core/filter/MapFilterTest.java | 4 +-
.../filter/ScriptFileFilterPropertiesTest.java | 2 +-
.../log4j/core/filter/ScriptFileFilterTest.java | 2 +-
.../log4j/core/filter/ScriptFilterTest.java | 2 +-
.../log4j/core/filter/ScriptRefFilterTest.java | 2 +-
.../core/filter/StructuredDataFilterTest.java | 2 +-
.../logging/log4j/core/hamcrest/Descriptors.java | 28 +-
.../logging/log4j/core/hamcrest/FileMatchers.java | 163 +++
.../logging/log4j/core/hamcrest/MapMatchers.java | 62 +
.../core/impl/JdkMapAdapterStringMapTest.java | 1 +
.../logging/log4j/core/impl/Log4jLogEventTest.java | 1 +
.../log4j/core/impl/MutableLogEventTest.java | 1 +
.../NestedLoggingFromThrowableMessageTest.java | 2 +-
.../core/impl/NestedLoggingFromToStringTest.java | 2 +-
.../core/impl/ThreadContextDataInjectorTest.java | 2 +-
.../log4j/core/impl/ThrowableProxyTest.java | 2 +
.../logging/log4j/core/junit/AppenderResolver.java | 54 +
.../log4j/core/junit/ConfigurationResolver.java | 39 +
.../apache/logging/log4j/core/junit/JndiRule.java | 59 +
.../log4j/core/junit/LoggerContextResolver.java | 157 +++
.../log4j/{ => core}/junit/LoggerContextRule.java | 4 +-
.../log4j/core/junit/LoggerContextSource.java | 79 ++
.../org/apache/logging/log4j/core/junit/Named.java | 23 +-
.../junit/ReconfigurationPolicy.java} | 27 +-
.../logging/log4j/core/junit/package-info.java | 8 +-
.../ConcurrentLoggingWithGelfLayoutTest.java | 2 +-
.../logging/log4j/core/layout/GelfLayout2Test.java | 4 +-
.../logging/log4j/core/layout/GelfLayout3Test.java | 6 +-
.../core/layout/GelfLayoutPatternSelectorTest.java | 6 +-
.../logging/log4j/core/layout/GelfLayoutTest.java | 2 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 2 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 4 +-
.../log4j/core/layout/Log4j2_2195_Test.java | 4 +-
.../core/layout/PatternLayoutLookupDateTest.java | 4 +-
.../layout/PatternLayoutMainMapLookupTest.java | 7 +-
.../core/layout/PatternLayoutNoLookupDateTest.java | 4 +-
.../log4j/core/layout/PatternLayoutRepeatTest.java | 4 +-
.../log4j/core/layout/PatternLayoutTest.java | 2 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 2 +-
.../log4j/core/layout/SyslogLayoutTest.java | 2 +-
.../log4j/core/lookup/ContextMapLookupTest.java | 4 +-
.../log4j/core/lookup/InterpolatorTest.java | 2 +-
.../logging/log4j/core/lookup/JndiLookupTest.java | 2 +-
.../log4j/core/lookup/MarkerLookupConfigTest.java | 2 +-
.../MutableLogEventWithReusableParamMsgTest.java | 75 ++
.../log4j/core/net/SocketMessageLossTest.java | 2 +-
.../apache/logging/log4j/core/net/SocketTest.java | 2 +-
.../log4j/core/pattern/CallerInformationTest.java | 4 +-
.../log4j/core/pattern/DisableAnsiTest.java | 4 +-
.../log4j/core/pattern/ExtendedThrowableTest.java | 4 +-
.../core/pattern/LiteralPatternConverterTest.java | 86 +-
.../core/pattern/MdcPatternConverterTest.java | 2 +-
.../core/pattern/MessageJansiConverterTest.java | 4 +-
.../core/pattern/MessageStyledConverterTest.java | 4 +-
.../core/pattern/NdcPatternConverterTest.java | 2 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 4 +-
.../log4j/core/pattern/RegexReplacementTest.java | 6 +-
.../log4j/core/pattern/RootThrowableTest.java | 4 +-
.../SequenceNumberPatternConverterTest.java | 4 +-
...quenceNumberPatternConverterZeroPaddedTest.java | 4 +-
.../log4j/core/pattern/StyleConverterTest.java | 4 +-
.../logging/log4j/core/pattern/ThrowableTest.java | 4 +-
.../log4j/core/tools/GenerateCustomLoggerTest.java | 4 +-
.../core/tools/GenerateExtendedLoggerTest.java | 4 +-
.../logging/log4j/core/util/NetUtilsTest.java | 120 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 2 +
.../logging/log4j/test/appender/ListAppender.java | 5 +-
log4j-csv/pom.xml | 5 +
.../CsvJsonParameterLayoutFileAppenderTest.java | 4 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 6 +-
.../csv/layout/CsvParameterLayoutAllAsyncTest.java | 4 +-
.../log4j/csv/layout/CsvParameterLayoutTest.java | 8 +-
log4j-docker/pom.xml | 19 -
log4j-flume-ng/pom.xml | 5 +
.../logging/log4j/io/AbstractStreamTest.java | 2 +-
.../log4j/io/IoBuilderCallerInfoTesting.java | 2 +-
.../org/apache/logging/log4j/io/IoBuilderTest.java | 2 +-
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 2 +-
.../logging/log4j/jcl/CallerInformationTest.java | 2 +-
.../org/apache/logging/log4j/jcl/LoggerTest.java | 2 +-
log4j-jdbc-dbcp2/pom.xml | 5 +
.../appender/PoolableConnectionFactoryTest.java | 2 +-
log4j-jdbc/pom.xml | 5 +
.../AbstractJdbcAppenderDataSourceTest.java | 4 +-
.../AbstractJdbcAppenderFactoryMethodTest.java | 2 +-
.../appender/DataSourceConnectionSourceTest.java | 5 +-
.../FactoryMethodConnectionSourceTest.java | 3 +-
.../JdbcAppenderColumnMappingLiteralTest.java | 2 +-
.../JdbcAppenderColumnMappingPatternTest.java | 2 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 4 +-
.../JdbcAppenderStringSubstitutionTest.java | 2 +-
.../logging/log4j/jdbc/appender/JdbcRule.java | 2 +-
log4j-jeromq/pom.xml | 5 +
.../log4j/jeromq/appender/JeroMqAppenderTest.java | 6 +-
log4j-jms/pom.xml | 5 +
.../log4j/jms/appender/JmsAppenderTest.java | 6 +-
log4j-jmx-gui/pom.xml | 62 -
log4j-jpa/pom.xml | 5 +
.../jpa/appender/AbstractJpaAppenderTest.java | 3 +-
.../log4j/jpa/appender/JpaH2AppenderTest.java | 2 +-
.../log4j/jpa/appender/JpaHsqldbAppenderTest.java | 3 +-
.../ContextDataAttributeConverterTest.java | 3 +-
.../ContextDataJsonAttributeConverterTest.java | 3 +-
.../ContextMapAttributeConverterTest.java | 3 +-
.../ContextMapJsonAttributeConverterTest.java | 3 +-
.../ContextStackAttributeConverterTest.java | 3 +-
.../ContextStackJsonAttributeConverterTest.java | 5 +-
.../converter/InstantAttributeConverterTest.java | 2 +-
.../converter/MarkerAttributeConverterTest.java | 3 +-
.../converter/MessageAttributeConverterTest.java | 3 +-
.../StackTraceElementAttributeConverterTest.java | 3 +-
.../converter/ThrowableAttributeConverterTest.java | 3 +-
log4j-jpl/pom.xml | 24 +-
.../logging/log4j/jul/AsyncLoggerThreadsTest.java | 7 +-
.../logging/log4j/jul/CallerInformationTest.java | 2 +-
log4j-kafka/pom.xml | 5 +
.../appender/KafkaAppenderCloseTimeoutTest.java | 6 +-
.../log4j/kafka/appender/KafkaAppenderTest.java | 6 +-
.../KafkaManagerProducerThreadLeakTest.java | 4 +-
.../kafka/builder/ConfigurationBuilderTest.java | 2 +-
log4j-kubernetes/pom.xml | 26 +-
log4j-layout-jackson-json/pom.xml | 5 +
.../jackson/json/JacksonIssue429MyNamesTest.java | 2 +-
.../log4j/jackson/json/JacksonIssue429Test.java | 2 +-
.../log4j/jackson/json/LevelMixInJsonTest.java | 2 +-
.../log4j/jackson/json/MarkerMixInJsonTest.java | 2 +-
.../json/StackTraceElementJsonMixInTest.java | 2 +-
.../ConcurrentLoggingWithJsonLayoutTest.java | 2 +-
.../jackson/json/layout/JsonLayoutMillisTest.java | 4 +-
.../log4j/jackson/json/layout/JsonLayoutTest.java | 2 +-
log4j-layout-jackson-xml/pom.xml | 5 +
.../xml/ExtendedStackTraceElementXmlMixIn.java | 18 +-
.../jackson/xml/StackTraceElementXmlMixIn.java | 17 +-
.../log4j/jackson/xml/LevelMixInXmlTest.java | 2 +-
.../log4j/jackson/xml/MarkerMixInXmlTest.java | 2 +-
.../jackson/xml/StackTraceElementXmlMixInTest.java | 2 +-
.../layout/ConcurrentLoggingWithXmlLayoutTest.java | 2 +-
.../log4j/jackson/xml/layout/XmlLayoutTest.java | 4 +-
log4j-layout-jackson-yaml/pom.xml | 5 +
.../log4j/jackson/yaml/LevelMixInYamlTest.java | 2 +-
.../log4j/jackson/yaml/MarkerMixInYamlTest.java | 2 +-
.../yaml/StackTraceElementYamlMixInTest.java | 2 +-
.../ConcurrentLoggingWithYamlLayoutTest.java | 2 +-
.../log4j/jackson/yaml/layout/YamlLayoutTest.java | 2 +-
.../jackson/ExtendedStackTraceElementMixIn.java | 19 +
.../Log4jStackTraceElementDeserializer.java | 68 +-
.../log4j/jackson/StackTraceElementConstants.java | 3 +
.../log4j/jackson/StackTraceElementMixIn.java | 12 +
.../logging/log4j/jackson/LevelMixInTest.java | 2 +-
.../JsonTemplateLayoutAdditionalFieldJsonTest.java | 4 +-
...emplateLayoutAdditionalFieldPropertiesTest.java | 4 +-
.../JsonTemplateLayoutAdditionalFieldXmlTest.java | 4 +-
.../JsonTemplateLayoutAdditionalFieldYamlTest.java | 4 +-
.../template/json/util/RecyclerFactoriesTest.java | 4 +-
log4j-liquibase/pom.xml | 5 +
log4j-mongodb3/pom.xml | 5 +
.../log4j/mongodb3/MongoDb3AuthFailureTest.java | 4 +-
.../logging/log4j/mongodb3/MongoDb3CappedTest.java | 4 +-
.../log4j/mongodb3/MongoDb3MapMessageTest.java | 4 +-
.../logging/log4j/mongodb3/MongoDb3Test.java | 4 +-
log4j-mongodb4/pom.xml | 5 +
.../log4j/mongodb4/MongoDb4AuthFailureTest.java | 4 +-
.../logging/log4j/mongodb4/MongoDb4CappedTest.java | 4 +-
.../log4j/mongodb4/MongoDb4MapMessageTest.java | 4 +-
.../logging/log4j/mongodb4/MongoDb4Test.java | 4 +-
log4j-osgi/pom.xml | 12 +
.../jmh/ParameterizedMessageInliningBenchmark.java | 3 +-
log4j-plugins-java9/pom.xml | 173 ---
log4j-plugins-java9/src/assembly/java9.xml | 41 -
.../org/apache/logging/log4j/plugins/Dummy.java | 24 -
.../apache/logging/log4j/plugins/bind/Dummy.java | 24 -
.../logging/log4j/plugins/convert/Dummy.java | 24 -
.../plugins/convert/plugins/Log4jPlugins.java | 25 -
.../apache/logging/log4j/plugins/inject/Dummy.java | 24 -
.../apache/logging/log4j/plugins/name/Dummy.java | 24 -
.../log4j/plugins/processor/PluginService.java | 24 -
.../apache/logging/log4j/plugins/util/Dummy.java | 24 -
.../logging/log4j/plugins/validation/Dummy.java | 24 -
.../plugins/validation/constraints/Dummy.java | 24 -
.../log4j/plugins/validation/validators/Dummy.java | 24 -
log4j-plugins/pom.xml | 193 ++-
.../log4j/plugins/internal/util/BeanUtils.java | 25 +-
.../plugins/name/AnnotatedElementNameProvider.java | 6 +-
.../src/main/java9}/module-info.java | 3 +
.../log4j/plugins/test}/processor/FakePlugin.java | 2 +-
.../AbstractPluginWithGenericBuilder.java | 2 +-
.../plugins/test}/validation/HostAndPort.java | 2 +-
.../PluginWithGenericSubclassFoo1Builder.java | 2 +-
.../plugins/test}/validation/ValidatingPlugin.java | 2 +-
.../ValidatingPluginWithGenericBuilder.java | 2 +-
.../ValidatingPluginWithTypedBuilder.java | 2 +-
.../plugins/processor/PluginProcessorTest.java | 7 +-
.../util/ResolverUtilCustomProtocolTest.java | 4 +-
.../log4j/plugins/util/ResolverUtilTest.java | 5 +-
log4j-plugins/src/test/java9/module-info.java | 16 +
log4j-redis/pom.xml | 5 +
log4j-slf4j-impl/pom.xml | 5 +
.../logging/slf4j/CallerInformationTest.java | 2 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 2 +-
.../org/apache/logging/slf4j/OptionalTest.java | 2 +-
.../org/apache/logging/slf4j/SerializeTest.java | 4 +-
log4j-slf4j18-impl/pom.xml | 5 +
.../logging/slf4j/CallerInformationTest.java | 2 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 2 +-
.../org/apache/logging/slf4j/SerializeTest.java | 4 +-
log4j-smtp/pom.xml | 5 +
.../log4j/smtp/appender/SmtpAppenderAsyncTest.java | 2 +-
.../log4j/smtp/appender/SmtpAppenderTest.java | 2 +-
log4j-spring-boot/pom.xml | 43 -
.../config/client/Log4j2EventListenerTest.java | 2 +-
.../pom.xml | 46 -
.../pom.xml | 2 +-
log4j-taglib/pom.xml | 5 +
.../logging/log4j/taglib/CatchingTagTest.java | 2 +-
.../apache/logging/log4j/taglib/EnterTagTest.java | 2 +-
.../apache/logging/log4j/taglib/ExitTagTest.java | 2 +-
.../logging/log4j/taglib/IfEnabledTagTest.java | 2 +-
.../log4j/taglib/LoggingMessageTagSupportTest.java | 2 +-
pom.xml | 69 +-
src/site/asciidoc/manual/configuration.adoc | 6 +
src/site/asciidoc/manual/garbagefree.adoc | 2 +
src/site/asciidoc/manual/layouts.adoc | 2 +-
543 files changed, 3877 insertions(+), 4442 deletions(-)