This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/apply-property-environment
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 0ac3d5e07d Move `Recycler` to `log4j-kit`
discard c38f7bbb33 Replace `PropertiesUtil` with `PropertyEnvironment`
discard c646ed075f Generalize DI usage
new 66bfd0501d Replace `PropertiesUtil` with `PropertyEnvironment`
new 580f397f0b Move `Recycler` to `log4j-kit`
new 59eeaf5e30 Fix `PropertiesUtil` source
new 4050fba3c4 Replace `o.a.l.l.lang` annotations with JSpecify
new f8bb3a517a Move `ReflectionUtil` to `log4j-plugins`
new 3ded0ce2b2 Adapt `log4j-plugins` to Log4j API 2.x
new 54f8cb4233 Adapt `log4j-core` to Log4j API 2.x
new 3432f4c759 Other small fixes
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 (0ac3d5e07d)
\
N -- N -- N refs/heads/fix/apply-property-environment
(3432f4c759)
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 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/log4j/Category.java | 2 +-
.../org/apache/log4j/bridge/AppenderAdapter.java | 2 +-
.../org/apache/log4j/bridge/LogEventAdapter.java | 13 --
.../org/apache/log4j/bridge/LogEventWrapper.java | 8 -
.../log4j/config/Log4j1ConfigurationFactory.java | 6 +-
.../config/PropertiesConfigurationFactory.java | 6 +-
.../apache/log4j/BasicConfigurationFactory.java | 4 +-
.../test/java/org/apache/log4j/CategoryTest.java | 35 +----
.../test/java/org/apache/log4j/ListAppender.java | 7 +-
.../org/apache/logging/log4j/util/NameUtil.java | 76 ---------
.../log4j/async/logger/internal/DefaultBundle.java | 24 +--
.../properties/JavaPropsConfigurationFactory.java | 6 +-
.../config/yaml/YamlConfigurationFactory.java | 6 +-
.../log4j/core/test/BasicConfigurationFactory.java | 8 +-
.../logging/log4j/core/test/TestConstants.java | 26 ++--
.../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 | 4 +-
.../log4j/core/test/junit/LoggerContextRule.java | 2 -
.../log4j/core/test/layout/Log4j2_1482_Test.java | 2 +-
.../org/apache/logging/log4j/core/LoggerTest.java | 9 +-
.../RollingAppenderDirectWriteStartupSizeTest.java | 2 +-
.../RollingFileAppenderInterruptedThreadTest.java | 2 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 1 -
.../log4j/core/config/TestConfiguratorError.java | 3 -
.../core/impl/ThreadContextDataInjectorTest.java | 3 +-
.../selector/ClassLoaderContextSelectorTest.java | 2 +-
.../log4j/core/tools/GenerateCustomLoggerTest.java | 4 +-
.../core/tools/GenerateExtendedLoggerTest.java | 4 +-
.../logging/log4j/core/util/JsonUtilsTest.java | 68 --------
.../apache/logging/log4j/core/LoggerContext.java | 16 +-
.../core/appender/MemoryMappedFileManager.java | 2 +-
.../log4j/core/config/AbstractConfiguration.java | 28 +++-
.../core/config/AbstractConfigurationFactory.java | 172 ---------------------
.../config/ConfigurationAwarePostProcessor.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 14 +-
.../core/config/DefaultConfigurationFactory.java | 6 +-
.../config/LoggerContextAwarePostProcessor.java | 2 +-
.../log4j/core/config/NullConfiguration.java | 4 +-
.../apache/logging/log4j/core/config/Order.java | 2 +-
.../config/builder/impl/BuiltConfiguration.java | 4 +-
.../log4j/core/config/json/JsonConfiguration.java | 2 +-
.../core/config/json/JsonConfigurationFactory.java | 8 +-
.../util/LegacyPluginAttributeFactoryResolver.java | 2 +-
...egacyPluginBuilderAttributeFactoryResolver.java | 2 +-
.../core/config/plugins/util/package-info.java | 2 +-
.../core/config/xml/XmlConfigurationFactory.java | 6 +-
.../core/filter/MutableThreadContextMapFilter.java | 2 +-
.../logging/log4j/core/impl/DefaultBundle.java | 38 ++++-
.../log4j/core/impl/Log4jContextFactory.java | 15 +-
.../logging/log4j/core/impl/Log4jProvider.java | 2 +-
.../logging/log4j/core/impl/PropertyKeys.java | 2 +
.../log4j/core/impl/ThreadContextDataInjector.java | 12 +-
.../apache/logging/log4j/core/util/JsonUtils.java | 117 --------------
.../org/apache/logging/log4j/core/util/Loader.java | 4 +-
.../logging/log4j/core/util/WatchManager.java | 9 +-
.../jctools/JCToolsRecyclerFactoryProvider.java | 4 +-
.../PropertiesUtilPropertyEnvironment.java | 2 +-
.../apache/logging/log4j/kit/json}/JsonReader.java | 2 +-
.../logging/log4j/kit/json}/package-info.java | 2 +-
.../kit/recycler/RecyclerFactoryProvider.java | 5 +
.../{PropertyKeys.java => RecyclerKeys.java} | 2 +-
.../internal/DummyRecyclerFactoryProvider.java | 2 +
.../ThreadLocalRecyclerFactoryProvider.java | 4 +-
.../PropertiesUtilPropertyEnvironmentTest.java | 2 +-
.../logging/log4j/kit/json}/JsonReaderTest.java | 3 +-
.../osgi/tests/CustomConfigurationFactory.java | 6 +-
.../plugins/condition/OnPropertyConditionTest.java | 8 +-
.../log4j/plugins/util/AnnotationUtilTest.java | 1 +
.../org/apache/logging/log4j/plugins/Ordered.java | 3 +-
.../plugins/condition/OnPropertyCondition.java | 2 +-
.../plugins/di/ConfigurableInstanceFactory.java | 7 +-
.../org/apache/logging/log4j/plugins/di/DI.java | 8 +-
.../log4j/plugins/di/DefaultInstanceFactory.java | 6 +-
.../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 ++++----
.../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 | 5 -
.../validation/validators/RequiredValidator.java | 2 +-
.../config/builder/CustomConfigurationFactory.java | 6 +-
100 files changed, 293 insertions(+), 724 deletions(-)
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/NameUtil.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/util/JsonUtilsTest.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfigurationFactory.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
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%)
copy {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-kit/src/main/java/org/apache/logging/log4j/kit/recycler/{PropertyKeys.java
=> RecyclerKeys.java} (97%)
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-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%)
