This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/github_actions/main/actions/setup-java-3.13.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


 discard 2ac07fee59 Bump actions/setup-java from 3.12.0 to 3.13.0
     add 0ed62c983b Migrate to ConfigurableInstanceFactory API
     add 0d882b14f0 Use PropertyEnvironment in LoggerContext
     add 3a59400580 Reduce noise of debug logs
     add 2850b5715f Clarify Configurable docs around plugin namespaces
     add 7777592073 Rearrange dependency injection of ConfigurationFactory
     add e3a49bdf0f Order test properties before status listener
     add 662e02e781 Add diagnostics to GC-free tests
     add dae882a232 Modernize QueueFullAsync* tests
     add 4a44b0bd6f Fix compilation with ErrorProne
     add d7fc761fe3 Remove double-brace initialization
     add 256128015d Restores LinkedHashMap
     add b51229371a Give TestConfigurator its own config file
     add 07586b1393 Merge branch 'main' into di-rebased
     add ec2f1e75c3 Make FactoryResolver a generic interface
     add 1ccdf2d576 Modernize AsyncLoggersWithAsyncAppenderTest
     add 69bf306155 Merge branch 'main' into di-rebased
     add e6fa11322f Merge pull request #1752 from jvz/di-rebased
     add 1e0e5cd68d removed reference to outdated sourceforge for JmDns
     add 955ea896a4 Mark UrlConnectionFactoryTest as isolated
     add 9d102de78f Replace synchronized with Lock API
     add 675fa46629 Clean up some warnings
     add 9f88fe5884 Clean up more warnings
     add 78f728af51 Add some javadocs
     add 589dcdaabf Clean up and better document LoaderUtil
     add 47e78fcf3e Clean up various warnings
     add fae9b86717 Clean up more warnings and broken javadoc links
     add 0317b04802 Fix tests using `target/rolling-direct`
     add 499b8771f3 Add changelog entry for LOG4J2-3496
     add 4217defc94 Make generated class Log4jPlugins reproducible
     add 1b02c8eac7 Remove unused module-info file
     add 4b42577e54 Move ConfigurationFactory::authorizationProvider to 
AuthorizationProvider::getAuthorizationProvider
     add ea8e12a2fa Remove unused variable
     add e55649e72d Add Configuration::getContextProperties
     add fe1c85ffa6 Remove cached SslConfigurationFactory::getSslConfiguration
     add 85d3a9832d Fix NPE in AbstractFilterable::removeFilter
     add 6a75890e3e Remove redundant cast
     add bcc91d979b Replace NullOutputStream with OutputStream::nullOutputStream
     add 2156eee8d1 Replace IOUtils with standard Java functions
     add 1681eb0d91 Add missing `trim()`
     add 239e864055 Remove references to `maven-bundle-plugin`
     add e1bda519c4 Remove usages of `maven-jar-plugin`
     add 6c785db8c7 Bump parent version to 10.1.1
     add a1dcf2c685 Temporarily disable Spotbugs
     add 0539d537d5 Add OSGi annotation dependencies
     add defd0dcc64 Add multi-release to API and Core manifests
     add b9aea071f1 Temporarily disable OSGi tests
     add 09fce92f3c Add BND configuration for `log4j-api`
     add e372cf5356 Add BND configuration for `log4j-core` and new modules
     add 536e648e5c Add BND configuration to `log4j-1.2-api`
     add 0d7e5cb288 Add BND configuration to bridges
     add 105a855e46 Add BND configuration to Core dependants
     add 2624995251 Switch to reusable builds
     add 10e1476b14 Fix filebased module names
     add 9c99a0ff55 Add `generate-email.sh`
     add 6ce6c73c17 Override JPMS defaults in 1.2-api
     add b3351c45ac Fix OSGi tests
     add 9e4a1ef556 Another regression in OSGi tests
     add 4e7b0d40ca Miscelaneous problems with `bnd-maven-plugin`
     add 9684b3085e Add OSGi package versioning and fix API breaking changes
     add b13abd6738 Add missing plugin versions
     add a976e66e1c Disentangle tests writing to `AsyncLoggerConfig4Test.xml`
     add 196159c478 Temporarily switch back to sequential tests
     add ac72a4c5e3 Bump actions/setup-java from 3.12.0 to 3.13.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2ac07fee59)
            \
             N -- N -- N   
