This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/rollback-log4j-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
omit 72d1120d46 Rollback `log4j-api` to version from `2.x`
add d31e9e41f8 Rename `log4j-sdk` to `log4j-kit`
add 1b510c25ac Rename `sdk` to `kit` also in OSGi tests
add f6825d2414 Add `PropertyEnvironment` to `log4j-sdk`
add c624e01cc4 Add support for default values
add 64ebf0ddaa Corrections due to #2307 review
add 7c09141a56 Fix environment variable names
add f1b306daa6 Make location and formatted message more lazy
add 9068465d54 Fix `log4j-1.2-api` OSGi descriptor
add 590a205df1 Fix Javadoc generation
add 79b6316312 Apply review suggestions
add e18403a619 Fix `PropertiesUtil` source
add 35c0f02012 Generalize DI usage
add c2b121dc19 Revert `ConfigurationFactory` renaming
add a75bd17047 Revert `LogEventWrapper` changes
add 68e22a7428 Revert changes to methods used by Spring Boot
add c3f4261f98 Replace `PropertiesUtil` with `PropertyEnvironment`
add 17f1336e35 Fix Javadoc
add 076fa05e4a Move `Recycler` to `log4j-kit`
add bb350df692 Update @since tag
add 960c287da5 Downgrade to `log4j-api` version `2.24.0-SNAPSHOT`
add b764fa0075 Rebase `log4j-to-jul` upon Log4j API 2.24.0
add 67b0fefa7a Rebase `log4j-to-slf4j` upon Log4j API 2.24.0
add c2a0909b3c Replace `o.a.l.l.lang` annotations with JSpecify
add cff6547762 Move `ReflectionUtil` to `log4j-plugins`
add 0ca03caebb Inline missing `String.trimToOptional`
add 5abda8ce08 Adapt `Log4jExtension` to Log4j API 2.x
add 11a0a43aa3 Adapt `log4j-plugins` to Log4j API 2.x
add 00ac582ecf Adapt `log4j-core` to Log4j API 2.x
add b867e1321d Adapt `log4j-async-logger` to Log4j API 2.x
add f5def618a5 Adapt `log4j-flume-ng` to Log4j API 2.x
add 76419ecd45 Adapt `log4j-layout-template-json` to Log4j API 2.x
add c046f76f88 Adapt `log4j-gc-test` to Log4j API 2.x
add 8772d927b7 Adapt `log4j-jdbc` to Log4j API 2.x
add 5e5e0b1ed2 Adapt `log4j-layout-template-json-test` to Log4j API 2.x
add 8c2ac517b6 Adapt `log4j-perf-test` to Log4j API 2.x
add 030e2da078 Fix OSGi configuration
new da5632a2a1 Remove Log4j API 3.x
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 (72d1120d46)
\
N -- N -- N refs/heads/fix/rollback-log4j-api (da5632a2a1)
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.
The 1 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:
log4j-1.2-api/pom.xml | 11 +-
.../org/apache/log4j/PropertyConfigurator.java | 3 +-
.../org/apache/log4j/bridge/LogEventWrapper.java | 8 +-
.../apache/log4j/config/Log4j1Configuration.java | 14 +-
.../log4j/config/PropertiesConfiguration.java | 30 +-
.../config/PropertiesConfigurationFactory.java | 28 +-
.../org/apache/log4j/helpers/OptionConverter.java | 2 +
.../org/apache/log4j/xml/XmlConfiguration.java | 8 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 28 +-
.../apache/log4j/BasicConfigurationFactory.java | 2 +-
.../org/apache/log4j/config/AutoConfigTest.java | 8 +-
.../log4j/config/MapRewriteAppenderTest.java | 5 +-
.../config/PropertiesConfigurationFactoryTest.java | 6 +-
.../PropertiesRollingWithPropertiesTest.java | 8 +-
.../apache/log4j/config/RewriteAppenderTest.java | 8 +-
.../apache/log4j/config/SyslogAppenderTest.java | 6 +-
.../log4j/config/XmlConfigurationFactoryTest.java | 5 +-
.../log4j/config/XmlRollingWithPropertiesTest.java | 8 +-
log4j-api-test/pom.xml | 168 -
.../logging/log4j/test/ListStatusListener.java | 43 -
.../org/apache/logging/log4j/test/TestLogger.java | 268 --
.../logging/log4j/test/TestLoggerContext.java | 66 -
.../log4j/test/TestLoggerContextFactory.java | 54 -
.../apache/logging/log4j/test/TestProperties.java | 44 -
.../logging/log4j/test/ThreadContextHolder.java | 78 -
.../log4j/test/ThreadContextUtilityClass.java | 118 -
.../java/org/apache/logging/log4j/test/Timer.java | 294 --
.../log4j/test/junit/AbstractFileCleaner.java | 83 -
.../logging/log4j/test/junit/ClassMatchers.java | 36 -
.../log4j/test/junit/CleanUpDirectories.java | 44 -
.../logging/log4j/test/junit/CleanUpFiles.java | 44 -
.../logging/log4j/test/junit/DirectoryCleaner.java | 74 -
.../log4j/test/junit/ExtensionContextAnchor.java | 108 -
.../logging/log4j/test/junit/FileCleaner.java | 51 -
.../log4j/test/junit/InitializesThreadContext.java | 39 -
.../test/junit/LoggerContextFactoryExtension.java | 53 -
.../apache/logging/log4j/test/junit/Resources.java | 30 -
.../logging/log4j/test/junit/SetTestProperty.java | 61 -
.../log4j/test/junit/StatusLoggerExtension.java | 200 -
.../test/junit/StatusLoggerLevelExtension.java | 48 -
.../logging/log4j/test/junit/TempLoggingDir.java | 45 -
.../log4j/test/junit/TempLoggingDirectory.java | 190 -
.../log4j/test/junit/TestPropertyResolver.java | 68 -
.../log4j/test/junit/TestPropertySource.java | 133 -
.../log4j/test/junit/ThreadContextInitializer.java | 49 -
.../test/junit/ThreadContextMapExtension.java | 44 -
.../log4j/test/junit/ThreadContextRule.java | 80 -
.../test/junit/ThreadContextStackExtension.java | 46 -
.../log4j/test/junit/ThreadContextStackRule.java | 39 -
.../log4j/test/junit/UsingAnyThreadContext.java | 38 -
.../log4j/test/junit/UsingStatusListener.java | 41 -
.../log4j/test/junit/UsingTestProperties.java | 44 -
.../log4j/test/junit/UsingThreadContextMap.java | 43 -
.../log4j/test/junit/UsingThreadContextStack.java | 40 -
.../org.apache.logging.log4j.util.PropertySource | 15 -
.../org.junit.jupiter.api.extension.Extension | 15 -
...junit.platform.launcher.LauncherSessionListener | 16 -
.../apache/logging/log4j/AbstractLoggerTest.java | 1472 ------
.../logging/log4j/CloseableThreadContextTest.java | 239 -
.../org/apache/logging/log4j/EventLoggerTest.java | 56 -
.../org/apache/logging/log4j/LambdaLoggerTest.java | 1413 ------
.../java/org/apache/logging/log4j/LevelTest.java | 284 --
.../org/apache/logging/log4j/LogManagerTest.java | 131 -
.../apache/logging/log4j/LoggerSupplierTest.java | 200 -
.../java/org/apache/logging/log4j/LoggerTest.java | 658 ---
.../java/org/apache/logging/log4j/MarkerTest.java | 109 -
.../org/apache/logging/log4j/TestProvider.java | 29 -
.../log4j/ThreadContextInheritanceTest.java | 174 -
.../org/apache/logging/log4j/TraceLoggingTest.java | 381 --
.../log4j/internal/DefaultLogBuilderTest.java | 47 -
.../internal/recycler/RecyclerFactoryTestUtil.java | 47 -
.../log4j/message/FormattedMessageTest.java | 153 -
.../apache/logging/log4j/message/JsonMessage.java | 64 -
.../log4j/message/LocalizedMessageFactoryTest.java | 116 -
.../log4j/message/LocalizedMessageTest.java | 86 -
.../logging/log4j/message/MapMessageTest.java | 330 --
.../log4j/message/MessageFormatMessageTest.java | 115 -
.../logging/log4j/message/ObjectMessageTest.java | 80 -
.../log4j/message/ParameterFormatterTest.java | 158 -
.../log4j/message/ParameterizedMessageTest.java | 145 -
.../log4j/message/ReusableMessageFactoryTest.java | 136 -
.../log4j/message/ReusableObjectMessageTest.java | 124 -
.../message/ReusableParameterizedMessageTest.java | 178 -
.../log4j/message/ReusableSimpleMessageTest.java | 124 -
.../logging/log4j/message/SimpleMessageTest.java | 40 -
.../log4j/message/StringFormattedMessageTest.java | 132 -
.../log4j/message/StructuredDataMessageTest.java | 125 -
.../log4j/message/ThreadDumpMessageTest.java | 166 -
.../logging/log4j/simple/SimpleLoggerTest.java | 69 -
.../log4j/spi/DefaultThreadContextStackTest.java | 342 --
.../logging/log4j/spi/LoggerAdapterTest.java | 187 -
.../log4j/spi/MutableThreadContextStackTest.java | 371 --
.../log4j/status/StatusConsoleListenerTest.java | 147 -
.../apache/logging/log4j/test/BetterService.java | 19 -
.../org/apache/logging/log4j/test/Service2.java | 19 -
.../logging/log4j/test/ThreadContextTest.java | 184 -
.../log4j/test/junit/TempLoggingDirectoryTest.java | 45 -
.../log4j/test/junit/TestPropertySourceTest.java | 57 -
.../org/apache/logging/log4j/util/AssertTest.java | 53 -
.../org/apache/logging/log4j/util/CharsTest.java | 46 -
.../apache/logging/log4j/util/ConstantsTest.java | 32 -
.../logging/log4j/util/DeserializerHelper.java | 48 -
.../log4j/util/EnvironmentPropertySourceTest.java | 47 -
.../apache/logging/log4j/util/LambdaUtilTest.java | 117 -
.../org/apache/logging/log4j/util/LazyTest.java | 187 -
.../util/LegacyPropertiesCompatibilityTest.java | 82 -
.../log4j/util/Log4jCharsetsPropertiesTest.java | 47 -
.../log4j/util/PropertiesPropertySourceTest.java | 47 -
.../log4j/util/PropertiesUtilOrderTest.java | 146 -
.../logging/log4j/util/PropertiesUtilTest.java | 228 -
.../log4j/util/PropertySourceCamelCaseTest.java | 43 -
.../log4j/util/PropertySourceTokenizerTest.java | 61 -
.../logging/log4j/util/ProviderUtilTest.java | 51 -
.../logging/log4j/util/ServiceLoaderUtilTest.java | 70 -
.../log4j/util/SortedArrayStringMapTest.java | 993 ----
.../logging/log4j/util/StackLocatorUtilTest.java | 169 -
.../logging/log4j/util/StringBuildersTest.java | 93 -
.../org/apache/logging/log4j/util/StringsTest.java | 89 -
.../logging/log4j/util/SystemPropertiesMain.java | 48 -
.../util/SystemPropertiesPropertySourceTest.java | 68 -
.../org/apache/logging/log4j/util/Unbox1Test.java | 187 -
.../logging/log4j/util/Unbox2ConfigurableTest.java | 81 -
.../src/test/resources/Jira3413Test.properties | 34 -
.../src/test/resources/META-INF/log4j2.my-app.json | 16 -
.../services/org.apache.logging.log4j.spi.Provider | 1 -
.../org.apache.logging.log4j.test.BetterService | 16 -
.../services/org.apache.logging.log4j.test.Service | 31 -
.../src/test/resources/MF_en_US.properties | 19 -
log4j-api-test/src/test/resources/MF_fr.properties | 19 -
.../src/test/resources/MF_fr_CH.properties | 18 -
.../resources/PropertiesUtilOrderTest.properties | 26 -
.../src/test/resources/PropertiesUtilTest.json | 25 -
.../test/resources/PropertiesUtilTest.properties | 32 -
.../src/test/resources/SF_en_US.properties | 19 -
log4j-api-test/src/test/resources/SF_fr.properties | 19 -
.../src/test/resources/SF_fr_CH.properties | 18 -
.../src/test/resources/log4j2.my-app.json | 16 -
.../src/test/resources/log4j2.propertyMapping.json | 96 -
.../src/test/resources/log4j2.system.properties | 17 -
.../logging/log4j/test/ForceLinkageError.class | 0
log4j-api/pom.xml | 63 -
.../java/org/apache/logging/log4j/BridgeAware.java | 33 -
.../logging/log4j/CloseableThreadContext.java | 227 -
.../java/org/apache/logging/log4j/EventLogger.java | 58 -
.../main/java/org/apache/logging/log4j/Level.java | 374 --
.../java/org/apache/logging/log4j/LogBuilder.java | 299 --
.../java/org/apache/logging/log4j/LogManager.java | 658 ---
.../main/java/org/apache/logging/log4j/Logger.java | 4774 --------------------
.../org/apache/logging/log4j/LoggingException.java | 56 -
.../main/java/org/apache/logging/log4j/Marker.java | 113 -
.../org/apache/logging/log4j/MarkerManager.java | 413 --
.../org/apache/logging/log4j/ThreadContext.java | 626 ---
.../log4j/internal/CopyOnWriteNavigableSet.java | 269 --
.../logging/log4j/internal/DefaultLogBuilder.java | 398 --
.../log4j/internal/DefaultObjectInputFilter.java | 92 -
.../org/apache/logging/log4j/lang/NonNull.java | 35 -
.../org/apache/logging/log4j/lang/NullMarked.java | 36 -
.../apache/logging/log4j/lang/NullUnmarked.java | 37 -
.../org/apache/logging/log4j/lang/Nullable.java | 36 -
.../apache/logging/log4j/lang/package-info.java | 28 -
.../log4j/message/AbstractMessageFactory.java | 190 -
.../log4j/message/AsynchronouslyFormattable.java | 59 -
.../log4j/message/BasicThreadInformation.java | 106 -
.../apache/logging/log4j/message/Clearable.java | 31 -
.../log4j/message/DefaultFlowMessageFactory.java | 261 --
.../logging/log4j/message/FlowMessageFactory.java | 87 -
.../logging/log4j/message/FormattedMessage.java | 237 -
.../log4j/message/FormattedMessageFactory.java | 176 -
.../logging/log4j/message/LocalizedMessage.java | 260 --
.../log4j/message/LocalizedMessageFactory.java | 92 -
.../log4j/message/LoggerNameAwareMessage.java | 34 -
.../apache/logging/log4j/message/MapMessage.java | 756 ----
.../log4j/message/MapMessageJsonFormatter.java | 394 --
.../org/apache/logging/log4j/message/Message.java | 97 -
.../log4j/message/MessageCollectionMessage.java | 23 -
.../logging/log4j/message/MessageFactory.java | 281 --
.../logging/log4j/message/MessageFactory2.java | 200 -
.../log4j/message/MessageFormatMessage.java | 142 -
.../log4j/message/MessageFormatMessageFactory.java | 177 -
.../logging/log4j/message/MultiformatMessage.java | 42 -
.../logging/log4j/message/ObjectArrayMessage.java | 118 -
.../logging/log4j/message/ObjectMessage.java | 128 -
.../logging/log4j/message/ParameterConsumer.java | 41 -
.../logging/log4j/message/ParameterFormatter.java | 624 ---
.../logging/log4j/message/ParameterVisitable.java | 45 -
.../log4j/message/ParameterizedMessage.java | 302 --
.../log4j/message/ParameterizedMessageFactory.java | 192 -
.../ParameterizedNoReferenceMessageFactory.java | 105 -
.../logging/log4j/message/ReusableMessage.java | 81 -
.../log4j/message/ReusableObjectMessage.java | 137 -
.../message/ReusableParameterizedMessage.java | 391 --
.../log4j/message/ReusableSimpleMessage.java | 111 -
.../logging/log4j/message/SimpleMessage.java | 144 -
.../log4j/message/SimpleMessageFactory.java | 191 -
.../log4j/message/StringFormattedMessage.java | 152 -
.../message/StringFormatterMessageFactory.java | 189 -
.../logging/log4j/message/StringMapMessage.java | 67 -
.../message/StructuredDataCollectionMessage.java | 100 -
.../logging/log4j/message/StructuredDataId.java | 268 --
.../log4j/message/StructuredDataMessage.java | 518 ---
.../logging/log4j/message/ThreadDumpMessage.java | 143 -
.../logging/log4j/message/ThreadInformation.java | 36 -
.../logging/log4j/message/TimestampMessage.java | 29 -
.../org/apache/logging/log4j/package-info.java | 44 -
.../apache/logging/log4j/simple/SimpleLogger.java | 330 --
.../log4j/simple/SimpleLoggerConfiguration.java | 80 -
.../logging/log4j/simple/SimpleLoggerContext.java | 130 -
.../log4j/simple/SimpleLoggerContextFactory.java | 59 -
.../apache/logging/log4j/simple/package-info.java | 27 -
.../apache/logging/log4j/spi/AbstractLogger.java | 3848 ----------------
.../logging/log4j/spi/AbstractLoggerAdapter.java | 149 -
.../log4j/spi/CleanableThreadContextMap.java | 38 -
.../org/apache/logging/log4j/spi/CopyOnWrite.java | 25 -
.../CopyOnWriteSortedArrayThreadContextMap.java | 266 --
.../logging/log4j/spi/DefaultThreadContextMap.java | 239 -
.../log4j/spi/DefaultThreadContextStack.java | 319 --
.../apache/logging/log4j/spi/ExtendedLogger.java | 668 ---
.../logging/log4j/spi/ExtendedLoggerWrapper.java | 281 --
.../GarbageFreeSortedArrayThreadContextMap.java | 255 --
.../apache/logging/log4j/spi/LoggerAdapter.java | 38 -
.../apache/logging/log4j/spi/LoggerContext.java | 189 -
.../logging/log4j/spi/LoggerContextFactory.java | 123 -
.../log4j/spi/LoggerContextShutdownAware.java | 26 -
.../apache/logging/log4j/spi/LoggerRegistry.java | 188 -
.../apache/logging/log4j/spi/LoggingSystem.java | 368 --
.../logging/log4j/spi/LoggingSystemProperty.java | 490 --
.../logging/log4j/spi/MessageFactory2Adapter.java | 157 -
.../log4j/spi/MutableThreadContextStack.java | 255 --
.../logging/log4j/spi/NoOpThreadContextMap.java | 62 -
.../logging/log4j/spi/ObjectThreadContextMap.java | 53 -
.../logging/log4j/spi/PropertyComponent.java | 87 -
.../org/apache/logging/log4j/spi/Provider.java | 245 -
.../log4j/spi/ReadOnlyThreadContextMap.java | 95 -
.../apache/logging/log4j/spi/StandardLevel.java | 103 -
.../org/apache/logging/log4j/spi/Terminable.java | 32 -
.../apache/logging/log4j/spi/ThreadContextMap.java | 88 -
.../logging/log4j/spi/ThreadContextMap2.java | 52 -
.../logging/log4j/spi/ThreadContextMapFactory.java | 145 -
.../logging/log4j/spi/ThreadContextStack.java | 26 -
.../spi/recycler/RecyclerFactoryRegistry.java | 119 -
.../logging/log4j/spi/recycler/package-info.java | 26 -
.../log4j/status/StatusConsoleListener.java | 132 -
.../apache/logging/log4j/status/StatusData.java | 158 -
.../logging/log4j/status/StatusListener.java | 39 -
.../apache/logging/log4j/status/StatusLogger.java | 435 --
.../log4j/status/StatusLoggerConfiguration.java | 58 -
.../logging/log4j/status/StatusLoggerFactory.java | 54 -
.../apache/logging/log4j/status/package-info.java | 26 -
.../org/apache/logging/log4j/util/BiConsumer.java | 39 -
.../java/org/apache/logging/log4j/util/Cast.java | 40 -
.../java/org/apache/logging/log4j/util/Chars.java | 88 -
.../org/apache/logging/log4j/util/Constants.java | 145 -
.../log4j/util/ContextAwarePropertySource.java | 195 -
.../apache/logging/log4j/util/EnglishEnums.java | 71 -
.../log4j/util/EnvironmentPropertySource.java | 71 -
.../log4j/util/FilteredObjectInputStream.java | 94 -
.../log4j/util/IndexedReadOnlyStringMap.java | 64 -
.../logging/log4j/util/IndexedStringMap.java | 34 -
.../org/apache/logging/log4j/util/InternalApi.java | 31 -
.../org/apache/logging/log4j/util/LambdaUtil.java | 95 -
.../java/org/apache/logging/log4j/util/Lazy.java | 95 -
.../org/apache/logging/log4j/util/LazyBoolean.java | 66 -
.../org/apache/logging/log4j/util/LazyUtil.java | 214 -
.../org/apache/logging/log4j/util/LoaderUtil.java | 612 ---
.../apache/logging/log4j/util/LowLevelLogUtil.java | 145 -
.../apache/logging/log4j/util/MessageSupplier.java | 44 -
.../util/MultiFormatStringBuilderFormattable.java | 40 -
.../org/apache/logging/log4j/util/NameUtil.java | 76 -
.../logging/log4j/util/PerformanceSensitive.java | 39 -
.../log4j/util/PropertiesPropertySource.java | 92 -
.../apache/logging/log4j/util/PropertiesUtil.java | 1023 -----
.../logging/log4j/util/PropertyEnvironment.java | 445 --
.../log4j/util/PropertyFilePropertySource.java | 54 -
.../apache/logging/log4j/util/PropertySource.java | 257 --
.../logging/log4j/util/ProviderActivator.java | 53 -
.../apache/logging/log4j/util/ProviderUtil.java | 178 -
.../logging/log4j/util/ReadOnlyStringMap.java | 109 -
.../logging/log4j/util/ServiceLoaderUtil.java | 87 -
.../logging/log4j/util/SortedArrayStringMap.java | 473 --
.../apache/logging/log4j/util/StackLocator.java | 127 -
.../logging/log4j/util/StackLocatorUtil.java | 129 -
.../apache/logging/log4j/util/StringBuilders.java | 383 --
.../org/apache/logging/log4j/util/StringMap.java | 102 -
.../org/apache/logging/log4j/util/Strings.java | 323 --
.../org/apache/logging/log4j/util/Supplier.java | 44 -
.../log4j/util/SystemPropertiesPropertySource.java | 154 -
.../org/apache/logging/log4j/util/TimeUnit.java | 58 -
.../org/apache/logging/log4j/util/TriConsumer.java | 39 -
.../java/org/apache/logging/log4j/util/Unbox.java | 236 -
.../apache/logging/log4j/util/package-info.java | 27 -
.../src/main/resources/Log4j-charsets.properties | 50 -
.../src/main/resources/log4j2.propertyMapping.json | 64 -
.../logging/log4j/async/logger/AsyncLogger.java | 128 +-
.../log4j/async/logger/AsyncLoggerConfig.java | 74 +-
.../async/logger/AsyncLoggerConfigDelegate.java | 10 -
.../async/logger/AsyncLoggerConfigDisruptor.java | 116 +-
.../log4j/async/logger/AsyncLoggerContext.java | 106 +-
.../async/logger/AsyncLoggerContextSelector.java | 6 +-
.../log4j/async/logger/AsyncLoggerDisruptor.java | 34 +-
.../log4j/async/logger/AsyncLoggerKeys.java | 75 +
.../async/logger/AsyncWaitStrategyFactory.java | 9 +-
.../logger/BasicAsyncLoggerContextSelector.java | 8 +-
.../logger/DefaultAsyncWaitStrategyFactory.java | 85 -
.../log4j/async/logger/DisruptorConfiguration.java | 63 +-
.../logging/log4j/async/logger/DisruptorUtil.java | 128 -
.../log4j/async/logger/RingBufferLogEvent.java | 6 +
.../async/logger/RingBufferLogEventTranslator.java | 87 +-
.../internal/DefaultAsyncWaitStrategyFactory.java | 75 +
.../log4j/async/logger/internal/DefaultBundle.java | 73 +
.../log4j/async/logger/internal/DisruptorUtil.java | 94 +
.../internal/InstanceFactoryPostProcessor.java | 13 +-
.../TimeoutBlockingWaitStrategy.java | 5 +-
.../logger/AsyncLoggerClassLoadDeadlockTest.java | 2 +-
.../logger/AsyncLoggerConfigAutoFlushTest.java | 13 +-
.../logger/AsyncLoggerConfigErrorOnFormat.java | 8 +-
.../log4j/async/logger/AsyncLoggerConfigTest.java | 3 +-
.../log4j/async/logger/AsyncLoggerContextTest.java | 13 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 4 +-
.../AsyncLoggerEventTranslationExceptionTest.java | 10 +-
.../AsyncLoggerTestArgumentFreedOnErrorTest.java | 8 +-
.../log4j/async/logger/AsyncThreadContextTest.java | 18 +-
.../async/logger/DefaultIncludeLocationTest.java | 9 +-
.../logger/DisruptorConfigurationInvalidTest.java | 1 +
.../async/logger/DisruptorConfigurationTest.java | 7 +-
.../async/logger/QueueFullAsyncAbstractTest.java | 8 +-
.../async/logger/QueueFullAsyncLogger2Test.java | 4 +-
.../async/logger/QueueFullAsyncLogger3Test.java | 9 +-
.../logger/QueueFullAsyncLoggerConfig2Test.java | 4 +-
...lAsyncLoggerConfigLoggingFromToString2Test.java | 4 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 8 +-
.../logger/QueueFullAsyncLoggerConfigTest.java | 4 +-
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 4 +-
.../async/logger/QueueFullAsyncLoggerTest.java | 4 +-
.../log4j/async/logger/RingBufferLogEventTest.java | 11 +-
.../config/properties/JavaPropsConfiguration.java | 7 +-
.../properties/JavaPropsConfigurationFactory.java | 2 +-
.../log4j/config/yaml/YamlConfiguration.java | 1 +
.../config/yaml/YamlConfigurationFactory.java | 2 +-
.../log4j/core/test/BasicConfigurationFactory.java | 19 +-
.../logging/log4j/core/test/TestConstants.java | 127 +
.../config/AbstractNestedLoggerConfigTest.java | 7 +-
.../test/junit/AbstractExternalFileCleaner.java | 2 +-
.../logging/log4j/core}/test/junit/CleanFiles.java | 2 +-
.../log4j/core}/test/junit/CleanFolders.java | 2 +-
.../core/test/junit/ConfigurationFactoryType.java | 3 +-
.../log4j/core/test/junit/Log4jExtension.java | 74 +-
.../log4j/core/test/junit/LoggerContextRule.java | 2 -
.../logging/log4j/core/test/junit/Named.java | 6 +-
.../log4j/core/test/layout/Log4j2_1482_Test.java | 2 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 8 +-
.../apache/logging/log4j/core/Log4j1222Test.java | 6 +-
.../logging/log4j/core/LoggerContextTest.java | 46 -
.../org/apache/logging/log4j/core/LoggerTest.java | 31 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 6 +-
.../core/appender/OutputStreamManagerTest.java | 3 +
.../core/appender/ReconfigureAppenderTest.java | 8 +-
.../appender/rolling/RollingAppenderCronTest.java | 5 +-
.../RollingAppenderDirectWriteStartupSizeTest.java | 2 +-
...llingAppenderDirectWriteWithHtmlLayoutTest.java | 2 +-
.../RollingFileAppenderInterruptedThreadTest.java | 2 +-
.../rolling/action/AbstractActionTest.java | 7 +-
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 15 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 99 +-
.../logging/log4j/core/config/AdvertiserTest.java | 6 +-
.../config/CompositeConfigurationMissingTest.java | 8 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 5 +-
.../LoggerContextAwarePostProcessorTest.java | 5 +-
.../log4j/core/config/LoggersPluginTest.java | 5 +-
.../log4j/core/config/ReliabilityStrategyTest.java | 8 +-
.../log4j/core/config/TestConfigurator.java | 6 +-
.../log4j/core/config/TestConfiguratorError.java | 4 +-
.../ValidatingPluginWithFailoverTest.java | 24 +-
.../core/config/xml/XmlConfigurationPropsTest.java | 8 +-
.../filter/MutableThreadContextMapFilterTest.java | 11 +-
...taFactoryPropertySetMissingConstructorTest.java | 17 +-
.../impl/ContextDataFactoryPropertySetTest.java | 7 +-
.../log4j/core/impl/ContextDataFactoryTest.java | 6 +-
.../log4j/core/impl/MutableLogEventTest.java | 6 +-
.../logging/log4j/core/impl/TestPropertyKeys.java | 10 +-
.../core/impl/ThreadContextDataInjectorTest.java | 92 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 12 +-
.../log4j/core/lookup/InterpolatorTest.java | 14 +-
.../logging/log4j/core/lookup/MainLookupTest.java | 3 +-
.../log4j/core/lookup/StrSubstitutorTest.java | 77 +-
.../log4j/core/net/UrlConnectionFactoryTest.java | 18 +-
.../core/net/ssl/FilePasswordProviderTest.java | 11 +-
.../core/net/ssl/SslConfigurationFactoryTest.java | 44 +-
.../log4j/core/pattern/PatternParserTest2.java | 6 +-
.../log4j/core/pattern/StyleConverterTest.java | 15 +-
.../selector/ClassLoaderContextSelectorTest.java | 2 +-
.../log4j/core/tools/GenerateCustomLoggerTest.java | 4 +-
.../core/tools/GenerateExtendedLoggerTest.java | 4 +-
.../log4j/core/util/ContextDataProviderTest.java | 4 +-
.../logging/log4j/core/util/JsonUtilsTest.java | 68 -
.../util/NamedLoggerContextPropertiesTest.java | 12 +-
.../core/util/ShutdownCallbackRegistryTest.java | 3 +
.../logging/log4j/core/util/WatchHttpTest.java | 9 +-
.../logging/log4j/core/util/WatchManagerTest.java | 7 +-
.../MutableThreadContextMapFilterTest.xml | 3 +-
log4j-core/pom.xml | 9 +-
.../logging/log4j/core/AbstractLogEvent.java | 6 +
.../org/apache/logging/log4j/core/LogEvent.java | 29 +-
.../java/org/apache/logging/log4j/core/Logger.java | 79 +-
.../apache/logging/log4j/core/LoggerContext.java | 343 +-
.../core/annotation/OnPropertyKeyCondition.java | 51 -
.../log4j/core/annotation/package-info.java | 22 -
.../logging/log4j/core/appender/AsyncAppender.java | 8 +-
.../log4j/core/appender/ConsoleAppender.java | 40 +-
.../core/appender/MemoryMappedFileManager.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 6 +-
.../core/appender/rewrite/RewriteAppender.java | 3 +-
.../appender/rolling/DefaultRolloverStrategy.java | 2 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 26 +-
.../log4j/core/async/InternalAsyncUtil.java | 34 +
.../log4j/core/config/AbstractConfiguration.java | 116 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 12 +-
.../logging/log4j/core/config/Configuration.java | 12 +-
.../config/ConfigurationAwarePostProcessor.java | 2 +-
.../log4j/core/config/ConfigurationFactory.java | 76 +-
.../log4j/core/config/ConfigurationScheduler.java | 5 +-
.../log4j/core/config/ConfigurationSource.java | 10 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 17 +-
.../core/config/DefaultConfigurationFactory.java | 146 +-
.../logging/log4j/core/config/HttpWatcher.java | 4 +-
.../logging/log4j/core/config/LoggerConfig.java | 179 +-
.../config/LoggerContextAwarePostProcessor.java | 2 +-
.../log4j/core/config/NullConfiguration.java | 11 +-
.../core/config/ReliabilityStrategyFactory.java | 13 +-
.../log4j/core/config/URIConfigurationFactory.java | 86 +
.../config/builder/impl/BuiltConfiguration.java | 16 +-
.../config/composite/CompositeConfiguration.java | 14 +-
.../log4j/core/config/json/JsonConfiguration.java | 2 +-
.../util/LegacyPluginAttributeFactoryResolver.java | 2 +-
...egacyPluginBuilderAttributeFactoryResolver.java | 2 +-
.../plugins/util/PluginAttributeNameProvider.java | 6 +-
.../util/PluginBuilderAttributeNameProvider.java | 6 +-
.../plugins/util/PluginElementNameProvider.java | 6 +-
.../plugins/util/PluginValueNameProvider.java | 6 +-
.../core/config/plugins/util/package-info.java | 2 +-
.../log4j/core/config/xml/XmlConfiguration.java | 19 +-
.../core/config/xml/XmlConfigurationFactory.java | 2 +-
.../core/filter/MutableThreadContextMapFilter.java | 8 +-
.../log4j/core/filter/StructuredDataFilter.java | 4 +-
.../log4j/core/impl/ContextDataFactory.java | 23 +-
.../core/impl/ContextDataInjectorFactory.java | 13 +-
.../apache/logging/log4j/core/impl/CoreKeys.java | 221 +
.../logging/log4j/core/impl/DefaultBundle.java | 102 +-
.../log4j/core/impl/Log4jContextFactory.java | 121 +-
.../impl/Log4jInstanceFactoryPostProcessor.java | 68 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 23 +-
.../logging/log4j/core/impl/Log4jPropertyKey.java | 457 --
.../logging/log4j/core/impl/Log4jProvider.java | 48 +-
.../logging/log4j/core/impl/MementoLogEvent.java | 79 +-
.../logging/log4j/core/impl/MutableLogEvent.java | 46 +-
.../log4j/core/impl/ReusableLogEventFactory.java | 4 +-
.../log4j/core/impl/SystemPropertyBundle.java | 110 -
.../log4j/core/impl/ThreadContextDataInjector.java | 12 +-
.../log4j/core/impl/internal/Activator.java | 17 +-
.../core/impl/internal/InternalLoggerContext.java | 311 --
.../impl/internal}/ReusableMessageFactory.java | 99 +-
.../log4j/core/layout/AbstractStringLayout.java | 13 +-
.../logging/log4j/core/layout/HtmlLayout.java | 10 -
.../logging/log4j/core/layout/PatternLayout.java | 18 +-
.../log4j/core/layout/StringBuilderEncoder.java | 2 +-
.../logging/log4j/core/lookup/Interpolator.java | 47 +-
.../log4j/core/net/UrlConnectionFactory.java | 11 +-
.../log4j/core/net/ssl/FilePasswordProvider.java | 9 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 15 +-
.../core/net/ssl/SslConfigurationFactory.java | 85 +-
.../core/net/ssl/TrustStoreConfiguration.java | 17 +-
.../log4j/core/pattern/DatePatternConverter.java | 2 +-
.../logging/log4j/core/pattern/PatternParser.java | 1 +
.../core/selector/AbstractContextSelector.java | 35 +-
.../log4j/core/selector/BasicContextSelector.java | 8 +-
.../core/selector/ClassLoaderContextSelector.java | 34 +-
.../logging/log4j/core/time/ClockFactory.java | 12 +-
.../log4j/core/time/internal/SystemClock.java | 10 +-
.../apache/logging/log4j/core/tools/Generate.java | 8 +-
.../log4j/core/util/AuthorizationProvider.java | 23 +-
.../core/util/BasicAuthorizationProvider.java | 23 +-
.../apache/logging/log4j/core/util/Constants.java | 77 +-
.../apache/logging/log4j/core/util/JsonUtils.java | 117 -
.../org/apache/logging/log4j/core/util/Loader.java | 11 +-
.../logging/log4j/core/util/OptionConverter.java | 4 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 8 +-
.../logging/log4j/core/util/WatchManager.java | 9 +-
.../core/util/internal/HttpInputStreamUtil.java | 2 +-
.../log4j/csv/layout/CsvLogEventLayout.java | 2 +-
.../log4j/csv/layout/CsvParameterLayout.java | 2 +-
.../csv/layout/CsvParameterLayoutAllAsyncTest.java | 15 +-
.../apache/logging/log4j/docker/DockerLookup.java | 5 +-
.../log4j/flume/appender/FlumeAppender.java | 9 +-
.../log4j/flume/appender/FlumeEmbeddedManager.java | 32 +-
.../logging/log4j/flume/appender/FlumeEvent.java | 6 +
.../log4j/flume/appender/FlumeAppenderTest.java | 28 +-
.../flume/appender/FlumeEmbeddedAgentTest.java | 6 +-
.../flume/appender/FlumeEmbeddedAppenderTest.java | 6 +-
.../appender/FlumePersistentAppenderTest.java | 6 +-
.../log4j/flume/appender/FlumePersistentPerf.java | 6 +-
log4j-gc-test/pom.xml | 5 +
.../log4j/gctests/GcFreeAsyncLoggingTest.java | 16 +-
.../log4j/gctests/GcFreeLoggingTestUtil.java | 31 +-
.../gctests/GcFreeMixedSyncAsyncLoggingTest.java | 4 +-
.../gctests/GcFreeSynchronousLoggingTest.java | 4 +-
.../gctests/JsonTemplateLayoutGcFreeTest.java | 4 +-
.../jctools/JCToolsRecyclerFactoryProvider.java | 21 +-
.../JCToolsRecyclerFactoryProviderTest.java | 12 +-
...ing.log4j.kit.recycler.RecyclerFactoryProvider} | 0
.../jdbc/appender/DataSourceConnectionSource.java | 3 +-
.../logging/log4j/jdbc/appender/JdbcAppender.java | 2 +-
.../log4j/jdbc/appender/internal/JndiUtil.java | 4 +
.../AbstractJdbcAppenderDataSourceTest.java | 3 +-
.../appender/DataSourceConnectionSourceTest.java | 3 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 3 +-
.../routing/RoutingAppenderWithJndiTest.java | 3 +-
.../log4j/jndi/lookup/InterpolatorTest.java | 32 +-
.../logging/log4j/jndi/lookup/JndiLookupTest.java | 3 +-
.../jndi/lookup/JndiRestrictedLookupTest.java | 3 +-
.../org/apache/logging/log4j/jndi/JNDIKeys.java | 16 +-
.../org/apache/logging/log4j/jndi/JndiManager.java | 12 +-
.../logging/log4j/jndi/lookup/JndiLookup.java | 3 +-
.../log4j/jndi/selector/JndiContextSelector.java | 21 +-
log4j-jul/pom.xml | 2 +-
.../java/org/apache/logging/log4j/jul/JulKeys.java | 16 +-
.../apache/logging/log4j/jul/JulPropertyKey.java | 72 -
.../apache/logging/log4j/jul/LevelConverter.java | 2 +-
.../apache/logging/log4j/jul/LevelTranslator.java | 12 +-
.../org/apache/logging/log4j/jul/LogManager.java | 15 +-
.../logging/log4j/jul/test/ApiLoggerTest.java | 9 +-
.../log4j/jul/test/AsyncLoggerThreadsTest.java | 12 +-
.../apache/logging/log4j/jul/test/JulTestKeys.java | 14 +-
{log4j-sdk => log4j-kit}/pom.xml | 30 +-
.../logging/log4j/kit/env/Log4jProperty.java | 36 +-
.../logging/log4j/kit/env/PropertyEnvironment.java | 187 +
.../logging/log4j/kit/env/PropertySource.java | 30 +-
.../ContextualEnvironmentPropertySource.java | 80 +
.../ContextualJavaPropsPropertySource.java | 65 +
.../PropertiesUtilPropertyEnvironment.java | 51 +
.../log4j/kit/env/internal/package-info.java | 9 +-
.../apache/logging/log4j/kit/env/package-info.java | 9 +-
.../kit/env/support/BasicPropertyEnvironment.java | 337 ++
.../support/ClassLoaderPropertyEnvironment.java | 23 +-
.../env/support/CompositePropertyEnvironment.java | 69 +
.../log4j/kit/env/support/package-info.java | 9 +-
.../apache/logging/log4j/kit/json}/JsonReader.java | 2 +-
.../logging/log4j/kit/json}/package-info.java | 2 +-
.../logging/log4j/kit}/logger/AbstractLogger.java | 145 +-
.../kit}/logger/internal/DefaultLogBuilder.java | 6 +-
.../logging/log4j/kit/logger}/package-info.java | 2 +-
.../log4j/kit/message/RecyclingMessageFactory.java | 29 +-
.../logging/log4j/kit/message}/package-info.java | 2 +-
.../logging/log4j/kit}/recycler/Recycler.java | 2 +-
.../logging/log4j/kit}/recycler/RecyclerAware.java | 5 +-
.../log4j/kit}/recycler/RecyclerFactory.java | 2 +-
.../kit}/recycler/RecyclerFactoryProvider.java | 11 +-
.../logging/log4j/kit/recycler/RecyclerKeys.java | 25 +-
.../log4j/kit/recycler/internal}/ArrayQueue.java | 2 +-
.../internal}/DummyRecyclerFactoryProvider.java | 14 +-
.../internal}/QueueingRecyclerFactoryProvider.java | 17 +-
.../ThreadLocalRecyclerFactoryProvider.java | 35 +-
.../logging/log4j/kit/recycler}/package-info.java | 2 +-
.../kit/recycler/support}/AbstractRecycler.java | 10 +-
.../log4j/kit/recycler/support}/package-info.java | 5 +-
.../log4j/kit/env/TestPropertyEnvironment.java | 24 +-
.../env/internal/AbstractPropertyNamesTest.java | 42 +
.../ContextualEnvironmentPropertySourceTest.java | 31 +-
.../ContextualJavaPropsPropertySourceTest.java | 28 +-
.../PropertiesUtilPropertyEnvironmentTest.java | 51 +
.../env/support/BasicPropertyEnvironmentTest.java | 224 +
.../logging/log4j/kit/json}/JsonReaderTest.java | 3 +-
.../log4j/kit}/logger/AbstractLoggerTest.java | 18 +-
.../logging/log4j/kit/logger/TestListLogger.java | 73 +
.../kit/recycler/internal}/ArrayQueueTest.java | 2 +-
.../internal}/RecyclerFactoryRegistryTest.java | 25 +-
.../recycler/internal/RecyclerFactoryTestUtil.java | 51 +
.../ThreadLocalRecyclerFactoryProviderTest.java | 19 +-
.../kubernetes/KubernetesClientProperties.java | 71 +-
.../JsonTemplateLayoutAdditionalFieldTest.java | 2 +-
.../log4j/layout/template/json/TestHelpers.java | 2 +-
.../json/resolver/CounterResolverTest.java | 2 +-
.../json/resolver/MessageResolverTest.java | 2 +-
.../layout/template/json/JsonTemplateLayout.java | 2 +-
.../template/json/JsonTemplateLayoutDefaults.java | 5 +-
.../json/resolver/CaseConverterResolver.java | 2 +-
.../template/json/resolver/CounterResolver.java | 2 +-
.../resolver/EventAdditionalFieldInterceptor.java | 2 +-
.../json/resolver/MessageParameterResolver.java | 2 +-
.../json/resolver/ReadOnlyStringMapResolver.java | 4 +-
.../json/resolver/StackTraceStringResolver.java | 4 +-
.../template/json/resolver/TemplateResolvers.java | 2 +-
.../log4j/osgi/tests/AbstractLoadBundleTest.java | 34 +-
.../logging/log4j/osgi/tests/CoreOsgiTest.java | 2 +-
.../osgi/tests/CustomConfigurationFactory.java | 2 +-
log4j-perf-test/pom.xml | 4 +
.../json/JsonTemplateLayoutBenchmarkReport.java | 2 +-
.../log4j/perf/jmh/AsyncLoggersBenchmark.java | 10 +-
.../jmh/ConcurrentAsyncLoggerToFileBenchmark.java | 22 +-
.../perf/jmh/FileAppenderThrowableBenchmark.java | 15 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 6 +-
.../log4j/perf/jmh/ThreadContextBenchmark.java | 6 +-
.../CopyOnWriteOpenHashMapThreadContextMap.java | 8 +-
.../GarbageFreeOpenHashMapThreadContextMap.java | 8 +-
.../condition/OnPresentBindingsConditionTest.java | 71 +
.../plugins/condition/OnPropertyConditionTest.java | 8 +-
.../log4j/plugins/util/AnnotationUtilTest.java | 1 +
log4j-plugins/pom.xml | 9 +-
.../org/apache/logging/log4j/plugins/Ordered.java | 3 +-
.../log4j/plugins/condition/ConditionContext.java | 5 +-
.../condition/ConditionalOnPresentBindings.java | 18 +-
.../condition/OnPresentBindingsCondition.java | 28 +-
.../plugins/condition/OnPropertyCondition.java | 2 +-
.../plugins/di/ConfigurableInstanceFactory.java | 18 +-
.../org/apache/logging/log4j/plugins/di/DI.java | 8 +-
.../log4j/plugins/di/DefaultInstanceFactory.java | 45 +-
.../org/apache/logging/log4j/plugins/di/Key.java | 4 +-
.../org/apache/logging/log4j/plugins/di/Keys.java | 6 +-
.../logging/log4j/plugins/di/package-info.java | 2 +-
.../resolver/AbstractAttributeFactoryResolver.java | 2 +-
.../di/resolver/OptionalFactoryResolver.java | 2 +-
.../resolver/PluginAttributeFactoryResolver.java | 2 +-
.../PluginBuilderAttributeFactoryResolver.java | 2 +-
.../di/resolver/PluginElementFactoryResolver.java | 2 +-
.../log4j/plugins/di/resolver/package-info.java | 2 +-
.../log4j/plugins/di/spi/DependencyChains.java | 2 +-
.../log4j/plugins/di/spi/ReflectionAgent.java | 4 +-
.../logging/log4j/plugins/di/spi/package-info.java | 2 +-
.../{ => internal}/util/AnnotatedAnnotation.java | 2 +-
.../{ => internal}/util/AnnotationUtil.java | 6 +-
.../log4j/plugins/internal/util/BeanUtils.java | 1 -
.../log4j/plugins/internal/util/BindingMap.java | 2 +-
.../plugins/internal/util/DefaultBindingMap.java | 2 +-
.../log4j/plugins/model/PluginRegistry.java | 67 +-
.../logging/log4j/plugins/model/PluginType.java | 3 +-
.../log4j/plugins/name/CategoryNameProvider.java | 6 +-
.../plugins/name/NamedQualifierNameProvider.java | 6 +-
.../plugins/name/PluginAttributeNameProvider.java | 6 +-
.../name/PluginBuilderAttributeNameProvider.java | 6 +-
.../plugins/name/PluginElementNameProvider.java | 6 +-
.../log4j/plugins/name/PluginNameProvider.java | 5 +-
.../plugins/name/PluginValueNameProvider.java | 6 +-
.../apache/logging/log4j/plugins}/util/Assert.java | 2 +-
.../log4j/plugins}/util/InternalException.java | 2 +-
.../log4j/plugins/util/OrderedComparator.java | 1 +
.../log4j/plugins}/util/ReflectionUtil.java | 2 +-
.../logging/log4j/plugins/util/package-info.java | 2 +-
.../validators/RequiredPropertyValidator.java | 4 +-
.../validation/validators/RequiredValidator.java | 2 +-
.../apache/logging/log4j/script/ScriptKeys.java | 21 +-
.../logging/log4j/script/ScriptManagerImpl.java | 7 +-
.../logging/log4j/script/ScriptPropertyKey.java | 80 -
.../script/factory/ScriptManagerFactoryImpl.java | 9 +-
.../apache/logging/log4j/script/TestConstants.java | 11 +-
.../appender/ScriptAppenderSelectorTest.java | 6 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 5 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 5 +-
.../rolling/action/ScriptConditionTest.java | 6 +-
.../routing/DefaultRouteScriptAppenderTest.java | 5 +-
.../appender/routing/RoutesScriptAppenderTest.java | 5 +-
.../log4j/script/config/TestConfigurator.java | 6 +-
.../script/config/arbiter/ScriptArbiterTest.java | 6 +-
.../config/builder/ConfigurationAssemblerTest.java | 17 +-
.../filter/ScriptFileFilterPropertiesTest.java | 6 +-
.../log4j/script/filter/ScriptFileFilterTest.java | 6 +-
.../log4j/script/filter/ScriptFilterTest.java | 6 +-
.../log4j/script/filter/ScriptRefFilterTest.java | 6 +-
.../log4j/script/layout/PatternSelectorTest.java | 6 +-
log4j-to-jul/pom.xml | 7 +-
.../org/apache/logging/log4j/tojul/Activator.java | 23 +-
.../apache/logging/log4j/tojul/JULProvider.java | 19 +-
.../apache/logging/log4j/tojul/package-info.java | 2 +-
log4j-to-slf4j/pom.xml | 5 -
.../org/apache/logging/slf4j/SLF4JProvider.java | 18 +-
.../org/apache/logging/slf4j/package-info.java | 2 +-
pom.xml | 13 +-
675 files changed, 5264 insertions(+), 53548 deletions(-)
delete mode 100644 log4j-api-test/pom.xml
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/ListStatusListener.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContext.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContextFactory.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestProperties.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/ThreadContextHolder.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/ThreadContextUtilityClass.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/Timer.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ClassMatchers.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanUpDirectories.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanUpFiles.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ExtensionContextAnchor.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/InitializesThreadContext.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/LoggerContextFactoryExtension.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Resources.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SetTestProperty.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerLevelExtension.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TempLoggingDir.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TempLoggingDirectory.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertySource.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ThreadContextInitializer.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ThreadContextMapExtension.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ThreadContextRule.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ThreadContextStackExtension.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/ThreadContextStackRule.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingAnyThreadContext.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingStatusListener.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingTestProperties.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingThreadContextMap.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingThreadContextStack.java
delete mode 100644
log4j-api-test/src/main/resources/META-INF/services/org.apache.logging.log4j.util.PropertySource
delete mode 100644
log4j-api-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
delete mode 100644
log4j-api-test/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/LevelTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/LogManagerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/MarkerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/TestProvider.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/DefaultLogBuilderTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryTestUtil.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/StructuredDataMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/simple/SimpleLoggerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/test/BetterService.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/test/Service2.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/test/ThreadContextTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/test/junit/TempLoggingDirectoryTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/test/junit/TestPropertySourceTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/AssertTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/CharsTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ConstantsTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/LazyTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesPropertySourceTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertySourceCamelCaseTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StringsTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/Unbox1Test.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/Unbox2ConfigurableTest.java
delete mode 100644 log4j-api-test/src/test/resources/Jira3413Test.properties
delete mode 100644
log4j-api-test/src/test/resources/META-INF/log4j2.my-app.json
delete mode 100644
log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.Provider
delete mode 100644
log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.BetterService
delete mode 100644
log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.Service
delete mode 100644 log4j-api-test/src/test/resources/MF_en_US.properties
delete mode 100644 log4j-api-test/src/test/resources/MF_fr.properties
delete mode 100644 log4j-api-test/src/test/resources/MF_fr_CH.properties
delete mode 100644
log4j-api-test/src/test/resources/PropertiesUtilOrderTest.properties
delete mode 100644 log4j-api-test/src/test/resources/PropertiesUtilTest.json
delete mode 100644
log4j-api-test/src/test/resources/PropertiesUtilTest.properties
delete mode 100644 log4j-api-test/src/test/resources/SF_en_US.properties
delete mode 100644 log4j-api-test/src/test/resources/SF_fr.properties
delete mode 100644 log4j-api-test/src/test/resources/SF_fr_CH.properties
delete mode 100644 log4j-api-test/src/test/resources/log4j2.my-app.json
delete mode 100644
log4j-api-test/src/test/resources/log4j2.propertyMapping.json
delete mode 100644 log4j-api-test/src/test/resources/log4j2.system.properties
delete mode 100644
log4j-api-test/src/test/resources/org/apache/logging/log4j/test/ForceLinkageError.class
delete mode 100644 log4j-api/pom.xml
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/BridgeAware.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java
delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/Level.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/LoggingException.java
delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/Marker.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/internal/CopyOnWriteNavigableSet.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/lang/NonNull.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/lang/NullMarked.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/lang/NullUnmarked.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/lang/Nullable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/lang/package-info.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/AsynchronouslyFormattable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/Clearable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/LoggerNameAwareMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessageJsonFormatter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/Message.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MessageCollectionMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/MultiformatMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterConsumer.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterVisitable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/package-info.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerConfiguration.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/CleanableThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWrite.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextShutdownAware.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystemProperty.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/NoOpThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ObjectThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/PropertyComponent.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ReadOnlyThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/recycler/RecyclerFactoryRegistry.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/recycler/package-info.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusListener.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLoggerConfiguration.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLoggerFactory.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/BiConsumer.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Cast.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ContextAwarePropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/EnvironmentPropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/IndexedReadOnlyStringMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/IndexedStringMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/InternalApi.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Lazy.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/LazyBoolean.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/LazyUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/MessageSupplier.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/MultiFormatStringBuilderFormattable.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/NameUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PerformanceSensitive.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesPropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyEnvironment.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderActivator.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/StringMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Supplier.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/TimeUnit.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/TriConsumer.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java
delete mode 100644 log4j-api/src/main/resources/Log4j-charsets.properties
delete mode 100644 log4j-api/src/main/resources/log4j2.propertyMapping.json
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerKeys.java
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/DefaultAsyncWaitStrategyFactory.java
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/DisruptorUtil.java
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DefaultAsyncWaitStrategyFactory.java
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DefaultBundle.java
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DisruptorUtil.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jInstanceFactoryPostProcessor.java
=>
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/InstanceFactoryPostProcessor.java
(73%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/TimeoutBlockingWaitStrategy.java (96%)
create mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/TestConstants.java
rename {log4j-api-test/src/main/java/org/apache/logging/log4j =>
log4j-core-test/src/main/java/org/apache/logging/log4j/core}/test/junit/AbstractExternalFileCleaner.java
(99%)
rename {log4j-api-test/src/main/java/org/apache/logging/log4j =>
log4j-core-test/src/main/java/org/apache/logging/log4j/core}/test/junit/CleanFiles.java
(97%)
rename {log4j-api-test/src/main/java/org/apache/logging/log4j =>
log4j-core-test/src/main/java/org/apache/logging/log4j/core}/test/junit/CleanFolders.java
(98%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextTest.java
rename
log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java =>
log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/TestPropertyKeys.java
(83%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/JsonUtilsTest.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/package-info.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/URIConfigurationFactory.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/CoreKeys.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/SystemPropertyBundle.java
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassNameLocator.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/internal/Activator.java
(61%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/internal/InternalLoggerContext.java
rename {log4j-api/src/main/java/org/apache/logging/log4j/message =>
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/internal}/ReusableMessageFactory.java
(67%)
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/BasicAsyncLoggerContextSelector.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/selector/AbstractContextSelector.java
(54%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
rename
log4j-jctools/src/test/resources/META-INF/services/{org.apache.logging.log4j.spi.recycler.RecyclerFactoryProvider
=> org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider} (100%)
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassLocator.java =>
log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JNDIKeys.java (74%)
rename
log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextShutdownEnabled.java
=> log4j-jul/src/main/java/org/apache/logging/log4j/jul/JulKeys.java (66%)
delete mode 100644
log4j-jul/src/main/java/org/apache/logging/log4j/jul/JulPropertyKey.java
rename
log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java =>
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/JulTestKeys.java (81%)
rename {log4j-sdk => log4j-kit}/pom.xml (75%)
rename
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerLevel.java
=> log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/Log4jProperty.java
(64%)
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/PropertyEnvironment.java
rename
log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilderFormattable.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/PropertySource.java
(51%)
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextualEnvironmentPropertySource.java
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextualJavaPropsPropertySource.java
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMapMessage.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/package-info.java
(78%)
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/test/Service1.java =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/package-info.java (79%)
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/BasicPropertyEnvironment.java
rename
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4j2LauncherSessionListener.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/ClassLoaderPropertyEnvironment.java
(57%)
create mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/CompositePropertyEnvironment.java
rename log4j-api-test/src/test/java/org/apache/logging/log4j/test/Service.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/package-info.java
(78%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/util =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/json}/JsonReader.java (99%)
rename {log4j-api-test/src/main/java/org/apache/logging/log4j/test =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/json}/package-info.java
(95%)
rename {log4j-sdk/src/main/java/org/apache/logging/log4j/sdk =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/logger/AbstractLogger.java
(95%)
rename {log4j-sdk/src/main/java/org/apache/logging/log4j/sdk =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/logger/internal/DefaultLogBuilder.java
(98%)
rename {log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/logger}/package-info.java
(95%)
rename
log4j-api/src/main/java/org/apache/logging/log4j/spi/LocationAwareLogger.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/message/RecyclingMessageFactory.java
(60%)
rename {log4j-sdk/src/main/java/org/apache/logging/log4j/sdk/logger =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/message}/package-info.java
(95%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/Recycler.java
(97%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerAware.java
(91%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerFactory.java
(97%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerFactoryProvider.java
(87%)
rename
log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/RecyclerKeys.java
(62%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/ArrayQueue.java
(97%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/DummyRecyclerFactoryProvider.java
(83%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/QueueingRecyclerFactoryProvider.java
(84%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/ThreadLocalRecyclerFactoryProvider.java
(79%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler}/package-info.java
(95%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/support}/AbstractRecycler.java
(81%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/message =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/support}/package-info.java
(88%)
copy log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/TestPropertyEnvironment.java
(54%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/AbstractPropertyNamesTest.java
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/ContextualEnvironmentPropertySourceTest.java
(50%)
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/ContextualJavaPropsPropertySourceTest.java
(51%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/support/BasicPropertyEnvironmentTest.java
rename {log4j-core-test/src/test/java/org/apache/logging/log4j/core/util =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/json}/JsonReaderTest.java
(99%)
rename {log4j-sdk/src/test/java/org/apache/logging/log4j/sdk =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit}/logger/AbstractLoggerTest.java
(72%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/logger/TestListLogger.java
rename
{log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/ArrayQueueTest.java
(98%)
rename
{log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/RecyclerFactoryRegistryTest.java
(72%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal/RecyclerFactoryTestUtil.java
rename
{log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/ThreadLocalRecyclerFactoryProviderTest.java
(80%)
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPresentBindingsConditionTest.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/ConditionalOnPresentBindings.java
(69%)
rename
log4j-api-test/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/OnPresentBindingsCondition.java
(54%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{ =>
internal}/util/AnnotatedAnnotation.java (95%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{ =>
internal}/util/AnnotationUtil.java (98%)
rename {log4j-api/src/main/java/org/apache/logging/log4j =>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins}/util/Assert.java
(98%)
rename {log4j-api/src/main/java/org/apache/logging/log4j =>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins}/util/InternalException.java
(97%)
rename {log4j-api/src/main/java/org/apache/logging/log4j =>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins}/util/ReflectionUtil.java
(99%)
rename
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Mutable.java
=> log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptKeys.java
(71%)
delete mode 100644
log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptPropertyKey.java
rename
log4j-api/src/main/java/org/apache/logging/log4j/util/ReloadablePropertySource.java
=>
log4j-script/src/test/java/org/apache/logging/log4j/script/TestConstants.java
(80%)
rename log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java
=> log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/Activator.java
(65%)
