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 317969fdbd821d52db359f8e7497219dd191a0d6 Merge: 788da26 e24e2e8 Author: Matt Sicker <[email protected]> AuthorDate: Sat Jun 5 13:42:01 2021 -0500 Merge branch 'master' into mean-bean-machine .../main/java/org/apache/logging/log4j/Level.java | 2 +- .../java/org/apache/logging/log4j/LogBuilder.java | 48 ++++++------ .../java/org/apache/logging/log4j/LogManager.java | 2 +- .../main/java/org/apache/logging/log4j/Logger.java | 6 +- .../org/apache/logging/log4j/ThreadContext.java | 4 +- .../logging/log4j/internal/DefaultLogBuilder.java | 54 +++++++------- .../log4j/internal/DefaultObjectInputFilter.java | 10 +-- .../logging/log4j/internal/LogManagerStatus.java | 2 +- .../log4j/message/BasicThreadInformation.java | 6 +- .../logging/log4j/message/FormattedMessage.java | 6 +- .../apache/logging/log4j/message/MapMessage.java | 4 +- .../logging/log4j/message/MessageFactory.java | 34 ++++----- .../logging/log4j/message/ParameterFormatter.java | 6 +- .../log4j/message/ParameterizedMessage.java | 6 +- .../log4j/message/ReusableObjectMessage.java | 4 +- .../message/ReusableParameterizedMessage.java | 4 +- .../log4j/message/ReusableSimpleMessage.java | 2 +- .../message/StructuredDataCollectionMessage.java | 28 +++---- .../logging/log4j/message/StructuredDataId.java | 6 +- .../log4j/message/StructuredDataMessage.java | 12 +-- .../logging/log4j/message/ThreadDumpMessage.java | 4 +- .../apache/logging/log4j/simple/SimpleLogger.java | 4 +- .../apache/logging/log4j/spi/AbstractLogger.java | 20 ++--- .../logging/log4j/spi/AbstractLoggerAdapter.java | 2 +- .../CopyOnWriteSortedArrayThreadContextMap.java | 12 +-- .../logging/log4j/spi/DefaultThreadContextMap.java | 16 +--- .../log4j/spi/DefaultThreadContextStack.java | 2 +- .../GarbageFreeSortedArrayThreadContextMap.java | 10 +-- .../apache/logging/log4j/spi/LoggerContext.java | 14 ++-- .../logging/log4j/spi/LoggerContextFactory.java | 7 +- .../apache/logging/log4j/spi/LoggerRegistry.java | 7 +- .../log4j/spi/MutableThreadContextStack.java | 13 +--- .../org/apache/logging/log4j/spi/Provider.java | 4 +- .../apache/logging/log4j/status/StatusData.java | 2 +- .../org/apache/logging/log4j/util/Constants.java | 2 +- .../log4j/util/FilteredObjectInputStream.java | 4 +- .../org/apache/logging/log4j/util/LoaderUtil.java | 22 ++---- .../apache/logging/log4j/util/ProcessIdUtil.java | 2 +- .../apache/logging/log4j/util/PropertiesUtil.java | 40 +++++----- .../log4j/util/PropertyFilePropertySource.java | 2 +- .../apache/logging/log4j/util/PropertySource.java | 10 +-- .../apache/logging/log4j/util/ProviderUtil.java | 5 +- .../logging/log4j/util/SortedArrayStringMap.java | 20 ++--- .../apache/logging/log4j/util/StackLocator.java | 7 +- .../logging/log4j/util/StackLocatorUtil.java | 2 +- .../apache/logging/log4j/util/StringBuilders.java | 6 +- .../org/apache/logging/log4j/util/Strings.java | 8 +- .../log4j/util/SystemPropertiesPropertySource.java | 2 +- .../java/org/apache/logging/log4j/util/Timer.java | 8 +- .../log4j/util/SortedArrayStringMapTest.java | 3 +- .../logging/log4j/util/StackLocatorUtilTest.java | 2 - .../logging/log4j/util/Unbox2ConfigurableTest.java | 2 - .../org/apache/logging/log4j/core/LifeCycle2.java | 2 - .../org/apache/logging/log4j/core/LogEvent.java | 1 - .../apache/logging/log4j/core/LoggerContext.java | 9 +-- .../logging/log4j/core/appender/AsyncAppender.java | 1 - .../appender/AsyncAppenderEventDispatcher.java | 1 + .../log4j/core/appender/FailoverAppender.java | 1 - .../logging/log4j/core/appender/FileManager.java | 1 - .../core/appender/HttpURLConnectionManager.java | 3 +- .../log4j/core/appender/OutputStreamManager.java | 1 - .../rolling/CompositeTriggeringPolicy.java | 1 - .../appender/rolling/CronTriggeringPolicy.java | 1 - .../appender/rolling/DefaultRolloverStrategy.java | 2 +- .../log4j/core/appender/rolling/FileExtension.java | 2 +- .../rolling/OnStartupTriggeringPolicy.java | 3 +- .../core/appender/rolling/RollingFileManager.java | 1 - .../core/appender/rolling/action/DeleteAction.java | 6 +- .../async/BasicAsyncLoggerContextSelector.java | 1 - .../log4j/core/async/RingBufferLogEvent.java | 1 - .../log4j/core/config/ConfigurationFactory.java | 12 +-- .../log4j/core/config/ConfigurationSource.java | 6 +- .../log4j/core/filter/AbstractFilterable.java | 1 - .../logging/log4j/core/filter/CompositeFilter.java | 1 - .../logging/log4j/core/filter/MapFilter.java | 1 - .../logging/log4j/core/filter/ScriptFilter.java | 2 +- .../log4j/core/impl/Log4jContextFactory.java | 2 - .../logging/log4j/core/impl/Log4jLogEvent.java | 5 +- .../logging/log4j/core/impl/MutableLogEvent.java | 1 - .../log4j/core/impl/ThreadContextDataInjector.java | 2 +- .../org/apache/logging/log4j/core/jmx/Server.java | 3 +- .../logging/log4j/core/layout/HtmlLayout.java | 5 +- .../log4j/core/layout/internal/ListChecker.java | 6 +- .../log4j/core/net/Rfc1349TrafficClass.java | 2 +- .../log4j/core/pattern/DatePatternConverter.java | 6 +- .../core/pattern/EncodingPatternConverter.java | 2 - .../logging/log4j/core/pattern/PatternParser.java | 2 +- .../log4j/core/time/internal/CachedClock.java | 3 +- .../core/time/internal/format/FixedDateFormat.java | 6 +- .../apache/logging/log4j/core/tools/Generate.java | 9 +-- .../log4j/core/tools/picocli/CommandLine.java | 25 ++++--- .../logging/log4j/core/util/CronExpression.java | 5 +- .../apache/logging/log4j/core/util/UuidUtil.java | 7 +- .../log4j/core/FormatterLoggerManualExample.java | 2 +- .../log4j/core/appender/AsyncAppenderTest.java | 9 +++ .../RandomRollingAppenderOnStartupTest.java | 5 +- .../rolling/RollingAppenderCronAndSizeTest.java | 1 - .../rolling/RollingAppenderCronOnceADayTest.java | 5 +- .../appender/rolling/RollingAppenderCronTest.java | 3 +- .../rolling/RollingAppenderDeleteScriptTest.java | 3 +- ...erDirectWriteTempCompressedFilePatternTest.java | 4 +- ...llingAppenderTempCompressedFilePatternTest.java | 5 +- .../RollingDirectSizeTimeNewDirectoryTest.java | 1 - .../rolling/RollingFileAppenderUpdateDataTest.java | 4 +- .../rolling/RolloverWithDeletedOldFileTest.java | 2 +- .../appender/rolling/RolloverWithPaddingTest.java | 2 +- .../rolling/action/FileRenameActionTest.java | 1 - .../appender/routing/JsonRoutingAppender2Test.java | 3 +- .../appender/routing/JsonRoutingAppenderTest.java | 3 +- .../routing/PropertiesRoutingAppenderTest.java | 3 +- .../appender/routing/RoutingAppender2767Test.java | 1 - .../core/appender/routing/RoutingAppenderTest.java | 2 +- .../routing/RoutingAppenderWithPurgingTest.java | 2 +- .../routing/RoutingDefaultAppenderTest.java | 3 +- .../logging/log4j/core/async/AsyncLoggerTest.java | 2 +- .../async/AsyncLoggerTimestampMessageTest.java | 2 +- .../AsyncLoggersWithAsyncLoggerConfigTest.java | 6 +- .../log4j/core/async/perftest/PerfTestDriver.java | 6 +- .../async/perftest/PerfTestResultFormatter.java | 2 +- .../log4j/core/config/InMemoryAdvertiser.java | 8 +- .../log4j/core/config/NestedLoggerConfigTest.java | 11 --- .../config/builder/ConfigurationBuilderTest.java | 2 - .../config/plugins/convert/TypeConvertersTest.java | 4 +- ...taFactoryPropertySetMissingConstructorTest.java | 2 - .../log4j/core/impl/ContextDataFactoryTest.java | 2 - .../logging/log4j/core/impl/Log4jLogEventTest.java | 1 - .../time/internal/format/FastDateParserTest.java | 10 +-- .../core/tools/GenerateExtendedLoggerTest.java | 3 - .../layout/template/json/util/JsonWriter.java | 85 +++++++++++++--------- .../layout/template/json/util/JsonWriterTest.java | 77 ++++++++++++++++++++ .../apache/logging/slf4j/Log4jLoggerFactory.java | 2 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 2 +- src/changes/changes.xml | 10 +++ 133 files changed, 473 insertions(+), 490 deletions(-)
