This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch mean-bean-machine
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 9eb91f9 Merge branch 'master' into mean-bean-machine
new 6caab9e Clean up BeanManager API surface
new a789af3 Add tests and stable ordering for bean inheritance
add 46a8db9 (doc) add TimeBasedTriggeringPolicy, modulate default value
to doc (#527)
add db40eb1 Replace null check with Objects/Stream static method. (#525)
add c91e5a2 Make Local variable and parameter final. (#523)
add 00d440d Replace anonymous classes with lambda expressions. (#526)
add b9d8a83 Make Local variable and parameter final. (#524)
add 5ba64e8 Replace try finally statement with try with resources
statement (#510)
add c06de49 Java 8 improvements (#514)
add 91a69fa Make Local variable and parameter final. (#533)
add 241dbcc Simplify conditional expression. (#531)
add 3c649ce LOG4J2-3107 SmtpManager.createManagerName() ignores port
(#528)
add c1f8f71 Fix Typo. (#540)
new c7dc660 Merge branch 'master' into mean-bean-machine
add 5b28850 Fix compile error
new c4b8807 Merge branch 'master' into mean-bean-machine
add 7073607 Move test class to correct module
new 9efae8a Merge branch 'master' into mean-bean-machine
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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/config/di/BeanManager.java | 24 ++++
.../logging/log4j/core/config/di/Injector.java | 41 -------
.../log4j/core/config/di/ProviderFactory.java | 24 ----
.../core/config/di/impl/AbstractProducer.java | 3 +-
.../core/config/di/impl/DefaultBeanManager.java | 126 ++++++++++----------
.../config/di/impl/DefaultInjectionTarget.java | 1 -
.../di/impl/DefaultInjectionTargetFactory.java | 91 +++++++++-----
.../impl/{DefaultInjector.java => Injector.java} | 10 +-
.../log4j/core/config/di/impl/ProvidedBean.java | 9 +-
.../log4j/core/config/di/impl/ProviderBean.java | 11 +-
.../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 | 24 ++--
.../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 +-
.../log4j/core/config/di/BeanManagerTest.java | 131 ++++++++++++++++++++-
.../NestedLoggingFromThrowableMessageTest.java | 5 +-
.../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/di/SingletonScoped.java | 1 -
.../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/smtp/appender/SmtpManagerTest.java | 19 +++
.../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 +-
110 files changed, 691 insertions(+), 777 deletions(-)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/Injector.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/ProviderFactory.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{DefaultInjector.java
=> Injector.java} (96%)
create mode 100644
log4j-smtp/src/test/java/org/apache/logging/log4j/smtp/appender/SmtpManagerTest.java
