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 9eb91f9cf4b4554ca647b171901f7137f38ae46e Merge: f7ea16e 0ff6a6e Author: Matt Sicker <[email protected]> AuthorDate: Sat Jun 19 19:08:58 2021 -0500 Merge branch 'master' into mean-bean-machine .github/dependabot.yml | 22 +- .github/workflows/main.yml | 3 +- .../src/main/java/org/apache/log4j/Category.java | 25 +- .../test/java/org/apache/log4j/CategoryTest.java | 119 +- .../java/org/apache/logging/log4j/core/Logger.java | 2 +- .../apache/logging/log4j/core/LoggerContext.java | 28 +- .../log4j/core/appender/AbstractFileAppender.java | 2 +- .../appender/AbstractOutputStreamAppender.java | 4 +- .../core/appender/AbstractWriterAppender.java | 2 +- .../core/appender/AppenderLoggingException.java | 4 +- .../appender/AsyncAppenderEventDispatcher.java | 2 +- .../log4j/core/appender/ConsoleAppender.java | 6 +- .../log4j/core/appender/FailoverAppender.java | 4 +- .../logging/log4j/core/appender/FileAppender.java | 2 +- .../logging/log4j/core/appender/FileManager.java | 6 +- .../core/appender/HttpURLConnectionManager.java | 6 +- .../core/appender/MemoryMappedFileAppender.java | 2 +- .../core/appender/MemoryMappedFileManager.java | 2 +- .../log4j/core/appender/OutputStreamAppender.java | 2 +- .../log4j/core/appender/OutputStreamManager.java | 2 +- .../core/appender/RandomAccessFileManager.java | 2 +- .../log4j/core/appender/WriterAppender.java | 2 +- .../core/appender/db/AbstractDatabaseAppender.java | 2 +- .../appender/db/DbAppenderLoggingException.java | 4 +- .../log4j/core/appender/nosql/NoSqlAppender.java | 8 +- .../core/appender/rewrite/RewriteAppender.java | 2 +- .../appender/rolling/AbstractRolloverStrategy.java | 4 +- .../appender/rolling/DefaultRolloverStrategy.java | 6 +- .../core/appender/rolling/PatternProcessor.java | 4 +- .../core/appender/rolling/RollingFileManager.java | 30 +- .../rolling/RollingRandomAccessFileManager.java | 6 +- .../appender/rolling/action/DeletingVisitor.java | 2 +- .../appender/rolling/action/FileRenameAction.java | 2 +- .../appender/rolling/action/GzCompressAction.java | 2 +- .../appender/rolling/action/SortingVisitor.java | 2 +- .../core/appender/routing/IdlePurgePolicy.java | 2 +- .../core/appender/routing/RoutingAppender.java | 12 +- .../logging/log4j/core/async/AsyncLogger.java | 16 +- .../log4j/core/async/AsyncLoggerConfig.java | 2 +- .../core/async/AsyncQueueFullPolicyFactory.java | 6 +- .../async/BasicAsyncLoggerContextSelector.java | 8 +- .../core/async/DefaultAsyncQueueFullPolicy.java | 2 +- .../logging/log4j/core/async/DisruptorUtil.java | 2 +- .../log4j/core/async/RingBufferLogEvent.java | 2 +- .../core/async/RingBufferLogEventHandler.java | 2 +- .../core/async/ThreadNameCachingStrategy.java | 6 +- .../log4j/core/config/AbstractConfiguration.java | 34 +- .../log4j/core/config/ConfigurationFactory.java | 26 +- .../core/config/ConfigurationFileWatcher.java | 8 +- .../log4j/core/config/ConfigurationSource.java | 36 +- .../logging/log4j/core/config/Configurator.java | 6 +- .../logging/log4j/core/config/HttpWatcher.java | 26 +- .../logging/log4j/core/config/LoggerConfig.java | 12 +- .../log4j/core/config/ReliabilityStrategy.java | 4 +- .../log4j/core/config/arbiters/ScriptArbiter.java | 4 +- .../log4j/core/config/arbiters/SelectArbiter.java | 6 +- .../config/arbiters/SystemPropertyArbiter.java | 2 +- .../builder/impl/DefaultConfigurationBuilder.java | 16 +- .../config/composite/CompositeConfiguration.java | 2 +- .../log4j/core/config/json/JsonConfiguration.java | 4 +- .../core/config/plugins/util/PluginBuilder.java | 6 +- .../plugins/visitors/PluginElementVisitor.java | 2 +- .../properties/PropertiesConfigurationBuilder.java | 2 +- .../log4j/core/config/xml/XmlConfiguration.java | 4 +- .../log4j/core/filter/AbstractFilterable.java | 2 +- .../logging/log4j/core/filter/NeutralFilter.java | 42 +- .../logging/log4j/core/filter/TimeFilter.java | 10 +- .../log4j/core/impl/ContextDataFactory.java | 2 +- .../log4j/core/impl/ExtendedStackTraceElement.java | 4 +- .../log4j/core/impl/Log4jContextFactory.java | 6 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 2 +- .../logging/log4j/core/impl/LogEventFactory.java | 4 +- .../logging/log4j/core/impl/MementoMessage.java | 4 +- .../logging/log4j/core/impl/MutableLogEvent.java | 4 +- .../log4j/core/impl/ReusableLogEventFactory.java | 4 +- .../log4j/core/impl/ThreadContextDataInjector.java | 8 +- .../logging/log4j/core/impl/ThrowableProxy.java | 2 +- .../log4j/core/impl/ThrowableProxyHelper.java | 4 +- .../log4j/core/impl/ThrowableProxyRenderer.java | 16 +- .../logging/log4j/core/layout/GelfLayout.java | 20 +- .../logging/log4j/core/layout/HtmlLayout.java | 2 +- .../log4j/core/layout/LevelPatternSelector.java | 2 +- .../log4j/core/layout/MarkerPatternSelector.java | 2 +- .../logging/log4j/core/layout/PatternLayout.java | 10 +- .../logging/log4j/core/layout/Rfc5424Layout.java | 4 +- .../log4j/core/layout/ScriptPatternSelector.java | 2 +- .../logging/log4j/core/lookup/Base64StrLookup.java | 2 +- .../logging/log4j/core/lookup/StrSubstitutor.java | 6 +- .../log4j/core/net/DatagramSocketManager.java | 2 +- .../log4j/core/net/MulticastDnsAdvertiser.java | 2 +- .../logging/log4j/core/net/SslSocketManager.java | 12 +- .../logging/log4j/core/net/TcpSocketManager.java | 40 +- .../log4j/core/net/UrlConnectionFactory.java | 18 +- .../net/ssl/AbstractKeyStoreConfiguration.java | 2 +- .../core/net/ssl/EnvironmentPasswordProvider.java | 2 +- .../log4j/core/net/ssl/FilePasswordProvider.java | 8 +- .../log4j/core/net/ssl/KeyStoreConfiguration.java | 6 +- .../log4j/core/net/ssl/SslConfiguration.java | 2 +- .../core/net/ssl/SslConfigurationFactory.java | 12 +- .../core/net/ssl/StoreConfigurationException.java | 2 +- .../core/net/ssl/TrustStoreConfiguration.java | 4 +- .../log4j/core/osgi/BundleContextSelector.java | 2 +- .../log4j/core/pattern/DatePatternConverter.java | 4 +- .../log4j/core/pattern/HighlightConverter.java | 4 +- .../log4j/core/pattern/JAnsiTextRenderer.java | 2 +- .../log4j/core/pattern/MapPatternConverter.java | 4 +- .../core/pattern/MessagePatternConverter.java | 2 +- .../log4j/core/pattern/NameAbbreviator.java | 2 +- .../logging/log4j/core/pattern/PatternParser.java | 12 +- .../core/pattern/ProcessIdPatternConverter.java | 2 +- .../log4j/core/pattern/RepeatPatternConverter.java | 2 +- .../core/pattern/ThrowablePatternConverter.java | 4 +- .../logging/log4j/core/script/ScriptFile.java | 2 +- .../log4j/core/selector/BasicContextSelector.java | 8 +- .../core/selector/ClassLoaderContextSelector.java | 12 +- .../log4j/core/selector/ContextSelector.java | 12 +- .../log4j/core/selector/JndiContextSelector.java | 10 +- .../logging/log4j/core/time/ClockFactory.java | 8 +- .../logging/log4j/core/time/MutableInstant.java | 4 +- .../log4j/core/time/internal/SystemClock.java | 8 +- .../core/time/internal/format/FastDateParser.java | 2 +- .../core/time/internal/format/FormatCache.java | 2 +- .../log4j/core/tools/picocli/CommandLine.java | 1166 ++++++++++---------- .../logging/log4j/core/util/AbstractWatcher.java | 2 +- .../core/util/BasicAuthorizationProvider.java | 12 +- .../core/util/DefaultShutdownCallbackRegistry.java | 6 +- .../apache/logging/log4j/core/util/FileUtils.java | 4 +- .../org/apache/logging/log4j/core/util/Loader.java | 4 +- .../apache/logging/log4j/core/util/NetUtils.java | 4 +- .../logging/log4j/core/util/OptionConverter.java | 30 +- .../logging/log4j/core/util/ProcessIdUtil.java | 12 +- .../org/apache/logging/log4j/core/util/Source.java | 6 +- .../apache/logging/log4j/core/util/UuidUtil.java | 2 +- .../logging/log4j/core/util/WatchManager.java | 18 +- .../logging/log4j/core/util/WatcherFactory.java | 22 +- .../log4j/core/util/WrappedFileWatcher.java | 18 +- .../log4j/core/util/datetime/FastDateFormat.java | 2 +- log4j-layout-template-json/pom.xml | 11 +- .../json/resolver/MessageResolverTest.java | 77 ++ .../messageFallbackKeyUsingJsonTemplateLayout.xml | 36 + src/changes/changes.xml | 3 + 141 files changed, 1324 insertions(+), 1078 deletions(-)
