This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 4789503a4e Fix compilation error
new 05879a0ceb Extract interface from BindingMap
new b67ef48ff7 Add various DSLs for dependency injection. This includes:
new 3702f985e0 Make TestBinding container annotation inner class
new 9b49a5d125 Clean up changelog entry for #2147
new 1f9adf1523 Combine LoggingResolvers extensions into one file
new 3d49c4c208 Add docs to DI builder DSL
new 891088fe0d Ensure Log4jExtension uses copy of builder
new d9c623c684 Merge branch 'main' into issue-2147
new c72576ddaf Merge pull request #2148 from jvz/issue-2147
The 13190 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:
.../apache/log4j/config/Log4j1Configuration.java | 3 +-
.../test/java/org/apache/log4j/CategoryTest.java | 7 +-
.../src/test/java/org/apache/log4j/LoggerTest.java | 13 +-
.../org/apache/log4j/config/AutoConfigTest.java | 4 +-
.../log4j/config/MapRewriteAppenderTest.java | 24 +-
.../PropertiesRollingWithPropertiesTest.java | 18 +-
.../apache/log4j/config/RewriteAppenderTest.java | 8 +-
.../log4j/config/XmlRollingWithPropertiesTest.java | 18 +-
.../log4j/test/ThreadContextUtilityClass.java | 4 -
.../log4j/test/junit/ExtensionContextAnchor.java | 46 +++-
.../test/junit/TypeBasedParameterResolver.java | 43 ----
.../java/org/apache/logging/log4j/LoggerTest.java | 11 +-
.../core/test/junit/AppenderManagerResolver.java | 71 ------
.../log4j/core/test/junit/AppenderResolver.java | 59 -----
.../core/test/junit/ConfigurationFactoryType.java | 7 +-
.../junit/ConfigurationFactoryTypeCallback.java | 50 ----
.../core/test/junit/ConfigurationResolver.java | 44 ----
.../core/test/junit/ContextSelectorCallback.java | 50 ----
.../log4j/core/test/junit/ContextSelectorType.java | 11 +-
.../core/test/junit/LegacyLoggerContextSource.java | 12 +-
.../log4j/core/test/junit/Log4jExtension.java | 255 +++++++++++++++++++
.../{ContextSelectorType.java => Log4jTest.java} | 16 +-
.../core/test/junit/LoggerContextProvider.java | 14 +-
.../core/test/junit/LoggerContextResolver.java | 209 ---------------
.../log4j/core/test/junit/LoggerContextRule.java | 11 +-
.../log4j/core/test/junit/LoggerContextSource.java | 34 +--
.../log4j/core/test/junit/LoggerResolver.java | 53 ----
.../log4j/core/test/junit/LoggingResolvers.java | 166 ++++++++++++
.../logging/log4j/core/test/junit/TestBinding.java | 66 +++++
.../log4j/core/test/junit/package-info.java | 2 +-
.../logging/log4j/core/LogEventFactoryTest.java | 10 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 4 +-
.../log4j/core/async/AsyncThreadContextTest.java | 12 +-
.../log4j/core/async/Log4j2Jira1688AsyncTest.java | 4 +-
.../ValidatingPluginWithFailoverTest.java | 3 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 18 +-
.../logging/log4j/core/time/ClockFactoryTest.java | 70 ++---
.../core/util/ShutdownCallbackRegistryTest.java | 10 +-
.../apache/logging/log4j/core/LoggerContext.java | 17 +-
.../log4j/core/config/AbstractConfiguration.java | 51 ++--
.../log4j/core/config/ConfigurationProcessor.java | 3 +-
.../log4j/core/impl/Log4jContextFactory.java | 32 ++-
.../logging/log4j/core/time/ClockFactory.java | 43 +---
.../di/ConfigurableInstanceFactoryTest.java | 26 +-
.../apache/logging/log4j/plugins/di/Binding.java | 72 ------
.../plugins/di/ConfigurableInstanceFactory.java | 27 +-
.../org/apache/logging/log4j/plugins/di/DI.java | 281 ++++++++++++++++++---
.../log4j/plugins/di/DefaultInstanceFactory.java | 36 +--
.../org/apache/logging/log4j/plugins/di/Key.java | 28 +-
.../logging/log4j/plugins/di/package-info.java | 2 +
.../log4j/plugins/internal/util/BindingMap.java | 119 +--------
.../{BindingMap.java => DefaultBindingMap.java} | 64 ++---
..._bom.xml => 2147_add_instance_factory_dsls.xml} | 8 +-
src/site/_release-notes/_3.x.x.adoc | 5 +
54 files changed, 1088 insertions(+), 1186 deletions(-)
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TypeBasedParameterResolver.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AppenderManagerResolver.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AppenderResolver.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ConfigurationFactoryTypeCallback.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ConfigurationResolver.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ContextSelectorCallback.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/SingletonFactory.java
=>
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LegacyLoggerContextSource.java
(79%)
create mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Log4jExtension.java
copy
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/{ContextSelectorType.java
=> Log4jTest.java} (79%)
copy
log4j-1.2-api/src/test/java/org/apache/log4j/util/UnexpectedFormatException.java
=>
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextProvider.java
(75%)
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextResolver.java
delete mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerResolver.java
create mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java
create mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/TestBinding.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Binding.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/{BindingMap.java
=> DefaultBindingMap.java} (59%)
copy src/changelog/.3.x.x/{update_com_fasterxml_jackson_jackson_bom.xml =>
2147_add_instance_factory_dsls.xml} (54%)