refs/heads/dependabot/github_actions/main/actions/setup-java-3.13.0 (ac72a4c5e3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |   4 +-
 .github/generate-email.sh                          | 106 +++
 .github/workflows/build.yml                        | 159 +---
 .github/workflows/log4j-kafka-test.yml             |  60 --
 .github/workflows/maven-settings.xml               |  28 -
 .github/workflows/merge-dependabot.yaml            |  42 +
 log4j-1.2-api/bnd.bnd                              |  27 +
 log4j-1.2-api/pom.xml                              |  38 +-
 .../org/apache/log4j/builders/BuilderManager.java  |  14 +-
 .../log4j/builders/appender}/package-info.java     |   7 +-
 .../log4j/builders/filter}/package-info.java       |   7 +-
 .../log4j/builders/layout}/package-info.java       |   7 +-
 .../org/apache/log4j/builders}/package-info.java   |  11 +-
 .../log4j/builders/rewrite}/package-info.java      |   7 +-
 .../apache/log4j/config/Log4j1Configuration.java   |   5 +-
 .../log4j/config/PropertiesConfiguration.java      |   2 +-
 .../java/org/apache/log4j/config/package-info.java |   7 +
 .../org/apache/log4j/helpers/OptionConverter.java  |   2 +-
 .../org/apache/log4j/helpers/package-info.java     |   5 +
 .../java/org/apache/log4j/jmx/package-info.java    |   5 +
 .../org/apache/log4j/layout}/package-info.java     |   9 +-
 .../org/apache/log4j/or/jms}/package-info.java     |   9 +-
 .../java/org/apache/log4j/or}/package-info.java    |   9 +-
 .../main/java/org/apache/log4j/package-info.java   |   5 +
 .../log4j/pattern/Log4j1LevelPatternConverter.java |   2 +-
 .../org/apache/log4j/pattern}/package-info.java    |   9 +-
 .../org/apache/log4j/rewrite}/package-info.java    |   9 +-
 .../java/org/apache/log4j/spi/package-info.java    |   5 +
 .../java/org/apache/log4j/varia}/package-info.java |   9 +-
 .../java/org/apache/log4j/xml/DOMConfigurator.java |  16 +-
 .../java/org/apache/log4j/xml/package-info.java    |   5 +
 .../apache/log4j/builders/BuilderManagerTest.java  |   6 +-
 .../apache/log4j/config/XmlConfigurationTest.java  |  10 +-
 log4j-api-test/pom.xml                             | 150 +---
 .../logging/log4j/test/ListStatusListener.java     |   4 +-
 .../log4j/test/junit/StatusLoggerExtension.java    |  60 +-
 .../log4j/test/junit/UsingStatusListener.java      |   3 +-
 .../logging/log4j/test/junit}/package-info.java    |   9 +-
 .../apache/logging/log4j/test}/package-info.java   |   9 +-
 .../logging/log4j/test/util}/package-info.java     |   9 +-
 log4j-api-test/src/main/module/module-info.java    |  37 -
 .../logging/log4j/message/MapMessageTest.java      |  23 +-
 .../apache/logging/log4j/util/LoaderUtilTest.java  |   4 +-
 log4j-api/pom.xml                                  |  77 +-
 log4j-api/src/main/java/module-info.java           |  48 --
 .../java/org/apache/logging/log4j/BridgeAware.java |   5 +-
 .../logging/log4j/CloseableThreadContext.java      |   4 +-
 .../org/apache/logging/log4j/MarkerManager.java    | 114 +--
 .../log4j/internal/CopyOnWriteNavigableSet.java    |   1 +
 .../logging/log4j/internal/DefaultLogBuilder.java  |   4 +
 .../logging/log4j/message/FormattedMessage.java    |  16 +-
 .../logging/log4j/message/LocalizedMessage.java    |   2 +-
 .../apache/logging/log4j/message/MapMessage.java   |  15 +-
 .../log4j/message/ParameterizedMessage.java        |   6 +-
 .../logging/log4j/message/SimpleMessage.java       |  16 +-
 .../log4j/message/StringFormattedMessage.java      |   7 +-
 .../log4j/message/StructuredDataMessage.java       |  29 +-
 .../logging/log4j/message/ThreadDumpMessage.java   |   7 +-
 .../apache/logging/log4j/message/package-info.java |   5 +
 .../org/apache/logging/log4j/package-info.java     |   5 +
 .../apache/logging/log4j/simple/SimpleLogger.java  |  10 +-
 .../apache/logging/log4j/simple/package-info.java  |   5 +
 .../apache/logging/log4j/spi/AbstractLogger.java   |   1 +
 .../CopyOnWriteSortedArrayThreadContextMap.java    |   2 +-
 .../logging/log4j/spi/DefaultThreadContextMap.java |   2 +-
 .../log4j/spi/DefaultThreadContextStack.java       |   6 +-
 .../logging/log4j/spi/ExtendedLoggerWrapper.java   |   2 -
 .../GarbageFreeSortedArrayThreadContextMap.java    |   2 +-
 .../apache/logging/log4j/spi/LoggerContext.java    |   3 +-
 .../apache/logging/log4j/spi/LoggingSystem.java    |   9 +-
 .../logging/log4j/spi/LoggingSystemProperty.java   |   3 +
 .../logging/log4j/spi/NoOpThreadContextMap.java    |   4 +-
 .../org/apache/logging/log4j/spi/Provider.java     |  33 +-
 .../org/apache/logging/log4j/spi/package-info.java |   5 +
 .../apache/logging/log4j/status/StatusLogger.java  |  10 +-
 .../apache/logging/log4j/status/package-info.java  |   5 +
 .../org/apache/logging/log4j/util/Activator.java   |   4 +
 .../org/apache/logging/log4j/util/BiConsumer.java  |   1 +
 .../java/org/apache/logging/log4j/util/Cast.java   |  12 +
 .../org/apache/logging/log4j/util/Constants.java   |  19 +-
 .../log4j/util/ContextAwarePropertySource.java     |   2 +-
 .../apache/logging/log4j/util/EnglishEnums.java    |   2 +
 .../log4j/util/EnvironmentPropertySource.java      |   4 +
 .../java/org/apache/logging/log4j/util/Lazy.java   |  24 +
 .../org/apache/logging/log4j/util/LazyBoolean.java |  21 +-
 .../org/apache/logging/log4j/util/LazyUtil.java    |  29 +
 .../org/apache/logging/log4j/util/LoaderUtil.java  | 425 ++++++----
 .../apache/logging/log4j/util/PropertiesUtil.java  |  91 +-
 .../logging/log4j/util/PropertyEnvironment.java    |   3 +-
 .../log4j/util/PropertyFilePropertySource.java     |  14 +-
 .../org/apache/logging/log4j/util/PropertyKey.java |   1 +
 .../apache/logging/log4j/util/PropertySource.java  |  22 +-
 .../logging/log4j/util/SortedArrayStringMap.java   |   2 +-
 .../log4j/util/SystemPropertiesPropertySource.java |  16 +-
 .../java/org/apache/logging/log4j/util/Timer.java  |  74 +-
 .../java/org/apache/logging/log4j/util/Unbox.java  |   2 +-
 .../apache/logging/log4j/util/package-info.java    |   5 +
 log4j-api/src/main/resources/META-INF/MANIFEST.MF  |   0
 .../org.apache.logging.log4j.util.PropertySource   |  16 -
 log4j-appserver/pom.xml                            |  38 +-
 .../log4j/appserver/jetty/package-info.java        |   7 +
 .../log4j/appserver/tomcat/TomcatLogger.java       |   3 +
 .../log4j/appserver/tomcat/package-info.java       |   5 +
 log4j-bom/pom.xml                                  |  10 +-
 log4j-cassandra/pom.xml                            |  38 +-
 .../logging/log4j/cassandra/CassandraAppender.java |   2 +-
 .../logging/log4j/cassandra/CassandraManager.java  |   2 +-
 .../logging/log4j/cassandra/package-info.java      |   7 +
 log4j-core-its/pom.xml                             |  35 +-
 .../logging/log4j/PerformanceComparison.java       |   6 +-
 .../SecureSocketAppenderSocketOptionsTest.java     |   4 +-
 .../appender/SocketAppenderSocketOptionsTest.java  |   9 +-
 log4j-core-test/pom.xml                            | 128 ++-
 .../log4j/core/test/appender/BlockingAppender.java |   2 +-
 .../log4j/core/test/appender/FailOnceAppender.java |   2 +-
 .../log4j/core/test/appender}/package-info.java    |   9 +-
 .../appender/rolling/action}/package-info.java     |   9 +-
 .../log4j/core/test/categories/package-info.java   |   5 +
 .../log4j/core/test/hamcrest}/package-info.java    |   9 +-
 .../core/test/junit/ConfigurationFactoryType.java  |  22 +-
 ....java => ConfigurationFactoryTypeCallback.java} |  29 +-
 .../core/test/junit/ContextSelectorCallback.java   |  11 +-
 .../core/test/junit/LoggerContextResolver.java     |  17 +-
 .../log4j/core/test/junit/LoggerContextRule.java   |  11 +-
 .../log4j/core/test/junit/LoggerContextSource.java |   8 +
 .../test/junit/URLStreamHandlerFactoryRule.java    | 100 +++
 .../log4j/core/test/junit/package-info.java        |   5 +
 .../log4j/core/test/layout}/package-info.java      |   9 +-
 .../log4j/core/test/net/mock/MockSyslogServer.java |   2 +-
 .../log4j/core/test/net/mock}/package-info.java    |   9 +-
 .../log4j/core/test/net/ssl}/package-info.java     |   9 +-
 .../logging/log4j/core/test}/package-info.java     |   9 +-
 .../log4j/core/test/parser}/package-info.java      |   9 +-
 .../log4j/core/test/smtp}/package-info.java        |   9 +-
 .../log4j/core/test/util}/package-info.java        |   9 +-
 log4j-core-test/src/main/module/module-info.java   |  45 -
 .../apache/logging/log4j/core/LateConfigTest.java  |  14 +-
 .../core/appender/OutputStreamManagerTest.java     |   2 +-
 .../core/appender/RandomAccessFileManagerTest.java |  12 +-
 ...erDirectWriteTempCompressedFilePatternTest.java |  57 +-
 .../rolling/RollingAppenderDirectWriteTest.java    |  83 +-
 ...llingAppenderDirectWriteWithHtmlLayoutTest.java |  26 +-
 .../appender/rolling/RollingFileManagerTest.java   |  10 +-
 .../RollingRandomAccessFileManagerTest.java        |   7 +-
 .../log4j/core/async/AsyncLoggerConfig4Test.java   |  38 +-
 .../AsyncLoggerConfigWithAsyncEnabledTest.java     |  46 +-
 ...AsyncLoggerContextSelectorInitialStateTest.java |   5 +-
 .../core/async/AsyncLoggerContextSelectorTest.java |  20 +-
 .../async/AsyncLoggersWithAsyncAppenderTest.java   |  20 +-
 .../AsyncLoggersWithAsyncLoggerConfigTest.java     |   4 +-
 .../log4j/core/async/AsyncThreadContextTest.java   |  11 +-
 .../async/AsyncWaitStrategyFactoryConfigTest.java  |   6 +-
 .../log4j/core/async/Log4j2Jira1688AsyncTest.java  |  48 +-
 .../log4j/core/async/QueueFullAbstractTest.java    | 217 ++++-
 .../core/async/QueueFullAsyncAppenderTest.java     |  68 +-
 .../core/async/QueueFullAsyncAppenderTest2.java    |  56 +-
 ...llAsyncLoggerConfigLoggingFromToStringTest.java |  83 +-
 ...lAsyncLoggerConfigLoggingFromToStringTest2.java |  56 +-
 .../core/async/QueueFullAsyncLoggerConfigTest.java |  84 +-
 .../async/QueueFullAsyncLoggerConfigTest2.java     |  56 +-
 ...ueueFullAsyncLoggerLoggingFromToStringTest.java |  77 +-
 ...eueFullAsyncLoggerLoggingFromToStringTest2.java |  88 +-
 .../log4j/core/async/QueueFullAsyncLoggerTest.java |  86 +-
 .../core/async/QueueFullAsyncLoggerTest2.java      |  59 +-
 .../core/async/QueueFullAsyncLoggerTest3.java      |  76 +-
 .../core/config/ConfigurationProcessorTest.java    | 145 ++++
 .../LoggerContextAwarePostProcessorTest.java       |  44 +-
 .../log4j/core/config/NullConfigurationTest.java   |  21 +-
 .../log4j/core/config/TestConfigurator.java        |  40 +-
 .../config/plugins/convert/TypeConvertersTest.java |   5 +-
 .../validators/RequiredValidatorTest.java          |  18 +-
 .../validators/ValidHostValidatorTest.java         |  19 +-
 .../validators/ValidPortValidatorTest.java         |  17 +-
 .../ValidatingPluginWithFailoverTest.java          |  19 +-
 .../ValidatingPluginWithGenericBuilderTest.java    |  18 +-
 ...ngPluginWithGenericSubclassFoo1BuilderTest.java |  18 +-
 .../ValidatingPluginWithTypedBuilderTest.java      |  18 +-
 .../log4j/core/impl/Log4jContextFactoryTest.java   |   7 +-
 .../core/impl/ReusableLogEventFactoryTest.java     |  20 +-
 .../logging/log4j/core/layout/GelfLayoutTest.java  |  18 +-
 .../logging/log4j/core/layout/HtmlLayoutTest.java  |  22 +-
 .../log4j/core/layout/PatternLayoutTest.java       |  15 +-
 .../log4j/core/layout/Rfc5424LayoutTest.java       |  42 +-
 .../core/layout/SpyByteBufferDestination.java      |   4 +-
 .../log4j/core/layout/SyslogLayoutTest.java        |  20 +-
 .../core/lookup/MainInputArgumentsMapLookup.java   |   1 -
 .../log4j/core/net/UrlConnectionFactoryTest.java   |   6 +-
 .../core/net/ssl/SslConfigurationFactoryTest.java  |   8 +-
 .../log4j/core/pattern/PatternParserTest.java      |   1 -
 .../plugins/convert/CoreTypeConvertersTest.java    |  27 +-
 .../logging/log4j/core/time/ClockFactoryTest.java  |  39 +-
 .../log4j/core/tools/GenerateCustomLoggerTest.java |   1 +
 .../core/tools/GenerateExtendedLoggerTest.java     |   1 +
 .../util/NamedLoggerContextPropertiesTest.java     |  14 +-
 log4j-core-test/src/test/java9/module-info.java    |  92 ---
 .../log4j-rolling-direct-tmp-compress-folder.xml   |  51 --
 ...oggerConfig.xml => log4j2-TestConfigurator.xml} |  21 +-
 ...erDirectWriteTempCompressedFilePatternTest.xml} |  24 +-
 .../rolling/RollingAppenderDirectWriteTest.xml}    |  19 +-
 .../log4j/core/async/AsyncLoggerConfig4Test.xml}   |   8 +-
 .../AsyncLoggerConfigWithAsyncEnabledTest.xml}     |   6 +-
 .../async}/AsyncLoggersWithAsyncAppenderTest.xml   |   2 +-
 .../log4j/core/async/QueueFullAbstractTest.xml}    |   5 +-
 .../core/async/QueueFullAsyncAppenderTest.xml}     |   7 +-
 ...llAsyncLoggerConfigLoggingFromToStringTest.xml} |   5 +-
 .../core/async/QueueFullAsyncLoggerConfigTest.xml} |   5 +-
 log4j-core/pom.xml                                 | 126 +--
 log4j-core/src/main/java/module-info.java          | 104 ---
 .../java/org/apache/logging/log4j/core/Logger.java |  21 +-
 .../apache/logging/log4j/core/LoggerContext.java   | 160 ++--
 .../core/annotation/OnPropertyKeyCondition.java    |   7 +-
 .../log4j/core/annotation}/package-info.java       |   9 +-
 .../log4j/core/appender/AbstractManager.java       |  69 +-
 .../logging/log4j/core/appender/AppenderSet.java   |   2 +-
 .../log4j/core/appender/DefaultErrorHandler.java   |   9 +-
 .../logging/log4j/core/appender/FileManager.java   |  16 +-
 .../core/appender/HttpURLConnectionManager.java    |  11 +-
 .../log4j/core/appender/ManagerException.java      |  18 +-
 .../log4j/core/appender/ManagerRegistry.java       |  88 ++
 .../core/appender/MemoryMappedFileManager.java     |  91 +-
 .../logging/log4j/core/appender/NullAppender.java  |   2 +-
 .../log4j/core/appender/OutputStreamAppender.java  |   3 +-
 .../log4j/core/appender/OutputStreamManager.java   | 125 ++-
 .../core/appender/RandomAccessFileManager.java     |  19 +-
 .../logging/log4j/core/appender/WriterManager.java |  15 +-
 .../log4j/core/appender/db/ColumnMapping.java      |  12 +-
 .../log4j/core/appender/db/package-info.java       |   5 +
 .../log4j/core/appender/nosql/package-info.java    |   5 +
 .../logging/log4j/core/appender/package-info.java  |   5 +
 .../rewrite/LoggerNameLevelRewritePolicy.java      |   2 +-
 .../log4j/core/appender/rewrite/package-info.java  |   5 +
 .../rolling/OnStartupTriggeringPolicy.java         |   2 +-
 .../core/appender/rolling/RollingFileManager.java  | 126 +--
 .../rolling/RollingRandomAccessFileManager.java    |  44 +-
 .../appender/rolling/action/AbstractAction.java    |  44 +-
 .../core/appender/rolling/action/Duration.java     |   2 +-
 .../rolling/action/PosixViewAttributeAction.java   |   2 +-
 .../core/appender/rolling/action/package-info.java |   5 +
 .../log4j/core/appender/rolling/package-info.java  |   5 +
 .../core/appender/routing/IdlePurgePolicy.java     |   8 +-
 .../core/appender/routing/RoutingAppender.java     |  19 +-
 .../log4j/core/appender/routing/package-info.java  |   5 +
 .../core/async/AsyncLoggerConfigDisruptor.java     |  77 +-
 .../log4j/core/async/AsyncLoggerContext.java       |  10 +-
 .../core/async/AsyncLoggerContextSelector.java     |  10 +-
 .../log4j/core/async/AsyncLoggerDisruptor.java     |  96 ++-
 .../async/BasicAsyncLoggerContextSelector.java     |   8 +-
 .../core/async/DisruptorBlockingQueueFactory.java  |   2 +-
 .../core/async/JCToolsBlockingQueueFactory.java    |   2 +-
 .../core/async/TimeoutBlockingWaitStrategy.java    |  44 +-
 .../logging/log4j/core/async/package-info.java     |   5 +
 .../log4j/core/config/AbstractConfiguration.java   | 258 +++---
 .../logging/log4j/core/config/AppenderControl.java |   2 +-
 .../logging/log4j/core/config/Configuration.java   |  22 +-
 ...r.java => ConfigurationAwarePostProcessor.java} |  37 +-
 .../log4j/core/config/ConfigurationFactory.java    |  46 +-
 .../log4j/core/config/ConfigurationProcessor.java  | 154 ++++
 .../log4j/core/config/ConfigurationScheduler.java  |  58 +-
 .../log4j/core/config/ConfigurationSource.java     |  20 +-
 .../log4j/core/config/CronScheduledFuture.java     |  10 +-
 .../log4j/core/config/DefaultAdvertiser.java       |   2 +-
 .../core/config/DefaultConfigurationFactory.java   |  17 +-
 .../logging/log4j/core/config/HttpWatcher.java     |  21 +-
 ...r.java => LoggerContextAwarePostProcessor.java} |  39 +-
 .../log4j/core/config/arbiters/ClassArbiter.java   |   2 +-
 .../config/arbiters/SystemPropertyArbiter.java     |   2 +-
 .../log4j/core/config/arbiters/package-info.java   |  11 +-
 .../core/config/builder/api/package-info.java      |   5 +
 .../core/config/builder/impl/package-info.java     |   5 +
 .../config/composite/CompositeConfiguration.java   |   2 +-
 .../log4j/core/config/composite/package-info.java  |   5 +
 .../log4j/core/config/jason/JsonConfiguration.java |  16 +-
 .../log4j/core/config/jason}/package-info.java     |   9 +-
 .../log4j/core/config/json/package-info.java       |   5 +
 .../logging/log4j/core/config/package-info.java    |   5 +
 .../log4j/core/config/plugins/PluginAttribute.java |   3 -
 .../config/plugins/PluginBuilderAttribute.java     |   3 -
 .../core/config/plugins/PluginConfiguration.java   |   3 -
 .../log4j/core/config/plugins/PluginElement.java   |   3 -
 .../core/config/plugins/PluginLoggerContext.java   |   3 -
 .../log4j/core/config/plugins/PluginNode.java      |   3 -
 .../log4j/core/config/plugins/PluginValue.java     |   3 -
 .../core/config/plugins/convert/package-info.java  |   5 +
 .../log4j/core/config/plugins/package-info.java    |   5 +
 ...acyAnnotationFactoryResolversPostProcessor.java |  44 +
 .../util/LegacyPluginAttributeFactoryResolver.java |  71 ++
 ...egacyPluginBuilderAttributeFactoryResolver.java |  42 +
 .../util/LegacyPluginElementFactoryResolver.java}  |  15 +-
 .../util/LegacyPluginNodeFactoryResolver.java      |  20 +-
 .../util/LegacyPluginValueFactoryResolver.java     |  21 +-
 .../util/PluginConfigurationFactoryResolver.java   |  26 +-
 .../util/PluginLoggerContextFactoryResolver.java   |  21 +-
 .../core/config/plugins/util/package-info.java     |   5 +
 .../plugins/visit/PluginAttributeVisitor.java      | 110 ---
 .../visit/PluginBuilderAttributeVisitor.java       |  41 -
 .../plugins/visit/PluginConfigurationVisitor.java  |  65 --
 .../plugins/visit/PluginLoggerContextVisitor.java  |  69 --
 .../log4j/core/config/properties/package-info.java |   5 +
 .../log4j/core/config/status/package-info.java     |   5 +
 .../log4j/core/config/xml/package-info.java        |   5 +
 .../log4j/core/config/yaml/package-info.java       |   5 +
 .../log4j/core/filter/AbstractFilterable.java      |  61 +-
 .../core/filter/MutableThreadContextMapFilter.java |  40 +-
 .../logging/log4j/core/filter/TimeFilter.java      |  13 +-
 .../log4j/core/filter/mutable/package-info.java    |  11 +-
 .../logging/log4j/core/filter/package-info.java    |   5 +
 .../logging/log4j/core/impl/DefaultBundle.java     | 164 +---
 .../logging/log4j/core/impl/DefaultCallback.java   |  35 -
 .../log4j/core/impl/DefaultLogEventFactory.java    |   4 +-
 .../log4j/core/impl/Log4jContextFactory.java       |  82 +-
 .../impl/Log4jInstanceFactoryPostProcessor.java    |  37 +
 .../impl/Log4jModuleReflectionPostProcessor.java   |  37 +
 .../logging/log4j/core/impl/Log4jProvider.java     |   3 +
 .../log4j/core/impl/SystemPropertyBundle.java      | 107 +++
 .../log4j/core/impl/ThreadContextDataInjector.java |   4 +
 .../log4j/core/impl/ThreadContextDataProvider.java |   3 +
 .../logging/log4j/core/impl/package-info.java      |   5 +
 .../logging/log4j/core/jmx/LoggerContextAdmin.java |   7 +-
 .../logging/log4j/core/jmx/package-info.java       |   5 +
 .../log4j/core/layout/ByteBufferDestination.java   |  68 ++
 .../core/layout/ByteBufferDestinationHelper.java   |  30 +-
 .../logging/log4j/core/layout/HtmlLayout.java      |   2 +-
 .../core/layout/LockingStringBuilderEncoder.java   |   6 +-
 .../logging/log4j/core/layout/PatternLayout.java   |   2 +-
 .../logging/log4j/core/layout/Rfc5424Layout.java   |  19 +-
 .../logging/log4j/core/layout/SyslogLayout.java    |  20 +-
 .../log4j/core/layout/TextEncoderHelper.java       |  60 +-
 .../logging/log4j/core/layout/package-info.java    |   5 +
 .../logging/log4j/core/lookup/Interpolator.java    |  17 +-
 .../logging/log4j/core/lookup/StrSubstitutor.java  |   8 +-
 .../logging/log4j/core/lookup/package-info.java    |   5 +
 .../core/message/ExtendedThreadInfoFactory.java    |   7 +-
 .../log4j/core/net/DatagramOutputStream.java       |  59 +-
 .../logging/log4j/core/net/SocketAddress.java      |   2 +-
 .../logging/log4j/core/net/TcpSocketManager.java   | 111 +--
 .../log4j/core/net/UrlConnectionFactory.java       |  20 +-
 .../logging/log4j/core/net/package-info.java       |   5 +
 .../log4j/core/net/ssl/SslConfiguration.java       |   2 +-
 .../core/net/ssl/SslConfigurationFactory.java      |  12 +-
 .../logging/log4j/core/net/ssl/package-info.java   |   5 +
 .../apache/logging/log4j/core/osgi/Activator.java  |  60 +-
 .../log4j/core/osgi/BundleContextSelector.java     |   6 +-
 .../log4j/core/osgi/OsgiBundlePostProcessor.java   |  72 ++
 .../logging/log4j/core/osgi/package-info.java      |   5 +
 .../apache/logging/log4j/core/package-info.java    |   5 +
 .../logging/log4j/core/parser/package-info.java    |   5 +
 .../log4j/core/pattern/LevelPatternConverter.java  |   2 +-
 .../core/pattern/MessagePatternConverter.java      |   2 +-
 .../logging/log4j/core/pattern/PatternParser.java  |   2 +-
 .../logging/log4j/core/pattern/package-info.java   |   5 +
 .../logging/log4j/core}/script/package-info.java   |   7 +-
 .../log4j/core/selector/BasicContextSelector.java  |  15 +-
 .../core/selector/ClassLoaderContextSelector.java  |  36 +-
 .../log4j/core/selector/ContextSelector.java       |   6 +-
 .../logging/log4j/core/selector/package-info.java  |   5 +
 .../logging/log4j/core/time/ClockFactory.java      |  55 +-
 .../core/time/internal/format/FastDateParser.java  |   8 +-
 .../core/time/internal/format/FixedDateFormat.java |  19 +-
 .../logging/log4j/core/time/package-info.java      |  11 +-
 .../logging/log4j/core/tools/package-info.java     |   5 +
 .../log4j/core/util/AuthorizationProvider.java     |  17 +
 .../logging/log4j/core/util/CyclicBuffer.java      |  60 +-
 .../apache/logging/log4j/core/util/IOUtils.java    | 130 ---
 .../logging/log4j/core/util/NullOutputStream.java  |  86 --
 .../logging/log4j/core/util/WatchManager.java      |   4 +
 .../apache/logging/log4j/core/util/Watcher.java    |   4 -
 .../logging/log4j/core/util/WatcherFactory.java    |   5 +-
 .../log4j/core/util/datetime}/package-info.java    |  10 +-
 .../core/util/internal/HttpInputStreamUtil.java    |  25 +-
 .../logging/log4j/core/util/package-info.java      |   5 +
 ...che.logging.log4j.core.util.ContextDataProvider |   1 -
 ...g4j.message.ThreadDumpMessage$ThreadInfoFactory |   1 -
 ...pache.logging.log4j.plugins.di.InjectorCallback |  17 -
 ...di.spi.ConfigurableInstanceFactoryPostProcessor |   4 +-
 .../services/org.apache.logging.log4j.spi.Provider |   1 -
 log4j-couchdb/pom.xml                              |  21 +-
 .../logging/log4j/couchdb/CouchDbProvider.java     |   7 +-
 .../apache/logging/log4j/couchdb/package-info.java |   7 +
 log4j-csv/pom.xml                                  |  24 +-
 .../logging/log4j/csv/layout}/package-info.java    |   9 +-
 .../CsvJsonParameterLayoutFileAppenderTest.java    |   2 +-
 .../log4j/csv/layout/CsvLogEventLayoutTest.java    |  18 +-
 log4j-docker/pom.xml                               |  42 +-
 .../logging/log4j/docker/model}/package-info.java  |   4 +-
 .../apache/logging/log4j/docker}/package-info.java |  11 +-
 log4j-flume-ng/pom.xml                             |  44 +-
 .../log4j/flume/appender/FlumeAppender.java        |   6 +-
 .../flume/appender/FlumePersistentManager.java     |  16 +-
 .../logging/log4j/flume/appender/package-info.java |   7 +
 .../log4j/flume/appender/FlumeAppenderTest.java    |  27 +-
 .../flume/appender/FlumeEmbeddedAppenderTest.java  |  13 +-
 log4j-gctests/pom.xml                              |  13 -
 .../log4j/gctests/GcFreeLoggingTestUtil.java       |  78 +-
 ...t.java => GcFreeMixedSyncAsyncLoggingTest.java} |   4 +-
 log4j-iostreams/pom.xml                            |  25 +-
 .../org/apache/logging/log4j/io/package-info.java  |   5 +
 log4j-jakarta-smtp/pom.xml                         |  22 +-
 .../apache/logging/log4j/smtp}/package-info.java   |   9 +-
 .../logging/dumbster/smtp/SmtpActionType.java      |   2 +-
 .../apache/logging/dumbster/smtp/SmtpState.java    |   2 +-
 log4j-jakarta-web/pom.xml                          |  24 +-
 .../logging/log4j/web/appender/package-info.java   |  13 +-
 .../org/apache/logging/log4j/web/package-info.java |   5 +
 log4j-jcl/pom.xml                                  |  21 +-
 .../apache/logging/log4j/jcl/LogFactoryImpl.java   |   3 +
 .../org/apache/logging/log4j/jcl/package-info.java |   5 +
 log4j-jdbc-dbcp2/pom.xml                           |  26 +-
 .../appender/PoolableConnectionFactoryConfig.java  |   2 +-
 log4j-jdbc/pom.xml                                 |  45 +-
 .../jdbc/appender/DataSourceConnectionSource.java  |   2 +-
 .../jdbc/appender/{util => internal}/JndiUtil.java |   2 +-
 .../logging/log4j/jdbc/appender/package-info.java  |   5 +
 log4j-jeromq/pom.xml                               |  23 +-
 .../log4j/jeromq/appender/JeroMqManager.java       |   2 +-
 .../log4j/jeromq/appender}/package-info.java       |   9 +-
 log4j-jms/pom.xml                                  |  24 +-
 .../logging/log4j/jms/appender/JmsAppender.java    |   2 +-
 .../logging/log4j/jms/appender/JmsManager.java     |   2 +-
 .../logging/log4j/jms/appender/package-info.java   |   5 +
 log4j-jndi-test/pom.xml                            |  13 -
 .../routing/RoutingAppenderWithJndiTest.java       |   1 +
 .../jndi/lookup/JndiRestrictedLookupTest.java      |   4 +
 log4j-jndi/pom.xml                                 |  15 +-
 .../org/apache/logging/log4j/jndi/JndiManager.java |   6 +-
 .../log4j/jndi/{util => internal}/JndiCloser.java  |   2 +-
 .../logging/log4j/jndi/lookup}/package-info.java   |   9 +-
 .../apache/logging/log4j/jndi}/package-info.java   |   9 +-
 .../logging/log4j/jndi/selector}/package-info.java |   9 +-
 log4j-jpa/pom.xml                                  |  31 +-
 .../logging/log4j/jpa/appender/JpaAppender.java    |   2 +-
 .../logging/log4j/jpa/appender/package-info.java   |   7 +
 .../logging/log4j/jpa/converter/package-info.java  |   7 +
 log4j-jpl/pom.xml                                  |  86 +-
 .../logging/log4j/jpl/Log4jSystemLoggerFinder.java |   4 +
 .../apache/logging/log4j/jpl}/package-info.java    |   9 +-
 log4j-jpl/src/main/module/module-info.java         |  22 -
 log4j-jpl/src/test/java/module-info.java           |  27 -
 log4j-jul/pom.xml                                  |  51 +-
 log4j-jul/src/main/java/module-info.java           |  26 -
 .../apache/logging/log4j/jul}/package-info.java    |   9 +-
 log4j-jul/src/test/java/module-info.java           |  31 -
 log4j-kafka/pom.xml                                |  25 +-
 .../log4j/kafka/appender}/package-info.java        |   9 +-
 log4j-kubernetes/pom.xml                           |  28 +-
 .../logging/log4j/kubernetes/package-info.java     |  13 +-
 log4j-layout-jackson-json/pom.xml                  |  27 +-
 .../log4j/jackson/json/layout}/package-info.java   |   9 +-
 .../logging/log4j/jackson/json}/package-info.java  |   9 +-
 .../log4j/jackson/json/parser}/package-info.java   |   9 +-
 .../log4j/jackson/json/layout/JsonLayoutTest.java  |  18 +-
 log4j-layout-jackson-xml/pom.xml                   |  28 +-
 .../log4j/jackson/xml/layout}/package-info.java    |   9 +-
 .../logging/log4j/jackson/xml}/package-info.java   |   9 +-
 .../log4j/jackson/xml/parser}/package-info.java    |   9 +-
 .../log4j/jackson/xml/layout/XmlLayoutTest.java    |  12 +-
 log4j-layout-jackson-yaml/pom.xml                  |  28 +-
 .../log4j/jackson/yaml/layout}/package-info.java   |   9 +-
 .../logging/log4j/jackson/yaml}/package-info.java  |   9 +-
 .../log4j/jackson/yaml/parser}/package-info.java   |   9 +-
 .../log4j/jackson/yaml/layout/YamlLayoutTest.java  |  18 +-
 log4j-layout-jackson/pom.xml                       |  75 +-
 .../log4j/jackson/layout}/package-info.java        |   9 +-
 .../apache/logging/log4j/jackson/package-info.java |   5 +
 log4j-layout-template-json-test/pom.xml            | 102 +--
 .../log4j/layout/template/json/package-info.java   |  11 +-
 .../json/resolver/MessageResolverTest.java         |   8 +-
 .../resolver/StackTraceStringResolverTest.java     |   3 +-
 .../json/util/CharSequencePointerTest.java         |   1 +
 .../template/json/util/RecyclerFactoriesTest.java  |   7 +-
 log4j-layout-template-json/pom.xml                 | 107 +--
 .../src/main/java/module-info.java                 |  32 -
 .../layout/template/json/JsonTemplateLayout.java   |   2 +-
 .../log4j/layout/template/json/package-info.java   |  13 +-
 .../resolver/EventAdditionalFieldInterceptor.java  |   2 +-
 .../json/resolver/EventResolverContext.java        |   2 +-
 .../resolver/EventRootObjectKeyInterceptor.java    |   2 +-
 .../template/json/resolver/package-info.java       |  13 +-
 .../layout/template/json/util/package-info.java    |   8 +-
 log4j-mongodb3/pom.xml                             |  25 +-
 .../logging/log4j/mongodb3/MongoDb3Provider.java   |  11 +-
 .../logging/log4j/mongodb3/package-info.java       |   7 +
 log4j-mongodb4/pom.xml                             |  21 +-
 .../logging/log4j/mongodb4/package-info.java       |   7 +
 log4j-osgi/pom.xml                                 |  24 +-
 .../log4j/osgi/tests/AbstractLoadBundleTest.java   |   2 +-
 .../logging/log4j/osgi/tests/CoreOsgiTest.java     |   2 +-
 .../logging/log4j/osgi/tests/JULProviderTest.java  |   4 +-
 .../log4j/osgi/tests/SLF4JProviderTest.java        |   4 +-
 log4j-perf/pom.xml                                 |  13 +-
 .../json/BlackHoleByteBufferDestination.java       |   5 +-
 ...bstractStringLayoutStringEncodingBenchmark.java |   5 +-
 .../log4j/perf/jmh/TextEncoderHelperBenchmark.java |   5 +-
 .../logging/log4j/perf/nogc/DemoAppender.java      |   5 +-
 .../logging/log4j/perf/util/DemoAppender.java      |   5 +-
 log4j-plugin-processor/pom.xml                     |  70 --
 .../log4j/plugin/processor/PluginProcessor.java    | 119 ++-
 .../log4j/plugin/processor/package-info.java       |   5 +
 .../src/main/java9/module-info.java                |  26 -
 log4j-plugins-test/pom.xml                         |  55 +-
 .../PluginWithGenericSubclassFoo1Builder.java      |   4 +-
 .../plugins/test/validation/ValidatingPlugin.java  |  10 +-
 .../ValidatingPluginWithGenericBuilder.java        |   4 +-
 .../ValidatingPluginWithTypedBuilder.java          |   4 +-
 .../test/validation/{generic => di}/AlphaBean.java |   2 +-
 .../BaseBean.java => di/AnotherSingletonBean.java} |   8 +-
 .../test/validation/{generic => di}/BaseBean.java  |   2 +-
 .../test/validation/{generic => di}/BetaBean.java  |   2 +-
 .../test/validation/di/ConfigurablePlugin.java     |  67 ++
 .../test/validation/di/CustomQualifier.java        |  14 +-
 .../plugins/test/validation/di/CustomScope.java    |  14 +-
 .../test/validation/di/FirstCircularBean.java      |  18 +-
 .../test/validation/{generic => di}/GammaBean.java |   2 +-
 .../BaseBean.java => di/PrototypeBean.java}        |   7 +-
 .../test/validation/di/PrototypeChildBean.java     |  18 +-
 .../validation/di/PrototypeGrandchildBean.java     |  18 +-
 .../test/validation/di/SecondCircularBean.java     |  18 +-
 .../BaseBean.java => di/SingletonBean.java}        |   8 +-
 .../plugins/test/validation/di}/package-info.java  |   7 +-
 .../plugins/test/validation}/package-info.java     |   7 +-
 log4j-plugins-test/src/main/java9/module-info.java |  25 -
 .../plugin/processor/PluginProcessorTest.java      |  13 +-
 .../condition/OnMissingBindingConditionTest.java   |  33 +-
 .../plugins/condition/OnPropertyConditionTest.java |  91 +-
 .../plugins/convert/TypeConverterRegistryTest.java |  15 +-
 ...t.java => CircularDependencyExceptionTest.java} |  19 +-
 .../di/ConfigurableInstanceFactoryTest.java        | 300 +++++++
 .../log4j/plugins/di/ConstructorInjectionTest.java |  57 ++
 .../logging/log4j/plugins/di/CustomScopeTest.java  |  61 ++
 .../log4j/plugins/di/FieldInjectionTest.java       |  70 ++
 .../logging/log4j/plugins/di/InjectorTest.java     | 919 ---------------------
 .../log4j/plugins/di/InstanceFactoryTest.java      |  47 ++
 .../apache/logging/log4j/plugins/di/KeyTest.java   |  15 +-
 .../apache/logging/log4j/plugins/di/KeysTest.java  |  42 +-
 .../log4j/plugins/di/MethodInjectionTest.java      |  83 ++
 .../log4j/plugins/di/QualifierInjectionTest.java   |  98 +++
 .../log4j/plugins/processor/PluginCacheTest.java   |   3 +
 .../log4j/plugins/util/AnnotationUtilTest.java     |  25 +-
 log4j-plugins/pom.xml                              |  16 -
 log4j-plugins/src/main/java/module-info.java       |  51 --
 .../apache/logging/log4j/plugins/Configurable.java |  18 +-
 .../org/apache/logging/log4j/plugins/Factory.java  |   2 +
 .../org/apache/logging/log4j/plugins/Node.java     |  76 +-
 .../org/apache/logging/log4j/plugins/Ordered.java  |   6 +-
 .../org/apache/logging/log4j/plugins/Plugin.java   |   1 +
 .../logging/log4j/plugins/PluginAliases.java       |   1 -
 .../logging/log4j/plugins/PluginAttribute.java     |  36 +-
 .../log4j/plugins/PluginBuilderAttribute.java      |  10 +-
 .../logging/log4j/plugins/PluginElement.java       |  15 +-
 .../logging/log4j/plugins/PluginFactory.java       |  13 +-
 .../apache/logging/log4j/plugins/PluginNode.java   |   6 +-
 .../apache/logging/log4j/plugins/PluginValue.java  |   5 +-
 .../logging/log4j/plugins/condition/Condition.java |   7 +-
 .../log4j/plugins/condition/ConditionContext.java  |  56 ++
 .../log4j/plugins/condition/Conditional.java       |  16 +-
 ...perty.java => ConditionalOnMissingBinding.java} |  14 +-
 .../plugins/condition/ConditionalOnProperty.java   |   2 +
 ...ndition.java => OnMissingBindingCondition.java} |  21 +-
 .../plugins/condition/OnPropertyCondition.java     |  47 +-
 .../log4j/plugins/condition}/package-info.java     |   9 +-
 .../log4j/plugins/convert/TypeConverter.java       |   2 +
 .../plugins/convert/TypeConverterFactory.java      |   9 +-
 .../log4j/plugins/convert/package-info.java        |   5 +
 .../di/AmbiguousInjectConstructorException.java    |   5 +
 .../plugins/di/CircularDependencyException.java    |   2 +
 .../plugins/di/ConfigurableInstanceFactory.java    | 183 ++++
 .../org/apache/logging/log4j/plugins/di/DI.java    |  54 +-
 .../logging/log4j/plugins/di/DefaultInjector.java  | 649 ---------------
 .../log4j/plugins/di/DefaultInstanceFactory.java   | 397 +++++++++
 ...ltScope.java => DuplicateBindingException.java} |  19 +-
 .../apache/logging/log4j/plugins/di/Injector.java  | 210 -----
 .../logging/log4j/plugins/di/InjectorCallback.java |  49 --
 .../logging/log4j/plugins/di/InstanceFactory.java  | 184 +++++
 .../org/apache/logging/log4j/plugins/di/Key.java   | 149 +++-
 .../org/apache/logging/log4j/plugins/di/Keys.java  |  54 +-
 ...ption.java => NoQualifiedBindingException.java} |  38 +-
 .../log4j/plugins/di/NotInjectableException.java   |   6 +
 .../log4j/plugins/di/ReflectionAccessor.java       |  85 --
 .../logging/log4j/plugins/di/package-info.java     |   5 +
 .../resolver/AbstractAttributeFactoryResolver.java |  83 ++
 .../di/resolver/AbstractPluginFactoryResolver.java |  45 +
 .../GenericFactoryResolversPostProcessor.java      |  26 +-
 .../di/resolver/OptionalFactoryResolver.java       |  60 ++
 ...ginAnnotationFactoryResolversPostProcessor.java |  89 ++
 .../resolver/PluginAttributeFactoryResolver.java   |  73 ++
 .../PluginBuilderAttributeFactoryResolver.java     |  43 +
 .../di/resolver/PluginElementFactoryResolver.java  | 136 +++
 .../di/resolver/PluginListFactoryResolver.java     |  50 ++
 .../PluginListSupplierFactoryResolver.java         |  52 ++
 .../di/resolver/PluginMapFactoryResolver.java      |  54 ++
 .../resolver/PluginMapSupplierFactoryResolver.java |  60 ++
 .../resolver/PluginNamespaceFactoryResolver.java   |  42 +
 .../di/resolver/PluginOptionalFactoryResolver.java |  46 ++
 .../PluginOptionalSupplierFactoryResolver.java     |  49 ++
 .../di/resolver/PluginSetFactoryResolver.java      |  50 ++
 .../resolver/PluginSetSupplierFactoryResolver.java |  52 ++
 .../di/resolver/PluginStreamFactoryResolver.java   |  46 ++
 .../PluginStreamPluginTypeFactoryResolver.java     |  62 ++
 .../PluginStreamSupplierFactoryResolver.java       |  50 ++
 .../di/resolver/PluginTypeFactoryResolver.java     |  49 ++
 .../di/resolver/PluginValueFactoryResolver.java    |  79 ++
 .../logging/log4j/plugins/di/resolver/Plugins.java |  61 ++
 .../di/resolver/SupplierFactoryResolver.java       |  47 ++
 .../log4j/plugins/di/resolver/package-info.java    |  33 +
 .../ConfigurableInstanceFactoryPostProcessor.java  |  58 ++
 .../plugins/di/{ => spi}/DependencyChain.java      |   4 +-
 .../plugins/di/{ => spi}/DependencyChains.java     |   4 +-
 .../log4j/plugins/di/spi/FactoryResolver.java      |  49 ++
 .../di/spi/FactoryResolversPostProcessor.java      |  25 +-
 .../log4j/plugins/di/{ => spi}/InjectionPoint.java |  28 +-
 .../plugins/di/spi/InstancePostProcessor.java      |  18 +-
 .../log4j/plugins/di/spi/ReflectionAgent.java      | 114 +++
 .../log4j/plugins/di/spi/ReflectionException.java  |  15 +-
 .../log4j/plugins/di/spi/ResolvableKey.java        |  84 ++
 .../logging/log4j/plugins/di/{ => spi}/Scope.java  |   7 +-
 .../log4j/plugins/di/{ => spi}/SingletonScope.java |   3 +-
 .../di/spi/SingletonScopePostProcessor.java        |  22 +-
 .../log4j/plugins/di/spi/StringValueResolver.java  |  43 +
 .../plugins/{name => di/spi}/package-info.java     |   9 +-
 .../log4j/plugins/internal/util/BeanUtils.java     |  77 +-
 .../log4j/plugins/internal/util/BindingMap.java    | 137 +++
 .../logging/log4j/plugins/model/PluginEntry.java   |  75 +-
 .../logging/log4j/plugins/model/PluginType.java    |  17 +-
 .../logging/log4j/plugins/model}/package-info.java |   9 +-
 .../logging/log4j/plugins/name/package-info.java   |   5 +
 .../logging/log4j/plugins/osgi/Activator.java      |   3 +
 .../logging/log4j/plugins/osgi/package-info.java   |   5 +
 .../apache/logging/log4j/plugins/package-info.java |   5 +
 .../log4j/plugins/util/AnnotatedAnnotation.java    |  33 +-
 .../logging/log4j/plugins/util/AnnotationUtil.java | 139 +++-
 .../log4j/plugins/util/OrderedComparator.java      |  18 +-
 .../logging/log4j/plugins/util/TypeUtil.java       |  15 +-
 .../logging/log4j/plugins/util}/package-info.java  |   9 +-
 .../validation/constraints/package-info.java       |   5 +
 .../log4j/plugins/validation/package-info.java     |   5 +
 .../validation/validators/ValidPortValidator.java  |   7 +-
 .../validation/validators/package-info.java        |   5 +
 .../logging/log4j/plugins/visit/NodeVisitor.java   |  87 --
 .../plugins/visit/PluginAttributeVisitor.java      | 109 ---
 .../visit/PluginBuilderAttributeVisitor.java       |  78 --
 .../log4j/plugins/visit/PluginElementVisitor.java  | 131 ---
 .../log4j/plugins/visit/PluginNodeVisitor.java     |  53 --
 .../log4j/plugins/visit/PluginValueVisitor.java    |  77 --
 .../logging/log4j/plugins/visit/package-info.java  |  22 -
 ...di.spi.ConfigurableInstanceFactoryPostProcessor |   4 +-
 log4j-script/pom.xml                               |  63 +-
 .../apache/logging/log4j/script/ScriptFile.java    |   6 +-
 .../log4j/script/appender}/package-info.java       |   9 +-
 .../appender/rolling/action}/package-info.java     |   9 +-
 .../log4j/script/config/arbiter}/package-info.java |   9 +-
 .../script/factory/ScriptManagerFactoryImpl.java   |   3 +
 .../logging/log4j/script/filter}/package-info.java |   9 +-
 .../logging/log4j/script/layout}/package-info.java |   9 +-
 .../apache/logging/log4j/script/package-info.java  |   5 +
 log4j-script/src/main/module/module-info.java      |  44 -
 log4j-script/src/test/java/module-info.java        |  61 --
 log4j-slf4j-impl/pom.xml                           |  82 +-
 .../org/apache/logging/slf4j/package-info.java     |   8 +
 .../src/main/java/org/slf4j/impl/package-info.java |   5 +
 log4j-slf4j2-impl/pom.xml                          |  38 +-
 .../apache/logging/slf4j/SLF4JServiceProvider.java |   3 +
 .../org/apache/logging/slf4j/package-info.java     |   8 +
 log4j-smtp/pom.xml                                 |  24 +-
 .../logging/log4j/smtp/appender}/package-info.java |   9 +-
 .../apache/logging/log4j/smtp}/package-info.java   |   9 +-
 log4j-spring-boot/pom.xml                          |  22 +-
 .../spring/boot/Log4j2SpringBootLoggingSystem.java |  16 +-
 .../logging/log4j/spring/boot}/package-info.java   |   9 +-
 .../log4j/spring/boot/SpringLookupTest.java        |   2 +-
 .../log4j-spring-cloud-config-client/pom.xml       |  25 +-
 .../cloud/config/client/WatchEventManager.java     |   6 +-
 .../spring/cloud/config/client/package-info.java   |  11 +-
 log4j-taglib/pom.xml                               |  15 +-
 .../apache/logging/log4j/taglib/package-info.java  |   5 +
 log4j-to-jul/pom.xml                               |  15 +-
 log4j-to-jul/src/main/java/module-info.java        |  24 -
 .../apache/logging/log4j/tojul/JULProvider.java    |   3 +
 .../apache/logging/log4j/tojul/package-info.java   |   5 +
 log4j-to-jul/src/test/java/module-info.java        |  29 -
 log4j-to-slf4j/pom.xml                             |  24 +-
 .../org/apache/logging/slf4j/SLF4JProvider.java    |   3 +
 .../org/apache/logging/slf4j/package-info.java     |   5 +
 log4j-web/pom.xml                                  |  27 +-
 .../logging/log4j/web/appender/package-info.java   |  13 +-
 .../org/apache/logging/log4j/web/package-info.java |   5 +
 pom.xml                                            | 187 +----
 .../.3.x.x/1520_Log4jPlugins_reproducibility.xml   |  19 +-
 ...-3496_support_injection_via_container_types.xml |  23 +-
 src/site/asciidoc/manual/configuration.adoc        |   4 +-
 src/site/asciidoc/manual/dependencyinjection.adoc  |  29 +-
 689 files changed, 10717 insertions(+), 9807 deletions(-)
 create mode 100755 .github/generate-email.sh
 delete mode 100644 .github/workflows/log4j-kafka-test.yml
 delete mode 100644 .github/workflows/maven-settings.xml
 create mode 100644 .github/workflows/merge-dependabot.yaml
 create mode 100644 log4j-1.2-api/bnd.bnd
 copy {log4j-api/src/main/java/org/apache/logging/log4j/util => 
log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender}/package-info.java
 (86%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/util => 
log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter}/package-info.java 
(86%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/util => 
log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout}/package-info.java 
(86%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/builders}/package-info.java (75%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/util => 
log4j-1.2-api/src/main/java/org/apache/log4j/builders/rewrite}/package-info.java
 (86%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/layout}/package-info.java (80%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/or/jms}/package-info.java (84%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/or}/package-info.java (84%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/pattern}/package-info.java (84%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/rewrite}/package-info.java (84%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-1.2-api/src/main/java/org/apache/log4j/varia}/package-info.java (84%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-api-test/src/main/java/org/apache/logging/log4j/test}/package-info.java 
