You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2021/06/27 17:24:54 UTC
[logging-log4j2] 03/05: Merge branch 'master' into mean-bean-machine
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 c7dc66077b2bfb7821f148264b02c9aee9cc0e57
Merge: a789af3 c1f8f71
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Jun 26 16:33:04 2021 -0500
Merge branch 'master' into mean-bean-machine
.../src/main/java/org/apache/log4j/Category.java | 2 +-
.../org/apache/log4j/bridge/LogEventAdapter.java | 2 +-
.../builders/appender/AsyncAppenderBuilder.java | 2 +-
.../builders/appender/RewriteAppenderBuilder.java | 2 +-
.../builders/filter/LevelMatchFilterBuilder.java | 2 +-
.../builders/filter/LevelRangeFilterBuilder.java | 2 +-
.../org/apache/log4j/config/PropertySetter.java | 4 +-
.../org/apache/log4j/layout/Log4j1XmlLayout.java | 17 ++++----
.../log4j/pattern/Log4j1MdcPatternConverter.java | 7 +---
.../main/java/org/apache/log4j/spi/ErrorCode.java | 2 +-
.../java/org/apache/log4j/spi/LoggingEvent.java | 2 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 4 +-
.../java/org/apache/logging/log4j/LogBuilder.java | 2 +-
.../org/apache/logging/log4j/util/LoaderUtil.java | 7 +---
.../apache/logging/log4j/util/PropertiesUtil.java | 30 ++++++--------
.../logging/log4j/util/SortedArrayStringMap.java | 7 +---
.../apache/logging/log4j/util/StackLocator.java | 2 +-
.../core/appender/MemoryMappedFileManager.java | 19 ++++-----
.../core/appender/nosql/NoSqlDatabaseManager.java | 14 +------
.../core/appender/rolling/RollingFileManager.java | 2 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 40 +++++-------------
.../logging/log4j/core/async/DisruptorUtil.java | 7 +---
.../core/async/JCToolsBlockingQueueFactory.java | 45 ++++++--------------
.../logging/log4j/core/filter/BurstFilter.java | 6 +--
.../logging/log4j/core/filter/RegexFilter.java | 8 +---
.../log4j/core/impl/JdkMapAdapterStringMap.java | 24 ++++-------
.../log4j/core/pattern/MdcPatternConverter.java | 11 ++---
.../logging/log4j/core/script/ScriptManager.java | 30 +++++---------
.../logging/log4j/core/time/ClockFactory.java | 12 +++---
.../log4j/core/time/internal/CachedClock.java | 13 +++---
.../core/time/internal/format/FastDateParser.java | 7 +---
.../log4j/core/tools/picocli/CommandLine.java | 9 ++--
.../log4j/core/EventParameterMemoryLeakTest.java | 7 +---
...ReusableParameterizedMessageMemoryLeakTest.java | 7 +---
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 4 +-
.../async/AsyncLoggerTestArgumentFreedOnError.java | 7 +---
.../core/async/QueueFullAsyncLoggerTest3.java | 7 +---
.../log4j/core/config/NestedLoggerConfigTest.java | 5 +--
.../NestedLoggingFromThrowableMessageTest.java | 5 +--
.../logging/log4j/core/net/SmtpManagerTest.java | 19 +++++++++
.../apache/logging/log4j/docker/DockerLookup.java | 22 +++++-----
.../logging/log4j/docker/model/Container.java | 26 ++++++------
.../logging/log4j/docker/model/IPAMConfig.java | 8 ++--
.../apache/logging/log4j/docker/model/Mount.java | 16 ++++----
.../apache/logging/log4j/docker/model/Network.java | 26 ++++++------
.../log4j/docker/model/NetworkSettings.java | 34 +++++++--------
.../logging/log4j/docker/model/PortDefinition.java | 8 ++--
.../logging/log4j/jms/appender/JmsManager.java | 15 +++----
.../apache/logging/log4j/jmx/gui/ClientGui.java | 48 ++++++++++------------
.../ContextDataJsonAttributeConverter.java | 9 ++--
.../logging/log4j/kafka/appender/KafkaManager.java | 22 ++++------
.../kubernetes/KubernetesClientProperties.java | 2 +-
.../logging/log4j/kubernetes/KubernetesLookup.java | 2 +-
.../log4j/jackson/ContextDataSerializer.java | 24 +++++------
.../layout/template/json/JsonTemplateLayout.java | 6 +--
.../json/resolver/CaseConverterResolver.java | 8 ++--
.../json/resolver/EventResolverContext.java | 2 +-
.../resolver/EventRootObjectKeyInterceptor.java | 2 +-
.../template/json/resolver/ExceptionResolver.java | 4 +-
.../template/json/resolver/TemplateResolver.java | 4 +-
.../json/resolver/TemplateResolverContext.java | 2 +-
.../json/resolver/TemplateResolverInterceptor.java | 2 +-
.../template/json/resolver/TemplateResolvers.java | 4 +-
.../template/json/resolver/TimestampResolver.java | 2 +-
.../layout/template/json/util/JsonReader.java | 20 ++++-----
.../layout/template/json/util/JsonWriter.java | 2 +-
.../template/json/util/RecyclerFactories.java | 2 +-
.../layout/template/json/util/RecyclerFactory.java | 2 +-
.../template/json/util/StringParameterParser.java | 12 +++---
.../logging/log4j/mongodb3/MongoDb3Connection.java | 2 +-
.../logging/log4j/mongodb4/MongoDb4Connection.java | 2 +-
.../json/JsonTemplateLayoutBenchmarkReport.java | 4 +-
.../logging/log4j/perf/jmh/ClocksBenchmark.java | 17 ++++----
.../perf/jmh/FileAppenderThrowableBenchmark.java | 20 ++++-----
.../perf/jmh/SortedArrayVsHashMapBenchmark.java | 21 ++--------
.../logging/log4j/perf/jmh/StackWalkBenchmark.java | 18 ++++----
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 29 ++++---------
.../logging/log4j/perf/util/StackDriver.java | 2 +-
.../logging/log4j/plugins/util/PluginRegistry.java | 5 +--
.../logging/log4j/redis/appender/RedisManager.java | 7 +---
.../java/org/apache/logging/slf4j/Log4jMarker.java | 4 +-
.../java/org/apache/logging/slf4j/Log4jMarker.java | 4 +-
.../logging/log4j/smtp/appender/SmtpManager.java | 24 +++++------
.../log4j/spring/boot/SpringProfileArbiter.java | 2 +-
.../log4j/spring/boot/SpringPropertySource.java | 2 +-
.../cloud/config/client/Log4j2EventListener.java | 2 +-
.../cloud/config/client/WatchEventManager.java | 6 +--
.../cloud/config/sample/SampleApplication.java | 2 +-
.../sample/config/GlobalExceptionHandler.java | 2 +-
.../cloud/config/sample/config/WebMvcConfig.java | 2 +-
.../config/sample/controller/K8SController.java | 12 +++---
.../config/sample/controller/SampleController.java | 22 +++++-----
.../utils/spring/SampleResponseErrorHandler.java | 4 +-
.../config/service/ConfigServiceApplication.java | 2 +-
.../service/config/SecurityConfiguration.java | 2 +-
.../logging/log4j/web/WebLoggerContextUtils.java | 17 ++++----
src/changes/changes.xml | 3 ++
src/site/asciidoc/manual/appenders.adoc | 2 +-
98 files changed, 396 insertions(+), 585 deletions(-)