You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2022/03/27 00:15:52 UTC
[logging-log4j2] branch master updated (1ed3d90 -> 34b69ac)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 1ed3d90 Add latches to flaky tests
add 6b680b7 Make ConfigurationFactory injectable
add 1df220d Give better default value for ConfigurationFactory::getInstance
add dcc01d2 Replace new PluginManager() with PluginUtil
add 7ff0756 [LOG4J2-3418] Fix Log4j2CloudConfigLoggingSystem registration
add 34b69ac Use Phaser instead of CountDownLatch in tests
No new revisions were added by this update.
Summary of changes:
.../org/apache/log4j/builders/BuilderManager.java | 7 +-
.../test/java/org/apache/log4j/CategoryTest.java | 8 +-
.../java/org/apache/log4j/LogWithRouteTest.java | 27 +-
.../src/test/java/org/apache/log4j/LoggerTest.java | 65 ++--
.../test/java/org/apache/log4j/LoggingTest.java | 16 +-
.../org/apache/log4j/config/AutoConfigTest.java | 30 +-
.../config/Log4j1ConfigurationFactoryTest.java | 25 +-
.../log4j/config/MapRewriteAppenderTest.java | 34 +-
.../log4j/config/PropertiesConfigurationTest.java | 47 ++-
.../PropertiesRollingWithPropertiesTest.java | 47 ++-
.../apache/log4j/config/RewriteAppenderTest.java | 38 +-
.../apache/log4j/config/XmlConfigurationTest.java | 52 +--
.../log4j/config/XmlRollingWithPropertiesTest.java | 46 +--
.../RollingDirectSizeTimeNewDirectoryTest.java | 14 +-
.../rolling/RollingDirectTimeNewDirectoryTest.java | 8 +-
.../validators/RequiredValidatorTest.java | 6 +-
.../validators/ValidHostValidatorTest.java | 6 +-
.../validators/ValidPortValidatorTest.java | 6 +-
.../ValidatingPluginWithFailoverTest.java | 13 +-
.../ValidatingPluginWithGenericBuilderTest.java | 11 +-
...ngPluginWithGenericSubclassFoo1BuilderTest.java | 10 +-
.../ValidatingPluginWithTypedBuilderTest.java | 9 +-
.../logging/log4j/core/layout/GelfLayoutTest.java | 18 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 41 +--
.../log4j/core/layout/PatternLayoutTest.java | 24 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 25 +-
.../log4j/core/layout/SyslogLayoutTest.java | 19 +-
.../apache/logging/log4j/core/LoggerContext.java | 5 +-
.../log4j/core/config/ConfigurationFactory.java | 387 +--------------------
.../core/config/DefaultConfigurationFactory.java | 353 +++++++++++++++++++
.../config/composite/CompositeConfiguration.java | 20 +-
.../logging/log4j/core/impl/DefaultCallback.java | 3 +
.../log4j/core/impl/Log4jContextFactory.java | 10 +-
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 31 +-
.../logging/log4j/core/lookup/Interpolator.java | 6 +-
.../logging/log4j/core/pattern/PatternParser.java | 32 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 59 ++--
.../flume/appender/FlumePersistentManager.java | 42 ++-
.../log4j/jackson/json/MarkerMixInJsonTest.java | 6 +-
.../log4j/jackson/json/layout/JsonLayoutTest.java | 94 +++--
.../log4j/jackson/xml/MarkerMixInXmlTest.java | 6 +-
.../log4j/jackson/xml/layout/XmlLayoutTest.java | 124 +++----
.../log4j/jackson/yaml/LevelMixInYamlTest.java | 6 +-
.../log4j/jackson/yaml/MarkerMixInYamlTest.java | 6 +-
.../yaml/StackTraceElementYamlMixInTest.java | 27 +-
.../ConcurrentLoggingWithYamlLayoutTest.java | 43 +--
.../log4j/jackson/yaml/layout/YamlLayoutTest.java | 53 ++-
.../log4j/jackson/AbstractMarkerMixInTest.java | 34 +-
.../logging/log4j/jackson/LevelMixInTest.java | 28 +-
.../plugins/convert/TypeConverterRegistry.java | 6 +-
.../boot/Log4j2CloudConfigLoggingSystem.java | 79 +++--
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/log4j2.system.properties | 17 -
.../boot/Log4j2CloudConfigLoggingSystemTest.java | 28 +-
54 files changed, 1021 insertions(+), 1138 deletions(-)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java
copy {log4j-spring-cloud-config/log4j-spring-cloud-config-client => log4j-spring-boot}/src/main/resources/META-INF/spring.factories (85%)
delete mode 100644 log4j-spring-boot/src/main/resources/log4j2.system.properties