You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/01/09 20:25:32 UTC
(logging-log4j2) branch main-remove-thread-locals updated (96f2eb722f -> 299aa7b8df)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main-remove-thread-locals
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 96f2eb722f Remove mentions of `ParameterizedMessageFactory`
add 26a00aab4e Remove irrelevant implementation link
add 53e776db97 Remove ineffective `MessageFormatsPerfTest`
add b677bcbd79 Move `Timer` from `log4j-api` to `log4j-api-test`
add 1459457563 Create parent for Jackson-based configurations
add 495277dc80 Remove order requirement from `Properties` node
add 9ffe665cc6 Add Jackson-based properties configuration factory
add a69678c67e Move old `PropertiesConfiguration` to external module
add f8632da6e0 Fix description of configuration factories
add 7989cd5a6f Remove properties test case
add ec93d181c8 Convert properties configuration file
add 027009eeab Sync `JsonWriter` with the one in `2.x`
add 923a43ef23 Fix `JsonTemplateLayoutConcurrentEncodeTest`
add 3254858d6e Fix JTL nested logging test
add b1113c7833 Fix static analysis issues
add 299aa7b8df Merge remote-tracking branch 'origin/main' into main-remove-thread-locals
No new revisions were added by this update.
Summary of changes:
.../log4j/test/ThreadContextUtilityClass.java | 1 -
.../java/org/apache/logging/log4j/test}/Timer.java | 4 +-
.../log4j/message/MessageFormatsPerfTest.java | 127 -----------
.../logging/log4j/message/MessageFactory.java | 1 -
.../pom.xml | 22 +-
.../jackson/AbstractJacksonConfiguration.java | 97 ++++----
.../pom.xml | 13 +-
.../config/properties/PropertiesConfiguration.java | 0
.../properties/PropertiesConfigurationBuilder.java | 0
.../properties/PropertiesConfigurationFactory.java | 0
.../log4j/core/config/properties/package-info.java | 0
.../PropertiesConfigurationFactoryTest.java | 10 +-
.../properties/PropertiesConfigurationTest.java | 0
.../properties}/PropertiesFileConfigTest.java | 3 +-
.../properties}/PropertiesRoutingAppenderTest.java | 2 +-
.../resources/LoggerLevelAppenderTest.properties | 0
.../LoggerLevelSysPropsAppenderTest.properties | 0
.../RootLoggerLevelAppenderTest.properties | 0
.../src/test/resources/log4j-rolling.properties | 0
.../src/test/resources/log4j-routing.properties | 0
.../src/test/resources/log4j-test1.properties | 0
.../src/test/resources/log4j-test2.properties | 0
.../log4j2-properties-root-only.properties | 0
...2-properties-trailing-space-on-level.properties | 0
.../test/resources/log4j2-properties.properties | 0
.../pom.xml | 8 +-
.../config/properties/JavaPropsConfiguration.java | 47 ++++
.../properties/JavaPropsConfigurationFactory.java | 12 +-
.../log4j/config/properties}/package-info.java | 2 +-
.../JavaPropsConfigurationFactoryTest.java | 20 +-
.../JavaPropsConfigurationFactoryTest.properties | 50 +++++
log4j-config-yaml/pom.xml | 4 +-
.../log4j/config/yaml/YamlConfiguration.java | 245 +--------------------
.../apache/logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../appender/RandomAccessFileAppenderTest.java | 3 +-
.../core/config/CompositeConfigurationTest.java | 47 ----
.../core/config/ConfigurationFactoryTest.java | 8 -
.../apache/logging/log4j/core/util/InitTest.java | 2 +-
...mAccessFileAppenderLocationPropsTest.properties | 37 ----
.../test/resources/log4j-comp-reconfig.properties | 59 -----
.../log4j/core/config/AbstractConfiguration.java | 23 +-
.../logging/log4j/core/config/LoggerConfig.java | 35 ++-
.../log4j/flume/appender/FlumeAppender.java | 19 --
log4j-layout-template-json-test/pom.xml | 5 +
.../JsonTemplateLayoutAdditionalFieldTest.java | 2 +
.../JsonTemplateLayoutConcurrentEncodeTest.java | 43 ++--
.../layout/template/json/NestedLoggingTest.java | 85 +++++++
.../template/json/resolver/LevelResolverTest.java | 8 +-
.../json/resolver/MessageResolverTest.java | 2 +-
.../resolver/StackTraceStringResolverTest.java | 1 +
.../json/resolver/TimestampResolverTest.java | 2 +-
.../layout/template/json/util/JsonWriterTest.java | 29 +--
.../src/test/resources/NestedLoggingTest.xml | 28 +--
...eldEnrichedJsonTemplateLayoutLogging.properties | 38 ++--
.../json/resolver/MessageResolverFactory.java | 2 +-
.../layout/template/json/util/JsonWriter.java | 21 +-
pom.xml | 21 ++
...ctory_dsls.xml => create_config_properties.xml} | 3 +-
...aml.xml => create_config_properties_legacy.xml} | 2 +-
src/site/_release-notes/_3.x.x.adoc | 2 +
61 files changed, 435 insertions(+), 764 deletions(-)
rename {log4j-api/src/main/java/org/apache/logging/log4j/util => log4j-api-test/src/main/java/org/apache/logging/log4j/test}/Timer.java (98%)
delete mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatsPerfTest.java
copy {log4j-plugin-processor => log4j-config-jackson}/pom.xml (74%)
copy log4j-config-yaml/src/main/java/org/apache/logging/log4j/config/yaml/YamlConfiguration.java => log4j-config-jackson/src/main/java/org/apache/logging/log4j/config/jackson/AbstractJacksonConfiguration.java (73%)
copy {log4j-config-yaml => log4j-config-properties-legacy}/pom.xml (87%)
rename {log4j-core => log4j-config-properties-legacy}/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java (100%)
rename {log4j-core => log4j-config-properties-legacy}/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java (100%)
rename {log4j-core => log4j-config-properties-legacy}/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java (100%)
rename {log4j-core => log4j-config-properties-legacy}/src/main/java/org/apache/logging/log4j/core/config/properties/package-info.java (100%)
copy log4j-config-yaml/src/test/java/org/apache/logging/log4j/config/yaml/YamlConfigurationFactoryTest.java => log4j-config-properties-legacy/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactoryTest.java (79%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java (100%)
rename {log4j-core-test/src/test/java/org/apache/logging/log4j/core => log4j-config-properties-legacy/src/test/java/org/apache/logging/log4j/core/config/properties}/PropertiesFileConfigTest.java (96%)
rename {log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing => log4j-config-properties-legacy/src/test/java/org/apache/logging/log4j/core/config/properties}/PropertiesRoutingAppenderTest.java (97%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/LoggerLevelAppenderTest.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/LoggerLevelSysPropsAppenderTest.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/RootLoggerLevelAppenderTest.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j-rolling.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j-routing.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j-test1.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j-test2.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j2-properties-root-only.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j2-properties-trailing-space-on-level.properties (100%)
rename {log4j-core-test => log4j-config-properties-legacy}/src/test/resources/log4j2-properties.properties (100%)
copy {log4j-config-yaml => log4j-config-properties}/pom.xml (88%)
create mode 100644 log4j-config-properties/src/main/java/org/apache/logging/log4j/config/properties/JavaPropsConfiguration.java
copy log4j-config-yaml/src/main/java/org/apache/logging/log4j/config/yaml/YamlConfigurationFactory.java => log4j-config-properties/src/main/java/org/apache/logging/log4j/config/properties/JavaPropsConfigurationFactory.java (83%)
copy {log4j-config-yaml/src/main/java/org/apache/logging/log4j/config/yaml => log4j-config-properties/src/main/java/org/apache/logging/log4j/config/properties}/package-info.java (94%)
copy log4j-config-yaml/src/test/java/org/apache/logging/log4j/config/yaml/YamlConfigurationFactoryTest.java => log4j-config-properties/src/test/java/org/apache/logging/log4j/config/properties/JavaPropsConfigurationFactoryTest.java (58%)
create mode 100644 log4j-config-properties/src/test/resources/JavaPropsConfigurationFactoryTest.properties
delete mode 100644 log4j-core-test/src/test/resources/RollingRandomAccessFileAppenderLocationPropsTest.properties
delete mode 100644 log4j-core-test/src/test/resources/log4j-comp-reconfig.properties
create mode 100644 log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/NestedLoggingTest.java
copy log4j-core-test/src/test/resources/log4j-replace.xml => log4j-layout-template-json-test/src/test/resources/NestedLoggingTest.xml (66%)
copy src/changelog/.3.x.x/{2147_add_instance_factory_dsls.xml => create_config_properties.xml} (68%)
copy src/changelog/.3.x.x/{create_config_yaml.xml => create_config_properties_legacy.xml} (79%)