This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch mean-bean-machine in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b381d8d66cdd0ce0a58d761df30215aa330ad019 Merge: 45306c2 2acc780 Author: Matt Sicker <[email protected]> AuthorDate: Sun May 23 14:10:35 2021 -0500 Merge branch 'master' into mean-bean-machine .asf.yaml | 17 + .github/dependabot.yml | 24 + .github/workflows/main.yml | 75 + .github/workflows/maven-toolchains.xml | 37 + .gitignore | 1 + .mvn/wrapper/maven-wrapper.jar | Bin 49519 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 3 +- .travis-toolchains.xml | 42 - .travis.yml | 34 - BUILDING.md | 12 +- Dockerfile | 22 +- Jenkinsfile | 94 - README.md | 10 +- SECURITY.md | 13 + log4j-1.2-api/pom.xml | 24 +- .../org/apache/log4j/bridge/LogEventAdapter.java | 2 +- .../org/apache/log4j/bridge/LogEventWrapper.java | 22 +- .../log4j/config/Log4j1ConfigurationConverter.java | 26 +- .../log4j/config/PropertiesConfiguration.java | 21 +- .../java/org/apache/log4j/spi/ErrorHandler.java | 2 +- .../log4j/xml/UnrecognizedElementHandler.java | 2 +- .../org/apache/log4j/xml/XmlConfiguration.java | 24 +- .../src/main/java/org/apache/log4j/Appender.java | 143 - .../java/org/apache/log4j/AppenderSkeleton.java | 177 - .../java/org/apache/log4j/BasicConfigurator.java | 45 - .../src/main/java/org/apache/log4j/Category.java | 571 --- .../java/org/apache/log4j/ConsoleAppender.java | 52 - .../src/src/main/java/org/apache/log4j/Layout.java | 89 - .../src/src/main/java/org/apache/log4j/Level.java | 252 -- .../src/main/java/org/apache/log4j/LogManager.java | 251 -- .../src/src/main/java/org/apache/log4j/Logger.java | 66 - .../src/src/main/java/org/apache/log4j/MDC.java | 77 - .../src/src/main/java/org/apache/log4j/NDC.java | 207 -- .../main/java/org/apache/log4j/PatternLayout.java | 40 - .../src/main/java/org/apache/log4j/Priority.java | 239 -- .../org/apache/log4j/PropertyConfigurator.java | 126 - .../java/org/apache/log4j/RenderedMessage.java | 60 - .../main/java/org/apache/log4j/SimpleLayout.java | 46 - .../main/java/org/apache/log4j/WriterAppender.java | 378 -- .../org/apache/log4j/bridge/AppenderAdapter.java | 86 - .../org/apache/log4j/bridge/AppenderWrapper.java | 101 - .../apache/log4j/bridge/ErrorHandlerAdapter.java | 59 - .../org/apache/log4j/bridge/FilterAdapter.java | 56 - .../org/apache/log4j/bridge/FilterWrapper.java | 47 - .../org/apache/log4j/bridge/LayoutAdapter.java | 73 - .../org/apache/log4j/bridge/LayoutWrapper.java | 48 - .../org/apache/log4j/bridge/LogEventAdapter.java | 217 -- .../org/apache/log4j/builders/BooleanHolder.java | 33 - .../org/apache/log4j/builders/BuilderManager.java | 94 - .../java/org/apache/log4j/builders/Holder.java | 39 - .../log4j/builders/appender/AppenderBuilder.java | 33 - .../builders/appender/ConsoleAppenderBuilder.java | 111 - .../appender/DailyRollingFileAppenderBuilder.java | 146 - .../builders/appender/FileAppenderBuilder.java | 135 - .../builders/appender/NullAppenderBuilder.java | 43 - .../appender/RollingFileAppenderBuilder.java | 170 - .../builders/filter/DenyAllFilterBuilder.java | 46 - .../log4j/builders/filter/FilterBuilder.java | 30 - .../builders/filter/LevelMatchFilterBuilder.java | 74 - .../builders/filter/LevelRangeFilterBuilder.java | 81 - .../builders/filter/StringMatchFilterBuilder.java | 75 - .../log4j/builders/layout/HtmlLayoutBuilder.java | 60 - .../log4j/builders/layout/LayoutBuilder.java | 30 - .../builders/layout/PatternLayoutBuilder.java | 77 - .../log4j/builders/layout/SimpleLayoutBuilder.java | 46 - .../log4j/builders/layout/TTCCLayoutBuilder.java | 103 - .../log4j/builders/layout/XmlLayoutBuilder.java | 59 - .../apache/log4j/config/InputStreamWrapper.java | 92 - .../apache/log4j/config/Log4j1Configuration.java | 57 - .../log4j/config/Log4j1ConfigurationConverter.java | 220 -- .../log4j/config/Log4j1ConfigurationFactory.java | 58 - .../log4j/config/Log4j1ConfigurationParser.java | 446 --- .../org/apache/log4j/config/PropertySetter.java | 287 -- .../log4j/config/PropertySetterException.java | 65 - .../java/org/apache/log4j/config/package-info.java | 20 - .../org/apache/log4j/helpers/NullEnumeration.java | 47 - .../org/apache/log4j/helpers/OptionConverter.java | 345 -- .../java/org/apache/log4j/helpers/QuietWriter.java | 69 - .../org/apache/log4j/helpers/package-info.java | 20 - .../org/apache/log4j/layout/Log4j1XmlLayout.java | 159 - .../org/apache/log4j/legacy/core/CategoryUtil.java | 65 - .../org/apache/log4j/legacy/core/ContextUtil.java | 34 - .../java/org/apache/log4j/or/ObjectRenderer.java | 27 - .../java/org/apache/log4j/or/RendererSupport.java | 26 - .../org/apache/log4j/or/ThreadGroupRenderer.java | 57 - .../org/apache/log4j/or/jms/MessageRenderer.java | 87 - .../main/java/org/apache/log4j/package-info.java | 20 - .../log4j/pattern/Log4j1MdcPatternConverter.java | 88 - .../log4j/pattern/Log4j1NdcPatternConverter.java | 63 - .../org/apache/log4j/spi/AppenderAttachable.java | 70 - .../java/org/apache/log4j/spi/Configurator.java | 55 - .../main/java/org/apache/log4j/spi/ErrorCode.java | 33 - .../java/org/apache/log4j/spi/ErrorHandler.java | 98 - .../src/main/java/org/apache/log4j/spi/Filter.java | 100 - .../apache/log4j/spi/HierarchyEventListener.java | 33 - .../java/org/apache/log4j/spi/LocationInfo.java | 75 - .../java/org/apache/log4j/spi/LoggerFactory.java | 33 - .../org/apache/log4j/spi/LoggerRepository.java | 109 - .../java/org/apache/log4j/spi/LoggingEvent.java | 131 - .../java/org/apache/log4j/spi/OptionHandler.java | 26 - .../org/apache/log4j/spi/RepositorySelector.java | 43 - .../org/apache/log4j/spi/ThrowableInformation.java | 69 - .../java/org/apache/log4j/spi/package-info.java | 20 - .../java/org/apache/log4j/xml/DOMConfigurator.java | 80 - .../org/apache/log4j/xml/Log4jEntityResolver.java | 51 - .../log4j/xml/UnrecognizedElementHandler.java | 42 - .../apache/log4j/xml/XmlConfigurationFactory.java | 926 ----- .../java/org/apache/log4j/xml/package-info.java | 20 - .../main/resources/org/apache/log4j/xml/log4j.dtd | 237 -- log4j-1.2-api/src/src/site/markdown/index.md | 48 - log4j-1.2-api/src/src/site/site.xml | 52 - .../apache/log4j/BasicConfigurationFactory.java | 70 - .../org/apache/log4j/CallerInformationTest.java | 65 - .../test/java/org/apache/log4j/CategoryTest.java | 209 -- .../src/test/java/org/apache/log4j/LevelTest.java | 284 -- .../test/java/org/apache/log4j/ListAppender.java | 83 - .../test/java/org/apache/log4j/LogWithMDCTest.java | 57 - .../java/org/apache/log4j/LogWithRouteTest.java | 58 - .../src/test/java/org/apache/log4j/LoggerTest.java | 525 --- .../test/java/org/apache/log4j/LoggingTest.java | 43 - .../test/java/org/apache/log4j/MDCTestCase.java | 49 - .../src/test/java/org/apache/log4j/NDCTest.java | 36 - .../test/java/org/apache/log4j/PriorityTest.java | 226 -- .../test/java/org/apache/log4j/VelocityTest.java | 61 - .../AbstractLog4j1ConfigurationConverterTest.java | 68 - .../org/apache/log4j/config/AutoConfigTest.java | 66 - .../Log4j1ConfigurationConverterHadoopTest.java | 39 - .../Log4j1ConfigurationConverterSparkTest.java | 39 - .../config/Log4j1ConfigurationFactoryTest.java | 249 -- .../log4j/config/XmlConfigurationFactoryTest.java | 82 - .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 88 - .../pattern/Log4j1MdcPatternConverterTest.java | 78 - .../pattern/Log4j1NdcPatternConverterTest.java | 74 - .../apache/log4j/util/SerializationTestHelper.java | 148 - .../src/src/test/resources/L7D_en_US.properties | 17 - .../src/src/test/resources/L7D_fr.properties | 17 - .../src/src/test/resources/L7D_fr_CH.properties | 16 - .../src/main/resources/log4j.properties | 19 - .../hadoop-common/src/main/conf/log4j.properties | 323 -- .../src/test/resources/log4j.properties | 18 - .../hadoop-kms/src/test/resources/log4j.properties | 31 - .../src/main/resources/log4j.properties | 31 - .../hadoop-nfs/src/test/resources/log4j.properties | 18 - .../src/test/resources/log4j.properties | 49 - .../bkjournal/src/test/resources/log4j.properties | 55 - .../src/test/resources/log4j.properties | 49 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../hadoop-aws/src/test/resources/log4j.properties | 23 - .../src/test/resources/log4j.properties | 25 - .../src/test/resources/log4j.properties | 42 - .../src/main/sample-conf/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 37 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 63 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../src/test/resources/log4j.properties | 19 - .../log4j-DailyRollingFileAppender.properties | 26 - .../config-1.2/log4j-NullAppender.properties | 9 - ...log4j-RollingFileAppender-with-props.properties | 27 - .../log4j-RollingFileAppender.properties | 22 - .../log4j-console-EnhancedPatternLayout.properties | 18 - .../config-1.2/log4j-console-HtmlLayout.properties | 19 - .../log4j-console-PatternLayout.properties | 18 - .../log4j-console-SimpleLayout.properties | 17 - .../config-1.2/log4j-console-TTCCLayout.properties | 19 - .../config-1.2/log4j-console-XmlLayout.properties | 19 - .../config-1.2/log4j-file-SimpleLayout.properties | 17 - .../log4j-system-properties-1.properties | 14 - .../log4j-system-properties-2.properties | 15 - .../resources/config-1.2/spark/R/log4j.properties | 28 - .../src/test/resources/log4j.properties | 27 - .../src/test/resources/log4j.properties | 24 - .../spark/core/src/test/resources/log4j.properties | 36 - .../flume-sink/src/test/resources/log4j.properties | 28 - .../flume/src/test/resources/log4j.properties | 28 - .../src/test/resources/log4j.properties | 27 - .../kafka-0-10/src/test/resources/log4j.properties | 28 - .../kafka-0-8/src/test/resources/log4j.properties | 28 - .../src/main/resources/log4j.properties | 37 - .../src/test/resources/log4j.properties | 27 - .../graphx/src/test/resources/log4j.properties | 27 - .../launcher/src/test/resources/log4j.properties | 33 - .../mllib/src/test/resources/log4j.properties | 28 - .../spark/repl/src/test/resources/log4j.properties | 27 - .../catalyst/src/test/resources/log4j.properties | 27 - .../sql/core/src/test/resources/log4j.properties | 57 - .../sql/hive/src/test/resources/log4j.properties | 61 - .../streaming/src/test/resources/log4j.properties | 28 - .../spark/yarn/src/test/resources/log4j.properties | 31 - log4j-1.2-api/src/src/test/resources/hello.vm | 6 - .../src/src/test/resources/log-RouteWithMDC.xml | 47 - log4j-1.2-api/src/src/test/resources/log4j.xml | 36 - .../src/src/test/resources/log4j1-file.xml | 57 - .../src/src/test/resources/log4j1-list.xml | 36 - .../src/src/test/resources/log4j2-config.xml | 39 - .../src/src/test/resources/logWithMDC.xml | 40 - .../test/resources/witness/serialization/info.bin | Bin 60 -> 0 bytes .../org/apache/log4j/CallerInformationTest.java | 4 +- .../test/java/org/apache/log4j/CategoryTest.java | 2 +- .../test/java/org/apache/log4j/LogWithMDCTest.java | 4 +- .../java/org/apache/log4j/LogWithRouteTest.java | 4 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 2 +- .../test/java/org/apache/log4j/LoggingTest.java | 2 +- .../apache/log4j/bridge/LogEventWrapperTest.java | 50 + .../AbstractLog4j1ConfigurationConverterTest.java | 21 +- .../config/Log4j1ConfigurationFactoryTest.java | 2 +- .../config/PropertiesReconfigurationTest.java | 95 + .../apache/log4j/config/SyslogAppenderTest.java | 4 +- .../log4j/config/XmlReconfigurationTest.java | 96 + .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 2 +- .../pattern/Log4j1NdcPatternConverterTest.java | 2 +- .../apache/log4j/util/SerializationTestHelper.java | 2 + log4j-api-java9/pom.xml | 153 - log4j-api-java9/src/assembly/java9.xml | 44 - log4j-api-java9/src/main/java/module-info.java | 28 - .../main/java/org/apache/logging/log4j/Dummy.java | 24 - .../logging/log4j/log4j/util/PropertySource.java | 24 - .../org/apache/logging/log4j/message/Dummy.java | 24 - .../logging/log4j/message/ThreadDumpMessage.java | 27 - .../org/apache/logging/log4j/simple/Dummy.java | 24 - .../org/apache/logging/log4j/spi/Provider.java | 24 - .../org/apache/logging/log4j/status/Dummy.java | 24 - .../util/PrivateSecurityManagerStackTraceUtil.java | 34 - .../apache/logging/log4j/util/StackLocator.java | 110 - .../util/internal/DefaultObjectInputFilter.java | 100 - .../logging/log4j/util/ProcessIdUtilTest.java | 29 - .../logging/log4j/util/StackLocatorTest.java | 152 - log4j-api/pom.xml | 231 +- log4j-api/src/main/java/module-info.java | 31 + .../main/java/org/apache/logging/log4j/Level.java | 4 +- .../java/org/apache/logging/log4j/LogBuilder.java | 73 +- .../java/org/apache/logging/log4j/LogManager.java | 11 +- .../main/java/org/apache/logging/log4j/Logger.java | 8 +- .../org/apache/logging/log4j/ThreadContext.java | 3 +- .../logging/log4j/internal/DefaultLogBuilder.java | 9 + .../log4j/internal/DefaultObjectInputFilter.java | 100 + .../logging/log4j/internal/LogManagerStatus.java | 33 + .../log4j/message/AbstractMessageFactory.java | 3 +- .../log4j/message/FormattedMessageFactory.java | 3 +- .../logging/log4j/message/LocalizedMessage.java | 2 + .../log4j/message/LocalizedMessageFactory.java | 5 +- .../apache/logging/log4j/message/MapMessage.java | 30 +- .../logging/log4j/message/MessageFactory2.java | 1 + .../log4j/message/MessageFormatMessageFactory.java | 3 +- .../logging/log4j/message/ParameterConsumer.java | 2 +- .../logging/log4j/message/ParameterFormatter.java | 158 +- .../log4j/message/ParameterizedMessageFactory.java | 3 +- .../ParameterizedNoReferenceMessageFactory.java | 1 + .../logging/log4j/message/ReusableMessage.java | 2 +- .../message/ReusableParameterizedMessage.java | 22 +- .../log4j/message/SimpleMessageFactory.java | 3 +- .../log4j/message/StringFormattedMessage.java | 3 +- .../message/StringFormatterMessageFactory.java | 1 + .../logging/log4j/message/StructuredDataId.java | 9 +- .../log4j/message/StructuredDataMessage.java | 2 +- .../logging/log4j/message/ThreadDumpMessage.java | 1 - .../log4j/simple/SimpleLoggerContextFactory.java | 5 + .../apache/logging/log4j/spi/AbstractLogger.java | 10 +- .../logging/log4j/spi/AbstractLoggerAdapter.java | 1 + .../apache/logging/log4j/spi/LoggerContext.java | 25 + .../logging/log4j/spi/LoggerContextFactory.java | 13 + .../log4j/spi/MutableThreadContextStack.java | 2 +- .../logging/log4j/spi/ObjectThreadContextMap.java | 3 + .../apache/logging/log4j/spi/ThreadContextMap.java | 2 +- .../org/apache/logging/log4j/util/Constants.java | 2 +- .../log4j/util/FilteredObjectInputStream.java | 1 + .../log4j/util/IndexedReadOnlyStringMap.java | 1 + .../org/apache/logging/log4j/util/LambdaUtil.java | 1 + .../org/apache/logging/log4j/util/LoaderUtil.java | 46 +- .../apache/logging/log4j/util/MessageSupplier.java | 2 +- .../org/apache/logging/log4j/util/NameUtil.java | 43 +- .../logging/log4j/util/PerformanceSensitive.java | 5 +- .../apache/logging/log4j/util/ProcessIdUtil.java | 0 .../logging/log4j/util/ReadOnlyStringMap.java | 1 + .../apache/logging/log4j/util/ReflectionUtil.java | 2 +- .../logging/log4j/util/SortedArrayStringMap.java | 17 +- .../apache/logging/log4j/util/StackLocator.java | 223 +- .../logging/log4j/util/StackLocatorUtil.java | 23 +- .../org/apache/logging/log4j/util/Strings.java | 64 +- .../java/org/apache/logging/log4j/util/Timer.java | 4 +- .../src/main/resources/META-INF/MANIFEST.MF | 0 log4j-api/src/test/java-test/module-info.java | 32 + .../log4j/test/AbstractSerializationTest.java | 50 + .../logging/log4j/test/SerializableMatchers.java | 58 + .../org/apache/logging/log4j/test/TestLogger.java | 202 ++ .../logging/log4j/test/TestLoggerContext.java | 69 + .../log4j/test/TestLoggerContextFactory.java | 51 + .../logging/log4j/test/ThreadContextHolder.java | 80 + .../logging/log4j/test/ThreadContextTest.java | 194 ++ .../log4j/test/ThreadContextUtilityClass.java | 115 + .../test/junit/AbstractExternalFileCleaner.java | 185 + .../log4j/test/junit/AbstractFileCleaner.java | 90 + .../logging/log4j/test/junit/ClassMatchers.java | 37 + .../logging/log4j/test/junit/CleanFiles.java | 68 + .../logging/log4j/test/junit/CleanFolders.java | 110 + .../log4j/test/junit/CleanUpDirectories.java | 46 + .../logging/log4j/test/junit/CleanUpFiles.java | 46 + .../logging/log4j/test/junit/DirectoryCleaner.java | 70 + .../logging/log4j/test/junit/FileCleaner.java | 52 + .../junit/LogManagerLoggerContextFactoryRule.java | 52 + .../test/junit/LoggerContextFactoryExtension.java | 54 + .../apache/logging/log4j/test/junit/Mutable.java | 35 + .../log4j/test/junit/SecurityManagerTestRule.java | 94 + .../logging/log4j/test/junit/SerialUtil.java | 65 + .../log4j/test/junit/StatusLoggerLevel.java | 44 + .../test/junit/StatusLoggerLevelExtension.java | 50 + .../logging/log4j/test/junit/StatusLoggerRule.java | 51 + .../log4j/test/junit/ThreadContextExtension.java | 57 + .../log4j/test/junit/ThreadContextMapRule.java | 40 + .../log4j/test/junit/ThreadContextRule.java | 81 + .../log4j/test/junit/ThreadContextStackRule.java | 39 + .../test/junit/URLStreamHandlerFactoryRule.java | 97 + .../log4j/test/junit/UsingAnyThreadContext.java | 45 + .../log4j/test/junit/UsingThreadContextMap.java | 45 + .../log4j/test/junit/UsingThreadContextStack.java | 45 + log4j-api/src/test/java/module-info.java | 35 + .../apache/logging/log4j/AbstractLoggerTest.java | 184 +- .../logging/log4j/AbstractSerializationTest.java | 50 - .../logging/log4j/CloseableThreadContextTest.java | 127 +- .../org/apache/logging/log4j/EventLoggerTest.java | 24 +- .../org/apache/logging/log4j/LambdaLoggerTest.java | 18 +- .../java/org/apache/logging/log4j/LevelTest.java | 21 +- .../org/apache/logging/log4j/LogManagerTest.java | 68 +- .../apache/logging/log4j/LoggerSupplierTest.java | 423 +-- .../java/org/apache/logging/log4j/LoggerTest.java | 1260 +++---- .../java/org/apache/logging/log4j/MarkerTest.java | 37 +- .../logging/log4j/NoopThreadContextTest.java | 17 +- .../apache/logging/log4j/SerializableMatchers.java | 58 - .../java/org/apache/logging/log4j/TestLogger.java | 199 -- .../apache/logging/log4j/TestLoggerContext.java | 68 - .../logging/log4j/TestLoggerContextFactory.java | 46 - .../org/apache/logging/log4j/TestProvider.java | 1 + .../apache/logging/log4j/ThreadContextHolder.java | 79 - .../log4j/ThreadContextInheritanceTest.java | 54 +- .../apache/logging/log4j/ThreadContextTest.java | 193 -- .../logging/log4j/ThreadContextUtilityClass.java | 116 - .../org/apache/logging/log4j/TraceLoggingTest.java | 28 +- .../log4j/junit/AbstractExternalFileCleaner.java | 185 - .../apache/logging/log4j/junit/ClassMatchers.java | 37 - .../org/apache/logging/log4j/junit/CleanFiles.java | 68 - .../apache/logging/log4j/junit/CleanFolders.java | 106 - .../junit/LogManagerLoggerContextFactoryRule.java | 49 - .../org/apache/logging/log4j/junit/Mutable.java | 35 - .../log4j/junit/SecurityManagerTestRule.java | 94 - .../org/apache/logging/log4j/junit/SerialUtil.java | 65 - .../logging/log4j/junit/StatusLoggerRule.java | 49 - .../logging/log4j/junit/ThreadContextMapRule.java | 37 - .../logging/log4j/junit/ThreadContextRule.java | 78 - .../log4j/junit/ThreadContextStackRule.java | 37 - .../log4j/junit/URLStreamHandlerFactoryRule.java | 97 - .../log4j/message/FormattedMessageTest.java | 28 +- .../log4j/message/LocalizedMessageFactoryTest.java | 15 +- .../log4j/message/LocalizedMessageTest.java | 21 +- .../logging/log4j/message/MapMessageTest.java | 16 +- .../MessageFormatMessageSerializationTest.java | 6 +- .../log4j/message/MessageFormatMessageTest.java | 21 +- .../log4j/message/MessageFormatsPerfTest.java | 12 +- .../log4j/message/ObjectArrayMessageTest.java | 82 +- .../logging/log4j/message/ObjectMessageTest.java | 17 +- .../log4j/message/ParameterFormatterTest.java | 31 +- .../log4j/message/ParameterizedMessageTest.java | 10 +- .../log4j/message/ReusableMessageFactoryTest.java | 8 +- .../log4j/message/ReusableObjectMessageTest.java | 4 +- .../message/ReusableParameterizedMessageTest.java | 10 +- .../log4j/message/ReusableSimpleMessageTest.java | 4 +- .../logging/log4j/message/SimpleMessageTest.java | 4 +- .../log4j/message/StringFormattedMessageTest.java | 32 +- .../log4j/message/StructuredDataMessageTest.java | 9 +- .../log4j/message/ThreadDumpMessageTest.java | 33 +- .../logging/log4j/simple/SimpleLoggerTest.java | 17 +- .../log4j/spi/DefaultThreadContextMapTest.java | 18 +- .../log4j/spi/DefaultThreadContextStackTest.java | 27 +- .../logging/log4j/spi/LoggerAdapterTest.java | 19 +- .../log4j/spi/MutableThreadContextStackTest.java | 56 +- .../status/StatusLoggerSerializationTest.java | 2 +- .../org/apache/logging/log4j/util/AssertTest.java | 26 +- .../org/apache/logging/log4j/util/CharsTest.java | 36 +- .../apache/logging/log4j/util/ConstantsTest.java | 4 +- .../logging/log4j/util/DeserializerHelper.java | 1 + ...EnvironmentPropertySourceSecurityManagerIT.java | 6 +- .../log4j/util/EnvironmentPropertySourceTest.java | 24 +- .../apache/logging/log4j/util/LambdaUtilTest.java | 72 +- .../util/LegacyPropertiesCompatibilityTest.java | 26 +- .../apache/logging/log4j/util/LoaderUtilTest.java | 15 +- .../log4j/util/Log4jCharsetsPropertiesTest.java | 15 +- .../log4j/util/PropertiesPropertySourceTest.java | 21 +- .../logging/log4j/util/PropertiesUtilTest.java | 28 +- ...ropertyFilePropertySourceSecurityManagerIT.java | 14 +- .../log4j/util/PropertySourceCamelCaseTest.java | 24 +- .../log4j/util/PropertySourceTokenizerTest.java | 24 +- .../logging/log4j/util/ProviderUtilTest.java | 16 +- .../log4j/util/SortedArrayStringMapTest.java | 297 +- .../logging/log4j/util/StackLocatorUtilTest.java | 12 +- .../logging/log4j/util/StringBuildersTest.java | 16 +- .../org/apache/logging/log4j/util/StringsTest.java | 64 +- ...mPropertiesPropertySourceSecurityManagerIT.java | 11 +- .../util/SystemPropertiesPropertySourceTest.java | 44 +- .../org/apache/logging/log4j/util/Unbox1Test.java | 53 +- .../logging/log4j/util/Unbox2ConfigurableTest.java | 35 +- .../src/test/resources/Log4j-charsets.properties | 48 + log4j-appserver/pom.xml | 20 +- log4j-bom/pom.xml | 41 +- log4j-cassandra/pom.xml | 22 +- .../log4j/cassandra/CassandraAppenderIT.java | 4 +- log4j-core-its/pom.xml | 29 +- .../logging/log4j/FilterPerformanceComparison.java | 2 +- .../logging/log4j/PerformanceComparison.java | 4 +- .../org/apache/logging/log4j/PerformanceRun.java | 4 +- .../apache/logging/log4j/core/SimplePerfTest.java | 93 +- .../logging/log4j/core/ThreadedPerfTest.java | 2 +- .../apache/logging/log4j/core/ThreadedTest.java | 4 +- .../log4j/core/appender/HttpAppenderTest.java | 4 +- .../appender/JsonCompleteFileAppenderTest.java | 10 +- .../SecureSocketAppenderSocketOptionsTest.java | 6 +- .../appender/SocketAppenderBufferSizeTest.java | 4 +- .../appender/SocketAppenderSocketOptionsTest.java | 4 +- .../log4j/core/appender/SocketAppenderTest.java | 2 +- .../core/appender/XmlCompactFileAppenderTest.java | 4 +- .../XmlCompactFileAppenderValidationTest.java | 2 +- .../XmlCompactFileAsyncAppenderValidationTest.java | 4 +- .../core/appender/XmlCompleteFileAppenderTest.java | 8 +- .../log4j/core/appender/XmlFileAppenderTest.java | 4 +- .../appender/XmlRandomAccessFileAppenderTest.java | 4 +- log4j-core-java9/pom.xml | 150 - log4j-core-java9/src/assembly/java9.xml | 51 - .../org/apache/logging/log4j/core/util/Clock.java | 32 - .../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/README.md | 37 + log4j-core/pom.xml | 331 +- log4j-core/src/main/assembly/test-resources.xml | 33 + .../apache/logging/log4j/core/LoggerContext.java | 20 +- .../log4j/core/appender/AbstractManager.java | 7 +- .../logging/log4j/core/appender/AsyncAppender.java | 139 +- .../appender/AsyncAppenderEventDispatcher.java | 174 + .../log4j/core/appender/FailoverAppender.java | 2 +- .../logging/log4j/core/appender/FileManager.java | 6 +- .../core/appender/MemoryMappedFileManager.java | 12 +- .../log4j/core/appender/OutputStreamManager.java | 11 +- .../log4j/core/appender/RollingFileAppender.java | 2 +- .../log4j/core/appender/rolling/FileSize.java | 2 +- .../core/appender/rolling/PatternProcessor.java | 11 +- .../core/appender/rolling/RollingFileManager.java | 79 +- .../rolling/RollingRandomAccessFileManager.java | 12 +- .../core/appender/rolling/RolloverListener.java | 37 + .../rolling/action/AbstractPathAction.java | 2 +- .../core/appender/routing/RoutingAppender.java | 2 +- .../core/async/AsyncLoggerConfigDisruptor.java | 10 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 13 +- .../async/BasicAsyncLoggerContextSelector.java | 84 + .../core/async/DefaultAsyncQueueFullPolicy.java | 9 +- .../logging/log4j/core/async/DisruptorUtil.java | 64 +- .../core/async/RingBufferLogEventTranslator.java | 4 +- .../log4j/core/config/AbstractConfiguration.java | 121 +- .../logging/log4j/core/config/AppenderControl.java | 8 +- .../log4j/core/config/ConfigurationFactory.java | 78 +- .../log4j/core/config/ConfigurationScheduler.java | 28 +- .../log4j/core/config/ConfigurationSource.java | 58 +- .../logging/log4j/core/config/Configurator.java | 22 + .../core/config/LockingReliabilityStrategy.java | 2 +- .../log4j/core/config/arbiters/Arbiter.java | 27 + .../log4j/core/config/arbiters/ClassArbiter.java | 75 + .../log4j/core/config/arbiters/DefaultArbiter.java | 53 + .../log4j/core/config/arbiters/ScriptArbiter.java | 121 + .../log4j/core/config/arbiters/SelectArbiter.java | 64 + .../config/arbiters/SystemPropertyArbiter.java | 93 + .../builder/impl/DefaultConfigurationBuilder.java | 66 +- .../plugins/visitors/PluginAttributeVisitor.java | 3 +- .../visitors/PluginBuilderAttributeVisitor.java | 5 +- .../properties/PropertiesConfigurationBuilder.java | 2 +- .../core/config/status/StatusConfiguration.java | 2 +- .../logging/log4j/core/filter/TimeFilter.java | 2 +- .../log4j/core/impl/ExtendedStackTraceElement.java | 34 + .../log4j/core/impl/Log4jContextFactory.java | 61 +- .../log4j/core/impl/ThreadContextDataInjector.java | 50 +- .../log4j/core/layout/AbstractStringLayout.java | 2 +- .../logging/log4j/core/layout/GelfLayout.java | 230 +- .../logging/log4j/core/layout/HtmlLayout.java | 59 +- .../log4j/core/layout/ScriptPatternSelector.java | 4 +- .../logging/log4j/core/lookup/Interpolator.java | 4 +- .../log4j/core/net/ssl/SslConfiguration.java | 3 +- .../core/pattern/AbstractStyleNameConverter.java | 13 +- .../core/pattern/EncodingPatternConverter.java | 9 + .../log4j/core/pattern/RepeatPatternConverter.java | 103 + .../logging/log4j/core/plugins/package-info.java | 20 + .../log4j/core/selector/BasicContextSelector.java | 13 +- .../core/selector/ClassLoaderContextSelector.java | 28 +- .../log4j/core/selector/ContextSelector.java | 49 + .../log4j/core/selector/CoreContextSelectors.java | 8 +- .../log4j/core/selector/JndiContextSelector.java | 5 + .../log4j/core/time/internal/SystemClock.java | 23 +- .../core/time/internal/format/FixedDateFormat.java | 4 +- .../apache/logging/log4j/core/util/ArrayUtils.java | 11 + .../core/util/DefaultShutdownCallbackRegistry.java | 52 +- .../org/apache/logging/log4j/core/util/Loader.java | 4 +- .../apache/logging/log4j/core/util/NetUtils.java | 38 +- .../log4j/core/util/ShutdownCallbackRegistry.java | 4 + .../apache/logging/log4j/core/util/Throwables.java | 22 +- .../logging/log4j/core/util/WatchManager.java | 351 +- .../logging/log4j/core/util/WatcherFactory.java | 2 +- log4j-core/src/main/java9/module-info.java | 86 + log4j-core/src/main/resources/Log4j-config.xsd | 1469 +++++++- .../src/main/resources/META-INF/MANIFEST.MF | 0 .../log4j/core/test/AvailablePortFinder.java | 155 + .../test/AvailablePortSystemPropertyTestRule.java | 81 + .../log4j/core/test/BasicConfigurationFactory.java | 62 + .../log4j/core/test/CoreLoggerContexts.java | 52 + .../logging/log4j/core/test/ExtendedLevels.java | 30 + .../apache/logging/log4j/core/test/GetLogger.java | 37 + .../logging/log4j/core/test/RuleChainFactory.java | 45 + .../logging/log4j/core/test/TestMarkers.java | 34 + .../core/test/appender/AlwaysFailAppender.java | 49 + .../log4j/core/test/appender/BlockingAppender.java | 65 + .../core/test/appender/EncodingListAppender.java | 85 + .../log4j/core/test/appender/FailOnceAppender.java | 128 + .../log4j/core/test/appender/InMemoryAppender.java | 60 + .../log4j/core/test/appender/ListAppender.java | 296 ++ .../log4j/core/test/categories/Appenders.java | 33 + .../log4j/core/test/categories/AsyncLoggers.java | 23 + .../log4j/core/test/categories/Configurations.java | 25 + .../log4j/core/test/categories/GarbageFree.java | 24 + .../log4j/core/test/categories/Layouts.java | 28 + .../core/test/categories/PerformanceTests.java | 24 + .../log4j/core/test/categories/Scripts.java | 24 + .../log4j/core/test/categories/package-info.java | 22 + .../log4j/core/test/hamcrest/Descriptors.java | 44 + .../log4j/core/test/hamcrest/FileMatchers.java | 163 + .../log4j/core/test/hamcrest/MapMatchers.java | 62 + .../log4j/core/test/junit/AppenderResolver.java | 54 + .../core/test/junit/ConfigurationResolver.java | 38 + .../logging/log4j/core/test/junit/JndiRule.java | 59 + .../core/test/junit/LoggerContextResolver.java | 156 + .../log4j/core/test/junit/LoggerContextRule.java | 319 ++ .../log4j/core/test/junit/LoggerContextSource.java | 79 + .../logging/log4j/core/test/junit/Named.java | 41 + .../core/test/junit/ReconfigurationPolicy.java | 35 + .../test/junit/TypeBasedParameterResolver.java | 80 + .../log4j/core/test/junit/package-info.java | 22 + .../log4j/core/test/layout/Log4j2_1482_Test.java | 92 + .../log4j/core/test/layout/LogEventFixtures.java | 109 + .../log4j/core/test/net/mock/MockSyslogServer.java | 49 + .../test/net/mock/MockSyslogServerFactory.java | 39 + .../core/test/net/mock/MockTcpSyslogServer.java | 94 + .../core/test/net/mock/MockTlsSyslogServer.java | 154 + .../core/test/net/mock/MockUdpSyslogServer.java | 70 + .../ssl/LegacyBsdTlsSyslogInputStreamReader.java | 61 + .../log4j/core/test/net/ssl/TestConstants.java | 40 + .../test/net/ssl/TlsSyslogInputStreamReader.java | 91 + .../net/ssl/TlsSyslogInputStreamReaderBase.java | 35 + .../core/test/net/ssl/TlsSyslogMessageFormat.java | 23 + .../test/parser/AbstractLogEventParserTest.java | 59 + .../log4j/core/test/util/FixedTimeClock.java | 36 + .../logging/log4j/core/test/util/Profiler.java | 94 + log4j-core/src/test/java-test9/module-info.java | 25 + .../log4j/FormatterLoggerManualExample.java | 54 - .../org/apache/logging/log4j/LogRolloverTest.java | 43 - .../apache/logging/log4j/LogbackSubstitution.java | 51 - .../java/org/apache/logging/log4j/TestMarkers.java | 31 - .../logging/log4j/ThreadContextTestAccess.java | 34 - .../apache/logging/log4j/categories/Appenders.java | 33 - .../logging/log4j/categories/AsyncLoggers.java | 23 - .../logging/log4j/categories/Configurations.java | 25 - .../apache/logging/log4j/categories/Layouts.java | 28 - .../logging/log4j/categories/PerformanceTests.java | 24 - .../logging/log4j/categories/package-info.java | 22 - .../log4j/core/AppenderRefLevelJsonTest.java | 44 +- .../logging/log4j/core/AppenderRefLevelTest.java | 51 +- .../log4j/core/BasicConfigurationFactory.java | 61 - .../logging/log4j/core/BasicLoggingTest.java | 7 +- .../logging/log4j/core/CollectionLoggingTest.java | 45 +- .../logging/log4j/core/CoreLoggerContexts.java | 51 - .../log4j/core/CustomLevelsOverrideTest.java | 37 +- .../logging/log4j/core/CustomLevelsTest.java | 36 +- .../log4j/core/CustomLevelsWithFiltersTest.java | 31 +- .../apache/logging/log4j/core/DeadlockTest.java | 20 +- .../log4j/core/EventParameterMemoryLeakTest.java | 18 +- .../logging/log4j/core/ExtendedLevelTest.java | 47 +- .../log4j/core/FormatterLoggerManualExample.java | 55 + .../log4j/core/GcFreeAsynchronousLoggingTest.java | 46 - .../logging/log4j/core/GcFreeLoggingTestUtil.java | 198 -- .../log4j/core/GcFreeMixedSyncAyncLoggingTest.java | 41 - .../log4j/core/GcFreeSynchronousLoggingTest.java | 40 - .../apache/logging/log4j/core/HostNameTest.java | 45 +- .../apache/logging/log4j/core/LateConfigTest.java | 32 +- .../org/apache/logging/log4j/core/LevelTest.java | 62 +- .../apache/logging/log4j/core/Log4j1222Test.java | 6 +- .../logging/log4j/core/LogEventFactoryTest.java | 41 +- .../apache/logging/log4j/core/LogEventTest.java | 27 +- .../apache/logging/log4j/core/LogRolloverTest.java | 44 + .../logging/log4j/core/LogbackSubstitution.java | 50 + .../apache/logging/log4j/core/LoggerDateTest.java | 26 +- .../log4j/core/LoggerSerializationTest.java | 2 +- .../org/apache/logging/log4j/core/LoggerTest.java | 128 +- .../logging/log4j/core/LoggerUpdateTest.java | 56 +- .../org/apache/logging/log4j/core/LookupTest.java | 31 +- .../logging/log4j/core/PatternSelectorTest.java | 58 +- .../log4j/core/PropertiesFileConfigTest.java | 38 +- ...ReusableParameterizedMessageMemoryLeakTest.java | 7 +- .../logging/log4j/core/ShutdownDisabledTest.java | 22 +- .../core/ShutdownTimeoutConfigurationTest.java | 20 +- .../logging/log4j/core/StrictXmlConfigTest.java | 58 +- .../log4j/core/ThreadContextTestAccess.java | 47 + .../logging/log4j/core/TimestampMessageTest.java | 37 +- .../org/apache/logging/log4j/core/XmlEvents.java | 20 +- .../core/appender/AsyncAppenderNoLocationTest.java | 85 - .../appender/AsyncAppenderQueueFullPolicyTest.java | 46 +- .../appender/AsyncAppenderShutdownTimeoutTest.java | 42 - .../log4j/core/appender/AsyncAppenderTest.java | 167 +- .../core/appender/ConfigurationTestUtils.java | 74 +- .../core/appender/ConsoleAppenderBuilderTest.java | 13 +- .../appender/ConsoleAppenderJAnsiMessageMain.java | 5 +- .../ConsoleAppenderJAnsiXExceptionMain.java | 2 +- .../log4j/core/appender/ConsoleAppenderTest.java | 40 +- .../log4j/core/appender/FailoverAppenderTest.java | 66 +- .../core/appender/FileAppenderBuilderTest.java | 7 +- .../core/appender/FileAppenderPermissionsTest.java | 136 +- .../FileAppenderPermissionsXmlConfigTest.java | 66 - .../log4j/core/appender/FileAppenderTest.java | 159 +- .../log4j/core/appender/InMemoryAppenderTest.java | 17 +- .../MemoryMappedFileAppenderLocationTest.java | 95 - .../MemoryMappedFileAppenderRemapTest.java | 95 - .../MemoryMappedFileAppenderSimpleTest.java | 86 - .../appender/MemoryMappedFileAppenderTest.java | 119 + .../core/appender/MemoryMappedFileManagerTest.java | 28 +- .../core/appender/OutputStreamAppenderTest.java | 246 +- .../core/appender/OutputStreamManagerTest.java | 44 +- .../appender/RandomAccessFileAppenderTest.java | 4 +- .../core/appender/RandomAccessFileManagerTest.java | 115 +- .../core/appender/ReconfigureAppenderTest.java | 8 +- ...ollingRandomAccessFileAppenderRolloverTest.java | 2 +- .../core/appender/ScriptAppenderSelectorTest.java | 89 +- .../core/appender/SocketAppenderBuilderTest.java | 9 +- .../log4j/core/appender/SyslogAppenderTest.java | 2 +- .../core/appender/SyslogAppenderTestBase.java | 2 +- .../log4j/core/appender/TlsSyslogAppenderTest.java | 6 +- .../log4j/core/appender/TlsSyslogFrameTest.java | 16 +- .../log4j/core/appender/WriterAppenderTest.java | 25 +- .../appender/nosql/NoSqlDatabaseManagerTest.java | 2 +- .../rewrite/LoggerNameLevelRewritePolicyTest.java | 13 +- .../appender/rewrite/MapRewritePolicyTest.java | 58 +- .../core/appender/rewrite/RewriteAppenderTest.java | 82 +- .../appender/rolling/CronTriggeringPolicyTest.java | 11 +- .../core/appender/rolling/EligibleFilesTest.java | 10 +- .../log4j/core/appender/rolling/FileSizeTest.java | 11 +- .../rolling/OnStartupTriggeringPolicyTest.java | 64 +- .../appender/rolling/PatternProcessorTest.java | 45 +- .../RandomRollingAppenderOnStartupTest.java | 2 +- .../appender/rolling/RollingAppenderCountTest.java | 2 +- .../rolling/RollingAppenderCronAndSizeTest.java | 6 +- .../RollingAppenderCronEvery2DirectTest.java | 6 +- .../rolling/RollingAppenderCronEvery2Test.java | 6 +- .../rolling/RollingAppenderCronOnStartupTest.java | 107 + .../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 +- .../RollingAppenderOnStartupDirectTest.java | 109 + .../rolling/RollingAppenderOnStartupTest.java | 68 +- .../rolling/RollingAppenderReconfigureTest.java | 6 +- .../rolling/RollingAppenderRestartTest.java | 74 +- ...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 | 89 + .../rolling/RollingDirectTimeNewDirectoryTest.java | 100 + .../RollingFileAppenderReconfigureTest.java | 2 +- ...nderReconfigureUndefinedSystemPropertyTest.java | 2 +- .../appender/rolling/RollingNewDirectoryTest.java | 62 + ...ingRandomAccessFileManagerHeaderFooterTest.java | 2 +- .../RollingRandomAccessFileManagerTest.java | 96 +- .../RollingRandomAppenderDirectWriteTest.java | 6 +- ...gRandomAppenderDirectWriteWithFilenameTest.java | 2 +- .../rolling/RolloverWithDeletedOldFileTest.java | 2 +- .../appender/rolling/RolloverWithPaddingTest.java | 2 +- .../rolling/action/AbstractActionTest.java | 29 +- .../rolling/action/Bzip2CompressActionTest.java | 39 +- .../appender/rolling/action/DeleteActionTest.java | 22 +- .../rolling/action/DeletingVisitorTest.java | 10 +- .../rolling/action/DummyFileAttributes.java | 172 +- .../core/appender/rolling/action/DurationTest.java | 21 +- .../rolling/action/FileRenameActionTest.java | 107 +- .../core/appender/rolling/action/FileSizeTest.java | 47 + .../rolling/action/IfAccumulatedFileCountTest.java | 6 +- .../rolling/action/IfAccumulatedFileSizeTest.java | 4 +- .../core/appender/rolling/action/IfAllTest.java | 106 +- .../core/appender/rolling/action/IfAnyTest.java | 104 +- .../appender/rolling/action/IfFileNameTest.java | 262 +- .../rolling/action/IfLastModifiedTest.java | 4 +- .../core/appender/rolling/action/IfNotTest.java | 104 +- .../action/PathSortByModificationTimeTest.java | 40 +- .../rolling/action/ScriptConditionTest.java | 31 +- .../rolling/action/SortingVisitorTest.java | 61 +- .../routing/DefaultRouteScriptAppenderTest.java | 4 +- .../appender/routing/JsonRoutingAppender2Test.java | 2 +- .../appender/routing/JsonRoutingAppenderTest.java | 2 +- .../routing/PropertiesRoutingAppenderTest.java | 4 +- .../appender/routing/RoutesScriptAppenderTest.java | 6 +- .../appender/routing/RoutingAppender2767Test.java | 4 +- .../core/appender/routing/RoutingAppenderTest.java | 4 +- .../routing/RoutingAppenderWithJndiTest.java | 6 +- .../routing/RoutingAppenderWithPurgingTest.java | 4 +- .../routing/RoutingDefaultAppenderTest.java | 2 +- .../async/AbstractAsyncThreadContextTestBase.java | 4 +- .../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 4 +- .../async/AsyncAppenderExceptionHandlingTest.java | 98 + .../async/AsyncLoggerClassLoadDeadlockTest.java | 2 +- .../core/async/AsyncLoggerConfigAutoFlushTest.java | 4 +- .../core/async/AsyncLoggerConfigErrorOnFormat.java | 4 +- .../log4j/core/async/AsyncLoggerConfigTest.java | 4 +- .../log4j/core/async/AsyncLoggerConfigTest2.java | 4 +- .../log4j/core/async/AsyncLoggerConfigTest3.java | 2 +- .../log4j/core/async/AsyncLoggerConfigTest4.java | 4 +- ...ncLoggerConfigThreadContextCopyOnWriteTest.java | 2 +- .../AsyncLoggerConfigThreadContextDefaultTest.java | 2 +- ...ncLoggerConfigThreadContextGarbageFreeTest.java | 2 +- .../AsyncLoggerConfigUseAfterShutdownTest.java | 4 +- .../AsyncLoggerConfigWithAsyncEnabledTest.java | 4 +- ...AsyncLoggerContextSelectorInitialStateTest.java | 2 +- .../core/async/AsyncLoggerContextSelectorTest.java | 7 +- .../log4j/core/async/AsyncLoggerContextTest.java | 4 +- .../AsyncLoggerCustomSelectorLocationTest.java | 9 +- .../log4j/core/async/AsyncLoggerLocationTest.java | 4 +- .../logging/log4j/core/async/AsyncLoggerTest.java | 6 +- .../async/AsyncLoggerTestArgumentFreedOnError.java | 2 +- .../async/AsyncLoggerTestCachedThreadName.java | 4 +- .../log4j/core/async/AsyncLoggerTestNanoTime.java | 4 +- .../async/AsyncLoggerTestUncachedThreadName.java | 4 +- .../AsyncLoggerThreadContextCopyOnWriteTest.java | 2 +- .../async/AsyncLoggerThreadContextDefaultTest.java | 2 +- .../AsyncLoggerThreadContextGarbageFreeTest.java | 2 +- .../core/async/AsyncLoggerThreadContextTest.java | 4 +- .../async/AsyncLoggerThreadNameStrategyTest.java | 2 +- .../async/AsyncLoggerTimestampMessageTest.java | 4 +- .../async/AsyncLoggerUseAfterShutdownTest.java | 4 +- .../async/AsyncLoggersWithAsyncAppenderTest.java | 4 +- .../AsyncLoggersWithAsyncLoggerConfigTest.java | 4 +- .../async/AsyncQueueFullPolicyFactoryTest.java | 2 +- .../log4j/core/async/AsyncRootReloadTest.java | 6 +- .../async/BasicAsyncLoggerContextSelectorTest.java | 107 + .../async/DefaultAsyncQueueFullPolicyTest.java | 2 +- .../async/DiscardingAsyncQueueFullPolicyTest.java | 2 +- .../log4j/core/async/Log4j2Jira1688AsyncTest.java | 6 +- .../log4j/core/async/Log4j2Jira1688Test.java | 6 +- .../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 | 6 +- ...eueFullAsyncLoggerLoggingFromToStringTest2.java | 6 +- .../log4j/core/async/QueueFullAsyncLoggerTest.java | 4 +- .../core/async/QueueFullAsyncLoggerTest2.java | 4 +- .../core/async/QueueFullAsyncLoggerTest3.java | 6 +- .../log4j/core/async/RingBufferLogEventTest.java | 3 +- .../log4j/core/async/perftest/RunLog4j2.java | 2 +- .../log4j/core/config/AbstractLog4j2_1100Test.java | 68 - .../logging/log4j/core/config/AdvertiserTest.java | 29 +- .../core/config/AppenderControlArraySetTest.java | 12 +- .../config/CompositeConfigurationMissingTest.java | 47 + .../core/config/CompositeConfigurationTest.java | 21 +- .../core/config/ConfigurationFactoryTest.java | 134 + .../log4j/core/config/ConfigurationSourceTest.java | 10 +- .../log4j/core/config/ConfigurationTest.java | 157 - .../log4j/core/config/ConfiguratorTest.java | 18 +- .../log4j/core/config/CustomConfigurationTest.java | 54 +- .../logging/log4j/core/config/FileOutputTest.java | 37 +- .../log4j/core/config/JiraLog4j2_1100JsonTest.java | 31 - .../log4j/core/config/JiraLog4j2_1100XmlTest.java | 27 - .../core/config/JiraLog4j2_1100YamlBadTest.java | 33 - .../core/config/JiraLog4j2_1100YamlGoodTest.java | 31 - .../log4j/core/config/JiraLog4j2_2134Test.java | 23 +- .../log4j/core/config/LoggerConfigTest.java | 57 +- .../log4j/core/config/LoggersPluginTest.java | 12 +- .../log4j/core/config/MissingRootLoggerTest.java | 30 +- .../log4j/core/config/MockReliabilityStrategy.java | 105 + .../core/config/MultipleTriggeringPolicyTest.java | 84 + .../logging/log4j/core/config/PropertyTest.java | 41 +- .../core/config/ReconfigurationDeadlockTest.java | 210 +- .../log4j/core/config/ReliabilityStrategyTest.java | 51 + .../log4j/core/config/TestConfigurator.java | 169 +- .../log4j/core/config/TestConfiguratorError.java | 24 +- .../logging/log4j/core/config/XIncludeTest.java | 139 - .../core/config/arbiters/BasicArbiterTest.java | 63 + .../core/config/arbiters/ScriptArbiterTest.java | 63 + .../core/config/arbiters/SelectArbiterTest.java | 63 + .../config/builder/ConfigurationAssemblerTest.java | 28 +- .../config/builder/ConfigurationBuilderTest.java | 16 +- .../core/config/plugins/LegacyPluginTest.java | 31 +- .../plugins/util/PluginManagerPackagesTest.java | 52 +- .../validators/RequiredValidatorTest.java | 12 +- .../validators/ValidHostValidatorTest.java | 24 +- .../validators/ValidPortValidatorTest.java | 12 +- .../ValidatingPluginWithFailoverTest.java | 12 +- .../ValidatingPluginWithGenericBuilderTest.java | 16 +- ...ngPluginWithGenericSubclassFoo1BuilderTest.java | 16 +- .../ValidatingPluginWithTypedBuilderTest.java | 16 +- .../PropertiesConfigurationRootLoggerOnlyTest.java | 60 - .../properties/PropertiesConfigurationTest.java | 85 +- ...rtiesConfigurationTrailingSpaceOnLevelTest.java | 67 - .../properties/RollingFilePropertiesTest.java | 60 - .../core/config/xml/XmlConfigurationPropsTest.java | 22 +- .../core/config/xml/XmlConfigurationSecurity.java | 41 + .../core/config/xml/XmlConigurationSecurity.java | 36 - .../log4j/core/config/xml/XmlLoggerPropsTest.java | 72 +- .../log4j/core/config/xml/XmlSchemaTest.java | 140 + .../log4j/core/filter/AbstractFilterTest.java | 4 +- .../log4j/core/filter/AbstractFilterableTest.java | 14 +- .../core/filter/AbstractScriptFilterTest.java | 40 +- .../log4j/core/filter/BurstFilterLogDelayTest.java | 8 +- .../logging/log4j/core/filter/BurstFilterTest.java | 58 +- .../core/filter/DynamicThresholdFilterTest.java | 66 +- .../log4j/core/filter/LevelRangeFilterTest.java | 7 +- .../logging/log4j/core/filter/MapFilterTest.java | 51 +- .../log4j/core/filter/MarkerFilterTest.java | 7 +- .../log4j/core/filter/NoMarkerFilterTest.java | 5 +- .../logging/log4j/core/filter/RegexFilterTest.java | 19 +- .../filter/ScriptFileFilterPropertiesTest.java | 21 +- .../log4j/core/filter/ScriptFileFilterTest.java | 21 +- .../log4j/core/filter/ScriptFilterTest.java | 21 +- .../log4j/core/filter/ScriptRefFilterTest.java | 21 +- .../core/filter/StructuredDataFilterTest.java | 41 +- .../core/filter/ThreadContextMapFilterTest.java | 11 +- .../log4j/core/filter/ThresholdFilterTest.java | 7 +- .../logging/log4j/core/filter/TimeFilterTest.java | 83 +- ...taFactoryPropertySetMissingConstructorTest.java | 8 +- .../impl/ContextDataFactoryPropertySetTest.java | 4 +- .../log4j/core/impl/ContextDataFactoryTest.java | 8 +- .../core/impl/JdkMapAdapterStringMapTest.java | 204 +- .../log4j/core/impl/Log4jLogEventNanoTimeTest.java | 26 +- .../logging/log4j/core/impl/Log4jLogEventTest.java | 108 +- .../log4j/core/impl/MutableLogEventTest.java | 189 +- .../NestedLoggingFromThrowableMessageTest.java | 4 +- .../core/impl/NestedLoggingFromToStringTest.java | 4 +- .../core/impl/ReusableLogEventFactoryTest.java | 42 +- .../core/impl/ThreadContextDataInjectorTest.java | 2 +- .../core/impl/ThrowableFormatOptionsTest.java | 90 +- .../log4j/core/impl/ThrowableProxyTest.java | 55 +- .../apache/logging/log4j/core/jmx/ServerTest.java | 4 +- .../core/layout/AbstractStringLayoutTest.java | 30 +- .../ConcurrentLoggingWithGelfLayoutTest.java | 104 +- .../logging/log4j/core/layout/GelfLayout2Test.java | 51 + .../logging/log4j/core/layout/GelfLayout3Test.java | 100 + .../core/layout/GelfLayoutPatternSelectorTest.java | 82 + .../logging/log4j/core/layout/GelfLayoutTest.java | 82 +- .../logging/log4j/core/layout/GelfLayoutTest2.java | 50 - .../logging/log4j/core/layout/GelfLayoutTest3.java | 67 - .../logging/log4j/core/layout/HtmlLayoutTest.java | 174 +- .../log4j/core/layout/Log4j2_1482_CoreTest.java | 1 + .../log4j/core/layout/Log4j2_1482_Test.java | 92 - .../log4j/core/layout/Log4j2_2195_Test.java | 45 +- .../log4j/core/layout/LogEventFixtures.java | 114 - .../core/layout/PatternLayoutLookupDateTest.java | 22 +- .../layout/PatternLayoutMainMapLookupTest.java | 41 +- .../core/layout/PatternLayoutNoLookupDateTest.java | 23 +- .../log4j/core/layout/PatternLayoutRepeatTest.java | 40 + .../log4j/core/layout/PatternLayoutTest.java | 73 +- .../log4j/core/layout/PatternSelectorTest.java | 16 +- .../log4j/core/layout/Rfc5424LayoutTest.java | 100 +- .../core/layout/StringBuilderEncoderTest.java | 118 +- .../log4j/core/layout/SyslogLayoutTest.java | 34 +- .../logging/log4j/core/lookup/CaseLookupTest.java | 12 +- .../log4j/core/lookup/ContextMapLookupTest.java | 40 +- .../logging/log4j/core/lookup/DateLookupTest.java | 11 +- .../log4j/core/lookup/EnvironmentLookupTest.java | 8 +- .../logging/log4j/core/lookup/EventLookupTest.java | 7 +- .../log4j/core/lookup/InterpolatorTest.java | 2 +- .../logging/log4j/core/lookup/JndiLookupTest.java | 2 +- .../logging/log4j/core/lookup/Log4jLookupTest.java | 28 +- .../core/lookup/Log4jLookupWithSpacesTest.java | 29 +- .../lookup/MainInputArgumentsJmxLookupTest.java | 14 +- .../logging/log4j/core/lookup/MainLookupTest.java | 30 +- .../logging/log4j/core/lookup/MapLookupTest.java | 26 +- .../log4j/core/lookup/MarkerLookupConfigTest.java | 45 +- .../log4j/core/lookup/MarkerLookupTest.java | 7 +- .../core/lookup/ResourceBundleLookupTest.java | 17 +- .../log4j/core/lookup/StrSubstitutorTest.java | 15 +- .../core/lookup/StructuredDataLookupTest.java | 7 +- .../core/lookup/SystemPropertiesLookupTest.java | 15 +- .../message/ExtendedThreadInformationTest.java | 6 +- .../MutableLogEventWithReusableParamMsgTest.java | 75 + .../logging/log4j/core/net/PriorityTest.java | 9 +- .../log4j/core/net/SocketMessageLossTest.java | 26 +- .../log4j/core/net/SocketReconnectTest.java | 30 +- .../apache/logging/log4j/core/net/SocketTest.java | 39 +- .../log4j/core/net/mock/MockSyslogServer.java | 49 - .../core/net/mock/MockSyslogServerFactory.java | 39 - .../log4j/core/net/mock/MockTcpSyslogServer.java | 94 - .../log4j/core/net/mock/MockTlsSyslogServer.java | 154 - .../log4j/core/net/mock/MockUdpSyslogServer.java | 70 - .../net/ssl/EnvironmentPasswordProviderTest.java | 8 +- .../core/net/ssl/FilePasswordProviderTest.java | 13 +- .../core/net/ssl/KeyStoreConfigurationTest.java | 61 +- .../ssl/LegacyBsdTlsSyslogInputStreamReader.java | 61 - .../core/net/ssl/MemoryPasswordProviderTest.java | 6 +- .../log4j/core/net/ssl/SslConfigurationTest.java | 51 +- .../log4j/core/net/ssl/StoreConfigurationTest.java | 16 +- .../logging/log4j/core/net/ssl/TestConstants.java | 40 - .../core/net/ssl/TlsSyslogInputStreamReader.java | 91 - .../net/ssl/TlsSyslogInputStreamReaderBase.java | 35 - .../log4j/core/net/ssl/TlsSyslogMessageFormat.java | 23 - .../log4j/core/net/ssl/TlsSyslogTestUtil.java | 2 + .../core/net/ssl/TrustStoreConfigurationTest.java | 55 +- .../core/parser/AbstractLogEventParserTest.java | 59 - .../log4j/core/pattern/CallerInformationTest.java | 31 +- .../core/pattern/DatePatternConverterTest.java | 4 +- .../log4j/core/pattern/DisableAnsiTest.java | 30 +- .../core/pattern/EncodingPatternConverterTest.java | 29 +- .../pattern/EndOfBatchPatternConverterTest.java | 4 +- .../EqualsIgnoreCaseReplacementConverterTest.java | 10 +- .../pattern/EqualsReplacementConverterTest.java | 9 +- .../ExtendedThrowablePatternConverterTest.java | 28 +- .../log4j/core/pattern/ExtendedThrowableTest.java | 32 +- .../log4j/core/pattern/FormattingInfoTest.java | 4 +- .../log4j/core/pattern/HighlightConverterTest.java | 38 +- .../core/pattern/LevelPatternConverterTest.java | 7 +- .../core/pattern/LiteralPatternConverterTest.java | 86 +- .../pattern/LoggerFqcnPatternConverterTest.java | 4 +- .../core/pattern/MapPatternConverterTest.java | 19 +- .../core/pattern/MarkerPatternConverterTest.java | 4 +- .../MarkerSimpleNamePatternConverterTest.java | 6 +- .../log4j/core/pattern/MaxLengthConverterTest.java | 16 +- .../core/pattern/MdcPatternConverterTest.java | 30 +- .../core/pattern/MessageJansiConverterTest.java | 34 +- .../core/pattern/MessagePatternConverterTest.java | 52 +- .../core/pattern/MessageStyledConverterTest.java | 34 +- .../core/pattern/NanoTimePatternConverterTest.java | 7 +- .../core/pattern/NdcPatternConverterTest.java | 13 +- .../log4j/core/pattern/NoConsoleNoAnsiTest.java | 36 +- .../log4j/core/pattern/PatternParserTest.java | 47 +- .../log4j/core/pattern/PatternParserTest2.java | 7 +- .../pattern/ProcessIdPatternConverterTest.java | 9 +- .../pattern/RegexReplacementConverterTest.java | 8 +- .../log4j/core/pattern/RegexReplacementTest.java | 69 +- .../core/pattern/RepeatPatternConverterTest.java | 51 + .../pattern/RootThrowablePatternConverterTest.java | 28 +- .../log4j/core/pattern/RootThrowableTest.java | 38 +- .../SequenceNumberPatternConverterTest.java | 30 +- ...quenceNumberPatternConverterZeroPaddedTest.java | 38 +- .../log4j/core/pattern/StyleConverterTest.java | 43 +- .../core/pattern/ThreadIdPatternConverterTest.java | 7 +- .../pattern/ThreadNamePatternConverterTest.java | 7 +- .../ThreadPriorityPatternConverterTest.java | 7 +- .../pattern/ThrowablePatternConverterTest.java | 32 +- .../logging/log4j/core/pattern/ThrowableTest.java | 34 +- .../VariablesNotEmptyReplacementConverterTest.java | 10 +- .../core/selector/BasicContextSelectorTest.java | 55 + .../selector/ClassLoaderContextSelectorTest.java | 8 +- .../logging/log4j/core/time/ClockFactoryTest.java | 14 +- .../log4j/core/time/MutableInstantTest.java | 85 +- .../log4j/core/time/SystemNanoClockTest.java | 6 +- .../core/time/internal/DummyNanoClockTest.java | 5 +- .../log4j/core/time/internal/SystemClockTest.java | 9 +- .../log4j/core/tools/GenerateCustomLoggerTest.java | 110 +- .../core/tools/GenerateExtendedLoggerTest.java | 112 +- .../log4j/core/util/ContextDataProviderTest.java | 27 +- .../log4j/core/util/CronExpressionTest.java | 30 +- .../logging/log4j/core/util/CyclicBufferTest.java | 22 +- .../logging/log4j/core/util/FileUtilsTest.java | 18 +- .../apache/logging/log4j/core/util/InitTest.java | 8 +- .../logging/log4j/core/util/IntegersTest.java | 4 +- .../logging/log4j/core/util/JsonUtilsTest.java | 4 +- .../apache/logging/log4j/core/util/LoaderTest.java | 13 +- .../logging/log4j/core/util/NetUtilsTest.java | 123 +- .../logging/log4j/core/util/ProcessIdUtilTest.java | 9 +- .../apache/logging/log4j/core/util/Profiler.java | 94 - .../core/util/ShutdownCallbackRegistryTest.java | 29 +- .../logging/log4j/core/util/ThrowablesTest.java | 53 +- .../apache/logging/log4j/core/util/UuidTest.java | 20 +- .../logging/log4j/core/util/WatchHttpTest.java | 6 +- .../logging/log4j/core/util/WatchManagerTest.java | 28 +- .../apache/logging/log4j/hamcrest/Descriptors.java | 44 - .../logging/log4j/hamcrest/FileMatchers.java | 163 - .../apache/logging/log4j/hamcrest/MapMatchers.java | 62 - .../org/apache/logging/log4j/junit/JndiRule.java | 59 - .../logging/log4j/junit/LoggerContextRule.java | 314 -- .../apache/logging/log4j/junit/package-info.java | 22 - .../MutableLogEventWithReusableParamMsgTest.java | 61 - .../logging/log4j/test/AvailablePortFinder.java | 155 - .../test/AvailablePortSystemPropertyTestRule.java | 81 - .../apache/logging/log4j/test/ExtendedLevels.java | 30 - .../org/apache/logging/log4j/test/GetLogger.java | 37 - .../logging/log4j/test/RuleChainFactory.java | 45 - .../log4j/test/SomethingThatUsesLogging.java | 36 - .../log4j/test/appender/AlwaysFailAppender.java | 49 - .../log4j/test/appender/BlockingAppender.java | 65 - .../log4j/test/appender/DeadlockAppender.java | 84 - .../log4j/test/appender/EncodingListAppender.java | 84 - .../log4j/test/appender/FailOnceAppender.java | 66 - .../log4j/test/appender/InMemoryAppender.java | 60 - .../logging/log4j/test/appender/ListAppender.java | 295 -- .../log4j/test/appender/UsesLoggingAppender.java | 67 - .../logging/log4j/test/layout/BasicLayout.java | 57 - log4j-core/src/test/java9/module-info.java | 93 + .../AsyncAppenderExceptionHandlingTest.xml | 32 + .../{GelfLayoutTest2.xml => GelfLayout2Test.xml} | 0 log4j-core/src/test/resources/GelfLayout3Test.xml | 37 + .../resources/GelfLayoutPatternSelectorTest.xml | 37 + log4j-core/src/test/resources/GelfLayoutTest3.xml | 35 - .../MemoryMappedFileAppenderLocationTest.xml | 4 +- .../MemoryMappedFileAppenderRemapTest.xml | 4 +- .../resources/MemoryMappedFileAppenderTest.xml | 4 +- .../src/test/resources/PatternLayoutRepeat.xml | 29 + .../src/test/resources/ReliabilityStrategyTest.xml | 32 + .../src/test/resources/__files/onStartup.log | 19 +- .../test/resources/gcFreeMixedSyncAsyncLogging.xml | 98 - .../src/test/resources/log4j-comp-logger-root.xml | 4 +- log4j-core/src/test/resources/log4j-filetest.xml | 6 +- .../src/test/resources/log4j-rollOnStartup.xml | 38 + .../test/resources/log4j-rollOnStartupDirect.xml | 37 + .../resources/log4j-rolling-cron-onStartup.xml | 47 + .../test/resources/log4j-rolling-folder-direct.xml | 39 + .../test/resources/log4j-rolling-new-directory.xml | 39 + .../log4j-rolling-size-time-new-directory.xml | 42 + log4j-core/src/test/resources/log4j-test4.xml | 36 - log4j-core/src/test/resources/log4j2-arbiters.xml | 41 + .../src/test/resources/log4j2-scriptArbiters.xml | 51 + .../src/test/resources/log4j2-selectArbiters.xml | 43 + .../test/resources/reconfiguration-deadlock.xml | 25 +- log4j-couchdb/pom.xml | 17 +- .../logging/log4j/couchdb/CouchDbProvider.java | 5 +- log4j-csv/pom.xml | 22 +- .../CsvJsonParameterLayoutFileAppenderTest.java | 4 +- .../log4j/csv/layout/CsvLogEventLayoutTest.java | 10 +- .../csv/layout/CsvParameterLayoutAllAsyncTest.java | 4 +- .../log4j/csv/layout/CsvParameterLayoutTest.java | 10 +- log4j-distribution/pom.xml | 25 +- log4j-docker/pom.xml | 28 +- .../apache/logging/log4j/docker/DockerLookup.java | 2 + log4j-flume-ng/pom.xml | 24 +- .../log4j/flume/appender/FlumeAppender.java | 2 +- .../log4j/flume/appender/FlumeAvroManager.java | 2 +- .../log4j/flume/appender/FlumeEmbeddedManager.java | 16 +- .../flume/appender/FlumePersistentManager.java | 2 +- .../log4j/flume/appender/FlumeAppenderTest.java | 2 +- .../flume/appender/FlumeEmbeddedAgentTest.java | 2 +- .../flume/appender/FlumeEmbeddedAppenderTest.java | 2 +- .../appender/FlumePersistentAppenderTest.java | 2 +- .../log4j/flume/appender/FlumePersistentPerf.java | 2 +- log4j-gctests/pom.xml | 380 ++ .../gctests/GcFreeAsynchronousLoggingTest.java | 49 + .../log4j/gctests/GcFreeLoggingTestUtil.java | 226 ++ .../gctests/GcFreeMixedSyncAyncLoggingTest.java | 47 + .../gctests/GcFreeSynchronousLoggingTest.java | 46 + .../gctests/JsonTemplateLayoutGcFreeTest.java | 42 + .../resources/gcFreeJsonTemplateLayoutLogging.xml | 38 + .../src/test/resources/gcFreeLogging.xml | 0 .../test/resources/gcFreeMixedSyncAsyncLogging.xml | 98 + log4j-iostreams/pom.xml | 18 +- .../logging/log4j/io/AbstractStreamTest.java | 2 +- .../log4j/io/IoBuilderCallerInfoTesting.java | 4 +- .../org/apache/logging/log4j/io/IoBuilderTest.java | 4 +- .../log4j/io/LoggerPrintWriterJdbcH2Test.java | 4 +- log4j-jcl/pom.xml | 21 +- .../org/apache/logging/log4j/jcl/LogAdapter.java | 5 +- .../logging/log4j/jcl/CallerInformationTest.java | 4 +- .../org/apache/logging/log4j/jcl/LoggerTest.java | 4 +- log4j-jdbc-dbcp2/pom.xml | 25 +- .../appender/PoolableConnectionFactoryTest.java | 2 +- log4j-jdbc/pom.xml | 30 +- .../log4j/jdbc/appender/JdbcDatabaseManager.java | 13 +- .../AbstractJdbcAppenderDataSourceTest.java | 4 +- .../AbstractJdbcAppenderFactoryMethodTest.java | 2 +- .../appender/DataSourceConnectionSourceTest.java | 5 +- .../FactoryMethodConnectionSourceTest.java | 3 +- .../JdbcAppenderColumnMappingLiteralTest.java | 4 +- .../JdbcAppenderColumnMappingPatternTest.java | 4 +- .../JdbcAppenderMapMessageDataSourceTest.java | 4 +- .../JdbcAppenderStringSubstitutionTest.java | 2 +- .../logging/log4j/jdbc/appender/JdbcRule.java | 2 +- log4j-jeromq/pom.xml | 22 +- .../log4j/jeromq/appender/JeroMqManager.java | 13 +- .../log4j/jeromq/appender/JeroMqAppenderTest.java | 8 +- .../src/test/resources/JeroMqAppenderTest.xml | 0 log4j-jms/pom.xml | 27 +- .../logging/log4j/jms/appender/JmsManager.java | 2 +- .../log4j/jms/appender/JmsAppenderTest.java | 8 +- .../src/test/resources/JmsAppenderTest.xml | 0 log4j-jmx-gui/pom.xml | 74 +- log4j-jpa/pom.xml | 22 +- .../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 | 271 ++ log4j-jpl/src/main/java/module-info.java | 21 + .../logging/log4j/jpl/Log4jSystemLogger.java | 136 + .../log4j/jpl/Log4jSystemLoggerAdapter.java | 46 + .../logging/log4j/jpl/Log4jSystemLoggerFinder.java | 33 + .../services/java.lang.System$LoggerFinder | 1 + log4j-jpl/src/site/markdown/index.md | 30 + log4j-jpl/src/site/site.xml | 52 + .../logging/log4j/jpl/Log4jSystemLoggerTest.java | 122 + log4j-jpl/src/test/resources/log4j2-test.xml | 39 + log4j-jul/pom.xml | 22 +- .../logging/log4j/jul/AbstractLoggerAdapter.java | 5 +- .../org/apache/logging/log4j/jul/ApiLogger.java | 66 +- .../logging/log4j/jul/AbstractLoggerTest.java | 100 +- .../apache/logging/log4j/jul/ApiLoggerTest.java | 3 +- .../logging/log4j/jul/AsyncLoggerThreadsTest.java | 59 + .../jul/BracketInNotInterpolatedMessageTest.java | 2 +- .../logging/log4j/jul/CallerInformationTest.java | 4 +- .../apache/logging/log4j/jul/CoreLoggerTest.java | 3 +- log4j-kafka/pom.xml | 22 +- .../logging/log4j/kafka/appender/KafkaManager.java | 4 +- .../appender/KafkaAppenderCloseTimeoutTest.java | 6 +- .../log4j/kafka/appender/KafkaAppenderTest.java | 6 +- .../KafkaManagerProducerThreadLeakTest.java | 65 + .../kafka/builder/ConfigurationBuilderTest.java | 2 +- log4j-kubernetes/pom.xml | 42 +- .../logging/log4j/kubernetes/ContainerUtil.java | 91 + .../log4j/kubernetes/KubernetesClientBuilder.java | 12 +- .../logging/log4j/kubernetes/KubernetesLookup.java | 147 +- .../log4j/kubernetes/KubernetesLookupTest.java | 98 + .../src/test/resources/clusterPod.json | 177 + log4j-kubernetes/src/test/resources/localPod.json | 141 + log4j-layout-jackson-json/pom.xml | 22 +- .../log4j/jackson/json/Log4jJsonObjectMapper.java | 4 + .../jackson/json/layout/JsonJacksonFactory.java | 10 + .../log4j/jackson/json/layout/JsonLayout.java | 8 +- .../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 | 74 + .../log4j/jackson/json/layout/JsonLayoutTest.java | 22 +- .../json/parser/JsonLogEventParserTest.java | 2 +- .../resources/log4j2-json-layout-timestamp.xml | 31 + log4j-layout-jackson-xml/pom.xml | 22 +- .../xml/ExtendedStackTraceElementXmlMixIn.java | 18 +- .../jackson/xml/StackTraceElementXmlMixIn.java | 17 +- .../jackson/xml/layout/XmlJacksonFactory.java | 10 + .../log4j/jackson/xml/layout/XmlLayout.java | 8 +- .../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 | 10 +- .../jackson/xml/parser/XmlLogEventParserTest.java | 2 +- log4j-layout-jackson-yaml/pom.xml | 22 +- .../log4j/jackson/yaml/layout/YamlConstants.java | 1 + .../jackson/yaml/layout/YamlJacksonFactory.java | 10 + .../log4j/jackson/yaml/layout/YamlLayout.java | 8 +- .../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 | 8 +- .../yaml/parser/YamlLogEventParserTest.java | 2 +- log4j-layout-jackson/pom.xml | 17 +- .../log4j/jackson/AbstractJacksonFactory.java | 14 +- .../log4j/jackson/AbstractJacksonLayout.java | 17 + .../jackson/ExtendedStackTraceElementMixIn.java | 19 + .../logging/log4j/jackson/JsonConstants.java | 1 + .../Log4jStackTraceElementDeserializer.java | 68 +- .../logging/log4j/jackson/LogEventJsonMixIn.java | 2 +- .../jackson/LogEventWithContextListMixIn.java | 2 +- .../log4j/jackson/StackTraceElementConstants.java | 3 + .../log4j/jackson/StackTraceElementMixIn.java | 12 + .../apache/logging/log4j/jackson/XmlConstants.java | 1 + .../logging/log4j/jackson/LevelMixInTest.java | 2 +- log4j-layout-template-json/pom.xml | 568 +++ .../layout/template/json/JsonTemplateLayout.java | 643 ++++ .../template/json/JsonTemplateLayoutDefaults.java | 146 + .../json/resolver/CaseConverterResolver.java | 309 ++ .../resolver/CaseConverterResolverFactory.java | 34 + .../template/json/resolver/EndOfBatchResolver.java | 47 + .../json/resolver/EndOfBatchResolverFactory.java | 50 + .../resolver/EventAdditionalFieldInterceptor.java | 98 + .../template/json/resolver/EventResolver.java | 24 + .../json/resolver/EventResolverContext.java | 292 ++ .../json/resolver/EventResolverFactories.java | 39 + .../json/resolver/EventResolverFactory.java | 40 + .../json/resolver/EventResolverInterceptor.java | 37 + .../json/resolver/EventResolverInterceptors.java | 38 + .../resolver/EventResolverStringSubstitutor.java | 51 + .../resolver/EventRootObjectKeyInterceptor.java | 53 + .../template/json/resolver/ExceptionResolver.java | 448 +++ .../json/resolver/ExceptionResolverFactory.java | 50 + .../json/resolver/ExceptionRootCauseResolver.java | 51 + .../ExceptionRootCauseResolverFactory.java | 50 + .../template/json/resolver/LevelResolver.java | 175 + .../json/resolver/LevelResolverFactory.java | 49 + .../template/json/resolver/LoggerResolver.java | 93 + .../json/resolver/LoggerResolverFactory.java | 49 + .../template/json/resolver/MainMapResolver.java | 90 + .../json/resolver/MainMapResolverFactory.java | 49 + .../layout/template/json/resolver/MapResolver.java | 51 + .../template/json/resolver/MapResolverFactory.java | 49 + .../template/json/resolver/MarkerResolver.java | 86 + .../json/resolver/MarkerResolverFactory.java | 49 + .../json/resolver/MessageParameterResolver.java | 215 ++ .../resolver/MessageParameterResolverFactory.java | 50 + .../template/json/resolver/MessageResolver.java | 223 ++ .../json/resolver/MessageResolverFactory.java | 49 + .../template/json/resolver/PatternResolver.java | 88 + .../json/resolver/PatternResolverFactory.java | 49 + .../json/resolver/ReadOnlyStringMapResolver.java | 386 +++ .../template/json/resolver/SourceResolver.java | 153 + .../json/resolver/SourceResolverFactory.java | 49 + .../json/resolver/StackTraceElementResolver.java | 95 + .../resolver/StackTraceElementResolverContext.java | 121 + .../resolver/StackTraceElementResolverFactory.java | 56 + ...StackTraceElementResolverStringSubstitutor.java | 51 + .../json/resolver/StackTraceObjectResolver.java | 57 + .../template/json/resolver/StackTraceResolver.java | 22 + .../json/resolver/StackTraceStringResolver.java | 130 + .../template/json/resolver/TemplateResolver.java | 69 + .../json/resolver/TemplateResolverConfig.java | 89 + .../json/resolver/TemplateResolverContext.java | 60 + .../json/resolver/TemplateResolverFactories.java | 130 + .../json/resolver/TemplateResolverFactory.java | 46 + .../json/resolver/TemplateResolverInterceptor.java | 56 + .../resolver/TemplateResolverInterceptors.java | 131 + .../TemplateResolverStringSubstitutor.java | 38 + .../template/json/resolver/TemplateResolvers.java | 385 +++ .../json/resolver/ThreadContextDataResolver.java | 38 + .../resolver/ThreadContextDataResolverFactory.java | 50 + .../json/resolver/ThreadContextStackResolver.java | 107 + .../ThreadContextStackResolverFactory.java | 50 + .../template/json/resolver/ThreadResolver.java | 92 + .../json/resolver/ThreadResolverFactory.java | 49 + .../template/json/resolver/TimestampResolver.java | 500 +++ .../json/resolver/TimestampResolverFactory.java | 49 + .../layout/template/json/util/DummyRecycler.java | 37 + .../template/json/util/DummyRecyclerFactory.java | 39 + .../layout/template/json/util/JsonReader.java | 451 +++ .../layout/template/json/util/JsonWriter.java | 900 +++++ .../layout/template/json/util/MapAccessor.java | 192 ++ .../template/json/util/QueueingRecycler.java | 61 + .../json/util/QueueingRecyclerFactory.java | 40 + .../log4j/layout/template/json/util/Recycler.java | 25 + .../template/json/util/RecyclerFactories.java | 199 ++ .../layout/template/json/util/RecyclerFactory.java | 31 + .../json/util/RecyclerFactoryConverter.java | 34 + .../template/json/util/StringParameterParser.java | 320 ++ .../template/json/util/ThreadLocalRecycler.java | 45 + .../json/util/ThreadLocalRecyclerFactory.java | 40 + .../json/util/TruncatingBufferedPrintWriter.java | 92 + .../json/util/TruncatingBufferedWriter.java | 267 ++ .../log4j/layout/template/json/util/Uris.java | 140 + .../src/main/resources/EcsLayout.json | 49 + .../src/main/resources/GelfLayout.json | 43 + .../src/main/resources/JsonLayout.json | 83 + .../main/resources/LogstashJsonEventLayoutV1.json | 60 + .../main/resources/StackTraceElementLayout.json | 18 + .../src/site/manual/index.md | 32 + log4j-layout-template-json/src/site/site.xml | 55 + .../json/BlackHoleByteBufferDestination.java | 50 + .../log4j/layout/template/json/EcsLayoutTest.java | 111 + .../log4j/layout/template/json/GelfLayoutTest.java | 120 + .../log4j/layout/template/json/JacksonFixture.java | 31 + .../log4j/layout/template/json/JsonLayoutTest.java | 87 + .../JsonTemplateLayoutAdditionalFieldJsonTest.java | 36 + ...emplateLayoutAdditionalFieldPropertiesTest.java | 36 + ...onTemplateLayoutAdditionalFieldTestHelpers.java | 69 + .../JsonTemplateLayoutAdditionalFieldXmlTest.java | 36 + .../JsonTemplateLayoutAdditionalFieldYamlTest.java | 36 + .../JsonTemplateLayoutConcurrentEncodeTest.java | 205 ++ .../JsonTemplateLayoutNullEventDelimiterTest.java | 150 + .../template/json/JsonTemplateLayoutTest.java | 2385 +++++++++++++ .../layout/template/json/LogEventFixture.java | 153 + .../log4j/layout/template/json/LogstashIT.java | 517 +++ .../log4j/layout/template/json/TestHelpers.java | 75 + .../json/resolver/CaseConverterResolverTest.java | 125 + .../json/resolver/TimestampResolverTest.java | 65 + .../layout/template/json/util/JsonReaderTest.java | 388 +++ .../layout/template/json/util/JsonWriterTest.java | 900 +++++ .../template/json/util/RecyclerFactoriesTest.java | 139 + .../json/util/StringParameterParserTest.java | 410 +++ .../json/util/TruncatingBufferedWriterTest.java | 244 ++ .../log4j/layout/template/json/util/UrisTest.java | 63 + ...onalFieldEnrichedJsonTemplateLayoutLogging.json | 42 + ...eldEnrichedJsonTemplateLayoutLogging.properties | 37 + ...ionalFieldEnrichedJsonTemplateLayoutLogging.xml | 34 + ...onalFieldEnrichedJsonTemplateLayoutLogging.yaml | 39 + ...nullEventDelimitedJsonTemplateLayoutLogging.xml | 38 + ...rFactoryCustomizedJsonTemplateLayoutLogging.xml | 30 + .../src/test/resources/testJsonTemplateLayout.json | 70 + log4j-liquibase/pom.xml | 21 +- log4j-liquibase/src/site/markdown/index.md | 2 +- .../liquibase/ext/logging/log4j2/LoggingTest.java | 2 +- log4j-mongodb2/pom.xml | 195 -- log4j-mongodb2/revapi.json | 23 - .../logging/log4j/mongodb2/MongoDbConnection.java | 103 - .../logging/log4j/mongodb2/MongoDbObject.java | 66 - .../logging/log4j/mongodb2/MongoDbProvider.java | 310 -- .../logging/log4j/mongodb2/package-info.java | 20 - log4j-mongodb2/src/site/markdown/index.md.vm | 48 - log4j-mongodb2/src/site/site.xml | 52 - .../log4j/mongodb2/MongoDbAuthFailureTest.java | 72 - .../logging/log4j/mongodb2/MongoDbCappedTest.java | 72 - .../log4j/mongodb2/MongoDbMapMessageTest.java | 78 - .../apache/logging/log4j/mongodb2/MongoDbTest.java | 71 - .../logging/log4j/mongodb2/MongoDbTestRule.java | 184 - .../log4j/mongodb2/MongoDbTestTestRuleTest.java | 71 - .../logging/log4j/mongodb2/TestConstants.java | 24 - .../test/resources/log4j2-mongodb-auth-failure.xml | 31 - .../src/test/resources/log4j2-mongodb-capped.xml | 31 - .../test/resources/log4j2-mongodb-map-message.xml | 32 - .../src/test/resources/log4j2-mongodb.xml | 31 - log4j-mongodb3/pom.xml | 32 +- .../apache/logging/log4j/mongodb3/LevelCodec.java | 47 - .../logging/log4j/mongodb3/MongoDb3Connection.java | 98 + .../log4j/mongodb3/MongoDb3DocumentObject.java | 58 + .../logging/log4j/mongodb3/MongoDb3LevelCodec.java | 54 + .../logging/log4j/mongodb3/MongoDb3Provider.java | 329 ++ .../logging/log4j/mongodb3/MongoDbConnection.java | 113 - .../log4j/mongodb3/MongoDbDocumentObject.java | 58 - .../logging/log4j/mongodb3/MongoDbProvider.java | 325 -- .../log4j/mongodb3/MongoDb3AuthFailureTest.java | 72 + .../logging/log4j/mongodb3/MongoDb3CappedTest.java | 69 + .../log4j/mongodb3/MongoDb3MapMessageTest.java | 76 + .../logging/log4j/mongodb3/MongoDb3Test.java | 70 + .../log4j/mongodb3/MongoDb3TestConstants.java | 24 + .../logging/log4j/mongodb3/MongoDb3TestRule.java | 192 ++ .../log4j/mongodb3/MongoDb3TestTestRuleTest.java | 71 + .../log4j/mongodb3/MongoDbAuthFailureTest.java | 72 - .../logging/log4j/mongodb3/MongoDbCappedTest.java | 69 - .../log4j/mongodb3/MongoDbMapMessageTest.java | 76 - .../apache/logging/log4j/mongodb3/MongoDbTest.java | 69 - .../logging/log4j/mongodb3/MongoDbTestRule.java | 192 -- .../log4j/mongodb3/MongoDbTestTestRuleTest.java | 71 - .../logging/log4j/mongodb3/TestConstants.java | 24 - log4j-mongodb4/pom.xml | 203 ++ .../logging/log4j/mongodb4/MongoDb4Connection.java | 111 + .../log4j/mongodb4/MongoDb4DocumentObject.java | 64 + .../logging/log4j/mongodb4/MongoDb4LevelCodec.java | 52 + .../logging/log4j/mongodb4/MongoDb4Provider.java | 132 + .../logging/log4j/mongodb4/package-info.java | 21 + log4j-mongodb4/src/site/markdown/index.md.vm | 48 + log4j-mongodb4/src/site/site.xml | 52 + .../log4j/mongodb4/MongoDb4AuthFailureTest.java | 72 + .../logging/log4j/mongodb4/MongoDb4CappedTest.java | 69 + .../log4j/mongodb4/MongoDb4MapMessageTest.java | 76 + .../logging/log4j/mongodb4/MongoDb4Test.java | 70 + .../log4j/mongodb4/MongoDb4TestConstants.java | 24 + .../logging/log4j/mongodb4/MongoDb4TestRule.java | 186 + .../log4j/mongodb4/MongoDb4TestTestRuleTest.java | 73 + .../test/resources/log4j2-mongodb-auth-failure.xml | 31 + .../src/test/resources/log4j2-mongodb-capped.xml | 33 + .../test/resources/log4j2-mongodb-map-message.xml | 31 + .../src/test/resources/log4j2-mongodb.xml | 30 + log4j-osgi/pom.xml | 46 +- log4j-perf/pom.xml | 63 +- .../template/json/JsonTemplateLayoutBenchmark.java | 185 + .../json/JsonTemplateLayoutBenchmarkReport.java | 359 ++ .../json/JsonTemplateLayoutBenchmarkState.java | 212 ++ .../logging/log4j/perf/jmh/ClocksBenchmark.java | 2 +- .../log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +- .../jmh/ParameterizedMessageInliningBenchmark.java | 3 +- .../logging/log4j/perf/jmh/StackWalkBenchmark.java | 138 + .../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 252 +- .../log4j/perf/jmh/TimeFormatBenchmark.java | 4 +- .../logging/log4j/perf/util/StackDriver.java | 47 + log4j-plugins-java9/pom.xml | 157 - log4j-plugins-java9/src/assembly/java9.xml | 41 - log4j-plugins-java9/src/main/java/module-info.java | 34 - .../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 | 280 +- .../org/apache/logging/log4j/plugins/Node.java | 6 +- .../org/apache/logging/log4j/plugins/Plugin.java | 9 +- .../logging/log4j/plugins/PluginAliases.java | 1 + .../logging/log4j/plugins/PluginAttribute.java | 12 + .../log4j/plugins/PluginBuilderAttribute.java | 2 + .../logging/log4j/plugins/PluginElement.java | 1 + .../apache/logging/log4j/plugins/PluginValue.java | 1 + .../log4j/plugins/convert/HexConverter.java | 2 +- .../plugins/convert/TypeConverterRegistry.java | 59 +- .../log4j/plugins/convert/TypeConverters.java | 1 + .../plugins/inject/PluginAttributeInjector.java | 2 +- .../inject/PluginBuilderAttributeInjector.java | 2 +- .../log4j/plugins/internal/util/BeanUtils.java | 37 + .../plugins/name/AnnotatedElementNameProvider.java | 6 +- .../log4j/plugins/processor/PluginProcessor.java | 8 +- .../log4j/plugins/processor/package-info.java | 2 +- .../apache/logging/log4j/plugins/util/Builder.java | 1 - .../logging/log4j/plugins/util/PluginRegistry.java | 19 + .../logging/log4j/plugins/util/PluginType.java | 9 + .../logging/log4j/plugins/util/PluginUtil.java | 96 + .../logging/log4j/plugins/util/package-info.java | 2 +- .../log4j/plugins/validation/Constraint.java | 1 + .../plugins/validation/constraints/Required.java | 1 + .../plugins/validation/constraints/ValidHost.java | 1 + .../plugins/validation/constraints/ValidPort.java | 1 + log4j-plugins/src/main/java9/module-info.java | 37 + .../AbstractPluginWithGenericBuilder.java | 59 + .../log4j/plugins/test/validation/HostAndPort.java | 53 + .../PluginWithGenericSubclassFoo1Builder.java | 66 + .../plugins/test/validation/ValidatingPlugin.java | 69 + .../ValidatingPluginWithGenericBuilder.java | 68 + .../ValidatingPluginWithTypedBuilder.java | 69 + log4j-plugins/src/test/java-test9/module-info.java | 8 + .../plugins/convert/TypeConverterRegistryTest.java | 82 +- .../plugins/processor/PluginProcessorTest.java | 4 - .../util/ResolverUtilCustomProtocolTest.java | 4 +- .../log4j/plugins/util/ResolverUtilTest.java | 5 +- .../AbstractPluginWithGenericBuilder.java | 59 - .../log4j/plugins/validation/HostAndPort.java | 53 - .../PluginWithGenericSubclassFoo1Builder.java | 66 - .../log4j/plugins/validation/ValidatingPlugin.java | 69 - .../ValidatingPluginWithGenericBuilder.java | 68 - .../ValidatingPluginWithTypedBuilder.java | 69 - log4j-plugins/src/test/java9/module-info.java | 18 + log4j-redis/pom.xml | 179 + .../appender/LoggingRedisPoolConfiguration.java | 148 + .../log4j/redis/appender/RedisAppender.java | 255 ++ .../logging/log4j/redis/appender/RedisManager.java | 123 + log4j-redis/src/site/manual/index.md | 29 + log4j-redis/src/site/site.xml | 52 + .../log4j/redis/appender/RedisAppenderTest.java | 192 ++ .../log4j/redis/appender/RedisManagerTest.java | 111 + log4j-samples/log4j-samples-configuration/pom.xml | 1 + log4j-samples/log4j-samples-flume-common/pom.xml | 1 + .../log4j/samples/app/LoggingController.java | 2 +- log4j-samples/log4j-samples-flume-embedded/pom.xml | 9 +- log4j-samples/log4j-samples-flume-remote/pom.xml | 9 +- .../log4j-samples-loggerProperties/pom.xml | 1 + log4j-samples/pom.xml | 3 +- log4j-slf4j-impl/pom.xml | 24 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 8 +- .../org/apache/logging/slf4j/Log4jMDCAdapter.java | 4 +- .../logging/slf4j/CallerInformationTest.java | 4 +- .../logging/slf4j/Log4j2_1482_Slf4jTest.java | 2 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 4 +- .../org/apache/logging/slf4j/OptionalTest.java | 4 +- .../org/apache/logging/slf4j/SerializeTest.java | 4 +- log4j-slf4j18-impl/pom.xml | 24 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 8 +- .../org/apache/logging/slf4j/Log4jMDCAdapter.java | 4 +- .../logging/slf4j/CallerInformationTest.java | 4 +- .../logging/slf4j/Log4j2_1482_Slf4jTest.java | 2 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 4 +- .../org/apache/logging/slf4j/SerializeTest.java | 4 +- log4j-smtp/pom.xml | 22 +- .../logging/log4j/smtp/appender/SmtpAppender.java | 281 +- .../logging/log4j/smtp/appender/SmtpManager.java | 58 +- .../log4j/smtp/appender/SmtpAppenderAsyncTest.java | 4 +- .../log4j/smtp/appender/SmtpAppenderTest.java | 25 +- log4j-spring-boot/pom.xml | 223 ++ .../boot/Log4j2CloudConfigLoggingSystem.java | 216 ++ .../log4j/spring/boot/SpringEnvironmentHolder.java | 50 + .../logging/log4j/spring/boot/SpringLookup.java | 135 + .../log4j/spring/boot/SpringProfileArbiter.java | 97 + .../log4j/spring/boot/SpringPropertySource.java | 54 + .../org.apache.logging.log4j.util.PropertySource | 15 + .../src/main/resources/log4j2.system.properties | 17 + log4j-spring-boot/src/site/markdown/index.md | 60 + log4j-spring-boot/src/site/site.xml | 52 + .../boot/Log4j2CloudConfigLoggingSystemTest.java | 41 + .../log4j/spring/boot/SpringLookupTest.java | 60 + .../log4j/spring/boot/SpringProfileTest.java | 69 + .../src/test/resources/log4j2-springProfile.xml | 41 + .../log4j-spring-cloud-config-client/pom.xml | 38 +- .../client/Log4j2CloudConfigLoggingSystem.java | 146 - .../cloud/config/client/Log4j2EventListener.java | 21 +- .../config/client/SpringEnvironmentHolder.java | 48 - .../spring/cloud/config/client/SpringLookup.java | 47 - .../cloud/config/client/SpringPropertySource.java | 54 - .../src/main/resources/META-INF/spring.factories | 18 +- .../src/main/resources/log4j2.system.properties | 1 - .../src/site/markdown/index.md | 12 + .../config/client/Log4j2EventListenerTest.java | 114 + .../cloud/config/client/SpringConfiguration.java | 26 + .../src/test/resources/log4j2-console.xml | 31 + .../README.md | 6 +- .../docker/app-compose.yml | 2 +- .../docker/combined-compose.yml | 86 + .../docker/restartApp.sh | 4 +- .../k8s/sampleapp-deployment.yaml | 33 +- .../pom.xml | 52 +- .../cloud/config/sample/config/WebMvcConfig.java | 4 +- .../config/sample/controller/K8SController.java | 71 + .../config/sample/controller/SampleController.java | 8 + .../src/main/resources/EnhancedGelf.json | 40 + .../src/main/resources/application.yml | 2 +- .../pom.xml | 49 +- .../src/main/config-repo/log4j2.xml | 28 +- .../log4j-spring-cloud-config-samples/pom.xml | 10 +- log4j-spring-cloud-config/pom.xml | 11 +- log4j-taglib/pom.xml | 29 +- .../logging/log4j/taglib/CatchingTagTest.java | 4 +- .../apache/logging/log4j/taglib/EnterTagTest.java | 4 +- .../apache/logging/log4j/taglib/ExitTagTest.java | 4 +- .../logging/log4j/taglib/IfEnabledTagTest.java | 2 +- .../log4j/taglib/LoggingMessageTagSupportTest.java | 4 +- log4j-to-slf4j/pom.xml | 18 +- .../org/apache/logging/slf4j/MDCContextMap.java | 6 +- .../logging/slf4j/SLF4JLoggerContextFactory.java | 6 + .../java/org/apache/logging/slf4j/LoggerTest.java | 41 +- log4j-web/pom.xml | 28 +- .../web/Log4jServletContainerInitializer.java | 5 +- .../log4j/web/Log4jServletContextListener.java | 27 +- .../Log4jShutdownOnContextDestroyedListener.java | 80 + .../logging/log4j/web/Log4jWebInitializerImpl.java | 9 +- .../apache/logging/log4j/web/Log4jWebSupport.java | 7 + .../logging/log4j/web/WebLoggerContextUtils.java | 20 +- .../org/apache/logging/log4j/web/WebLookup.java | 15 + .../web/Log4jServletContainerInitializerTest.java | 60 +- .../log4j/web/Log4jServletContextListenerTest.java | 58 +- .../logging/log4j/web/Log4jServletFilterTest.java | 23 +- ...og4jShutdownOnContextDestroyedListenerTest.java | 83 + .../log4j/web/Log4jWebInitializerImplTest.java | 168 +- .../org/apache/logging/log4j/web/PropertyTest.java | 10 +- .../logging/log4j/web/ServletAppenderTest.java | 12 +- .../apache/logging/log4j/web/WebLookupTest.java | 43 +- log4j-web/src/test/resources/log4j2-combined.xml | 31 + log4j-web/src/test/resources/log4j2-override.xml | 23 + mvnw | 156 +- mvnw.cmd | 54 +- pom.xml | 3625 ++++++++++---------- src/changes/changes.xml | 471 ++- src/site/asciidoc/articles.adoc | 24 + src/site/asciidoc/download.adoc | 31 +- src/site/asciidoc/javadoc.adoc | 6 +- src/site/asciidoc/manual/appenders.adoc | 203 +- src/site/asciidoc/manual/async.adoc | 46 +- src/site/asciidoc/manual/configuration.adoc | 261 +- src/site/asciidoc/manual/customconfig.adoc | 6 +- src/site/asciidoc/manual/extending.adoc | 69 +- src/site/asciidoc/manual/garbagefree.adoc | 7 + .../asciidoc/manual/json-template-layout.adoc.vm | 1843 ++++++++++ src/site/asciidoc/manual/layouts.adoc | 196 +- src/site/asciidoc/manual/lookups.adoc | 21 +- src/site/asciidoc/manual/messages.adoc | 4 +- src/site/asciidoc/manual/plugins.adoc | 7 +- src/site/asciidoc/manual/webapp.adoc | 13 +- src/site/asciidoc/runtime-dependencies.adoc | 5 +- src/site/asciidoc/security.adoc | 137 + src/site/markdown/manual/cloud.md | 226 +- src/site/resources/images/kibana.png | Bin 0 -> 1823540 bytes src/site/site.xml | 10 +- toolchains-docker.xml | 17 +- toolchains-jenkins-ibm.xml | 63 - toolchains-jenkins-ubuntu.xml | 71 - toolchains-jenkins-win.xml | 62 - toolchains-sample-linux.xml | 18 +- toolchains-sample-mac.xml | 20 +- toolchains-sample-win.xml | 20 +- 1595 files changed, 55723 insertions(+), 39170 deletions(-)