(83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-api-test/src/main/java/org/apache/logging/log4j/test/util}/package-info.java
 (83%)
 delete mode 100644 log4j-api-test/src/main/module/module-info.java
 delete mode 100644 log4j-api/src/main/java/module-info.java
 delete mode 100644 log4j-api/src/main/resources/META-INF/MANIFEST.MF
 delete mode 100644 
log4j-api/src/main/resources/META-INF/services/org.apache.logging.log4j.util.PropertySource
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender/rolling/action}/package-info.java
 (81%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/hamcrest}/package-info.java
 (82%)
 copy log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Ordered.java 
=> 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ConfigurationFactoryType.java
 (67%)
 copy 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/{ContextSelectorCallback.java
 => ConfigurationFactoryTypeCallback.java} (57%)
 create mode 100644 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/URLStreamHandlerFactoryRule.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/layout}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/mock}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/ssl}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/parser}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/util}/package-info.java
 (82%)
 delete mode 100644 log4j-core-test/src/main/module/module-info.java
 create mode 100644 
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/ConfigurationProcessorTest.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
 => 
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerContextAwarePostProcessorTest.java
 (50%)
 copy log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java => 
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/NullConfigurationTest.java
 (72%)
 delete mode 100644 log4j-core-test/src/test/java9/module-info.java
 delete mode 100644 
log4j-core-test/src/test/resources/log4j-rolling-direct-tmp-compress-folder.xml
 copy log4j-core-test/src/test/resources/{log4j2-queueFullAsyncLoggerConfig.xml 
=> log4j2-TestConfigurator.xml} (73%)
 rename log4j-core-test/src/test/resources/{log4j-rolling-direct.xml => 
org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTempCompressedFilePatternTest.xml}
 (63%)
 copy log4j-core-test/src/test/resources/{AsyncLoggersWithAsyncAppenderTest.xml 
=> 
org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTest.xml}
 (70%)
 copy log4j-core-test/src/test/resources/{AsyncLoggerConfigTest4.xml => 
org/apache/logging/log4j/core/async/AsyncLoggerConfig4Test.xml} (85%)
 rename log4j-core-test/src/test/resources/{AsyncLoggerConfigTest4.xml => 
org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.xml} 
(88%)
 rename log4j-core-test/src/test/resources/{ => 
org/apache/logging/log4j/core/async}/AsyncLoggersWithAsyncAppenderTest.xml (97%)
 copy log4j-core-test/src/test/resources/{log4j2-queueFull.xml => 
org/apache/logging/log4j/core/async/QueueFullAbstractTest.xml} (91%)
 rename log4j-core-test/src/test/resources/{log4j2-queueFullAsyncAppender.xml 
=> org/apache/logging/log4j/core/async/QueueFullAsyncAppenderTest.xml} (88%)
 copy log4j-core-test/src/test/resources/{log4j2-queueFullAsyncLoggerConfig.xml 
=> 
org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.xml}
 (91%)
 copy log4j-core-test/src/test/resources/{log4j2-queueFullAsyncLoggerConfig.xml 
=> org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigTest.xml} (91%)
 delete mode 100644 log4j-core/src/main/java/module-info.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation}/package-info.java
 (82%)
 copy 
log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java => 
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerException.java
 (67%)
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/{DefaultAdvertiser.java
 => ConfigurationAwarePostProcessor.java} (53%)
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationProcessor.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/{DefaultAdvertiser.java
 => LoggerContextAwarePostProcessor.java} (50%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/arbiters/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/jason}/package-info.java
 (82%)
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyAnnotationFactoryResolversPostProcessor.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginAttributeFactoryResolver.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginBuilderAttributeFactoryResolver.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/{impl/Log4jProvider.java 
=> config/plugins/util/LegacyPluginElementFactoryResolver.java} (65%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultScope.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginNodeFactoryResolver.java
 (52%)
 copy log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginValueFactoryResolver.java
 (66%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScope.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginConfigurationFactoryResolver.java
 (50%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultScope.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginLoggerContextFactoryResolver.java
 (50%)
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginAttributeVisitor.java
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginBuilderAttributeVisitor.java
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginConfigurationVisitor.java
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginLoggerContextVisitor.java
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/filter/mutable/package-info.java
 (82%)
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/DefaultCallback.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jInstanceFactoryPostProcessor.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jModuleReflectionPostProcessor.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/SystemPropertyBundle.java
 create mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/OsgiBundlePostProcessor.java
 copy {log4j-script/src/main/java/org/apache/logging/log4j => 
log4j-core/src/main/java/org/apache/logging/log4j/core}/script/package-info.java
 (83%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-core/src/main/java/org/apache/logging/log4j/core/time/package-info.java 
(82%)
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/util/IOUtils.java
 delete mode 100644 
log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime}/package-info.java
 (79%)
 delete mode 100644 
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider
 delete mode 100644 
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.message.ThreadDumpMessage$ThreadInfoFactory
 delete mode 100644 
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.plugins.di.InjectorCallback
 rename 
log4j-appserver/src/main/resources/META-INF/services/org.apache.juli.logging.Log
 => 
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.plugins.di.spi.ConfigurableInstanceFactoryPostProcessor
 (76%)
 delete mode 100644 
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.spi.Provider
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout}/package-info.java 
(83%)
 copy {log4j-1.2-api/src/main/java/org/apache/log4j/config => 
log4j-docker/src/main/java/org/apache/logging/log4j/docker/model}/package-info.java
 (89%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-docker/src/main/java/org/apache/logging/log4j/docker}/package-info.java 
(77%)
 rename 
log4j-gctests/src/test/java/org/apache/logging/log4j/gctests/{GcFreeMixedSyncAyncLoggingTest.java
 => GcFreeMixedSyncAsyncLoggingTest.java} (95%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp}/package-info.java
 (83%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/appender/package-info.java
 (77%)
 rename log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/{util 
=> internal}/JndiUtil.java (97%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jeromq/src/main/java/org/apache/logging/log4j/jeromq/appender}/package-info.java
 (82%)
 rename log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/{util => 
internal}/JndiCloser.java (97%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/lookup}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jndi/src/main/java/org/apache/logging/log4j/jndi}/package-info.java (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/selector}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jpl/src/main/java/org/apache/logging/log4j/jpl}/package-info.java (83%)
 delete mode 100644 log4j-jpl/src/main/module/module-info.java
 delete mode 100644 log4j-jpl/src/test/java/module-info.java
 delete mode 100644 log4j-jul/src/main/java/module-info.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-jul/src/main/java/org/apache/logging/log4j/jul}/package-info.java (83%)
 delete mode 100644 log4j-jul/src/test/java/module-info.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender}/package-info.java
 (83%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/package-info.java
 (77%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/parser}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/parser}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/parser}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout}/package-info.java
 (83%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-layout-template-json-test/src/main/java/org/apache/logging/log4j/layout/template/json/package-info.java
 (82%)
 delete mode 100644 log4j-layout-template-json/src/main/java/module-info.java
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/package-info.java
 (76%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/package-info.java
 (75%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/package-info.java
 (82%)
 delete mode 100644 log4j-plugin-processor/src/main/java9/module-info.java
 rename 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
 => di}/AlphaBean.java (94%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
 => di/AnotherSingletonBean.java} (83%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
 => di}/BaseBean.java (93%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
 => di}/BetaBean.java (94%)
 create mode 100644 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/ConfigurablePlugin.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/util/AuthorizationProvider.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/CustomQualifier.java
 (73%)
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/util/AuthorizationProvider.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/CustomScope.java
 (74%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/FirstCircularBean.java
 (68%)
 rename 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
 => di}/GammaBean.java (94%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
 => di/PrototypeBean.java} (83%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/PrototypeChildBean.java
 (70%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/PrototypeGrandchildBean.java
 (68%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
 => 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/SecondCircularBean.java
 (69%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
 => di/SingletonBean.java} (83%)
 copy 
{log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert 
=> 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di}/package-info.java
 (84%)
 copy 
{log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert 
=> 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation}/package-info.java
 (84%)
 delete mode 100644 log4j-plugins-test/src/main/java9/module-info.java
 copy 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/{KeysTest.java
 => CircularDependencyExceptionTest.java} (56%)
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConstructorInjectionTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/FieldInjectionTest.java
 delete mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/InjectorTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/InstanceFactoryTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/MethodInjectionTest.java
 create mode 100644 
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/QualifierInjectionTest.java
 delete mode 100644 log4j-plugins/src/main/java/module-info.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/ConditionContext.java
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{ConditionalOnProperty.java
 => ConditionalOnMissingBinding.java} (74%)
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{Condition.java
 => OnMissingBindingCondition.java} (58%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition}/package-info.java
 (82%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInjector.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java
 rename 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{DefaultScope.java
 => DuplicateBindingException.java} (74%)
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Injector.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InjectorCallback.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java
 copy 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{NotInjectableException.java
 => NoQualifiedBindingException.java} (51%)
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ReflectionAccessor.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/AbstractAttributeFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/AbstractPluginFactoryResolver.java
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BetaBean.java
 => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/GenericFactoryResolversPostProcessor.java
 (50%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/OptionalFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginAnnotationFactoryResolversPostProcessor.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginAttributeFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginBuilderAttributeFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginElementFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginNamespaceFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginValueFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/Plugins.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/SupplierFactoryResolver.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/package-info.java
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
 rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ => 
spi}/DependencyChain.java (94%)
 rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ => 
spi}/DependencyChains.java (97%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/FactoryResolver.java
 copy 
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataProvider.java
 => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/FactoryResolversPostProcessor.java
 (52%)
 rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ => 
spi}/InjectionPoint.java (77%)
 copy 
log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/InstancePostProcessor.java
 (61%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ReflectionAgent.java
 copy 
log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ReflectionException.java
 (69%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java
 rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ => 
spi}/Scope.java (77%)
 rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ => 
spi}/SingletonScope.java (93%)
 rename 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BetaBean.java
 => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/SingletonScopePostProcessor.java
 (55%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/StringValueResolver.java
 copy log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{name => 
di/spi}/package-info.java (79%)
 create mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/BindingMap.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model}/package-info.java
 (83%)
 copy 
log4j-api-test/src/main/java/org/apache/logging/log4j/test/ListStatusListener.java
 => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotatedAnnotation.java
 (51%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util}/package-info.java
 (83%)
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/NodeVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginAttributeVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginBuilderAttributeVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginElementVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginNodeVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginValueVisitor.java
 delete mode 100644 
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/package-info.java
 rename 
log4j-plugin-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
 => 
log4j-plugins/src/main/resources/META-INF/services/org.apache.logging.log4j.plugins.di.spi.ConfigurableInstanceFactoryPostProcessor
 (76%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-script/src/main/java/org/apache/logging/log4j/script/appender}/package-info.java
 (82%)
 copy {log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name => 
log4j-script/src/main/java/org/apache/logging/log4j/script/appender/rolling/action}/package-info.java
 (81%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-script/src/main/java/org/apache/logging/log4j/script/config/arbiter}/package-info.java
 (82%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-script/src/main/java/org/apache/logging/log4j/script/filter}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-script/src/main/java/org/apache/logging/log4j/script/layout}/package-info.java
 (83%)
 delete mode 100644 log4j-script/src/main/module/module-info.java
 delete mode 100644 log4j-script/src/test/java/module-info.java
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender}/package-info.java
 (83%)
 copy {log4j-api/src/main/java/org/apache/logging/log4j/message => 
log4j-smtp/src/main/java/org/apache/logging/log4j/smtp}/package-info.java (83%)
 copy {log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4 => 
log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot}/package-info.java
 (78%)
 copy 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/package-info.java
 (81%)
 delete mode 100644 log4j-to-jul/src/main/java/module-info.java
 delete mode 100644 log4j-to-jul/src/test/java/module-info.java
 rename 
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BaseBean.java
 => 
log4j-web/src/main/java/org/apache/logging/log4j/web/appender/package-info.java 
(77%)
 rename 
log4j-core-test/src/test/resources/log4j2-queueFullAsyncLoggerConfig.xml => 
src/changelog/.3.x.x/1520_Log4jPlugins_reproducibility.xml (63%)
 rename log4j-core-test/src/test/resources/log4j2-queueFull.xml => 
src/changelog/.3.x.x/LOG4J2-3496_support_injection_via_container_types.xml (57%)

Reply via email to