This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/move-thread-context
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 33ba51e2dc Fix MDC configuration documentation
add 4a603731ed Update `org.springframework:spring-framework-bom` to
version `5.3.39` (#2840)
add dd5df4be04 Backport part of #2062
add e6c7f197f2 Disable programmatic configuration if
`log4j1.compatibility` is `false`
add f7d3725202 Fix `JsonLayout` failures under JPMS (#2815)
add 9fded3e199 Fix links to issues
add 54924a416e Update `org.apache.maven.surefire:surefire-junit47` to
version `3.4.0` (#2862)
add 7a0057b8ea Update `org.apache.maven:maven-core` to version `3.9.9`
(#2861)
add 24b21b7e10 Update `commons-logging:commons-logging` to version `1.3.4`
(#2864)
add b911bffd0e Update `org.apache.commons:commons-compress` to version
`1.27.1` (#2869)
add a50366052a Update `com.google.guava:guava` to version `33.3.0-jre`
(#2860)
add f141d9490f Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.16
add 6d74d4bbf7 Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to
version `1.8.0` (#2881)
add 67848c1fc2 Update `org.jmdns:jmdns` to version `3.5.12` (#2879)
add 615092bc9c Disable SLF4J major upgrades
add 6fb4f90b87 Disable level modification via JUL by default
add f5ddc79089 Document module deprecation in 2.x
add 78af316935 Remove caching from `PropertiesUtil` (+#2849 review)
add 9c3e24acf7 Add support for custom context data in `ctx` lookup
add 93484298e3 Correct release containing LOG4J2-3584 fix
add b593be7d88 Use FQDN in RFC5424 Layout (+review #2853)
add 200f852b45 Update `org.apache.maven.surefire:surefire-junit47` to
version `3.5.0` (#2898)
add 8a43fa3bbb Merge remote-tracking branch 'refs/remotes/apache/2.x' into
feature/move-thread-context
No new revisions were added by this update.
Summary of changes:
.github/dependabot.yaml | 3 +
antora-playbook.yaml | 5 +-
.../org/apache/log4j/PropertyConfigurator.java | 212 +++++++++------------
.../java/org/apache/log4j/xml/DOMConfigurator.java | 96 ++++++----
.../org/apache/log4j/PropertyConfiguratorTest.java | 121 +++++-------
.../java/org/apache/log4j/xml/DOMTestCase.java | 60 ++++--
.../input/xml => DOMTestCase}/DOMTest4.xml | 4 +-
.../input/xml => DOMTestCase}/DOMTest4_A1.xml | 0
.../input/xml => DOMTestCase}/DOMTest4_A2.xml | 0
.../input/xml => DOMTestCase}/DOMTestCase1.xml | 0
.../input/xml => DOMTestCase}/categoryfactory1.xml | 0
.../input/xml => DOMTestCase}/categoryfactory2.xml | 0
.../input/xml => DOMTestCase}/defaultInit.xml | 0
.../input/xml => DOMTestCase}/loggerfactory1.xml | 0
.../input/xml => DOMTestCase}/testReset.xml | 0
.../xml => DOMTestCase}/throwableRenderer1.xml | 0
.../PropertyConfiguratorTest/badEscape.properties | 4 +-
.../filter.properties} | 2 +-
.../input/xml/SocketAppenderTestConfig.xml | 59 ------
.../log4j1-1.2.17/input/xml/customLevel1.xml | 34 ----
.../log4j1-1.2.17/input/xml/customLevel2.xml | 41 ----
.../log4j1-1.2.17/input/xml/customLevel3.xml | 44 -----
.../log4j1-1.2.17/input/xml/customLevel4.xml | 35 ----
.../log4j1-1.2.17/input/xml/customLogger1.xml | 35 ----
.../log4j1-1.2.17/input/xml/customLogger2.xml | 43 -----
.../log4j1-1.2.17/input/xml/customLogger3.xml | 35 ----
.../log4j1-1.2.17/input/xml/fallback1.xml | 50 -----
.../log4j1-1.2.17/input/xml/smtpAppender1.xml | 38 ----
.../log4j/util/PropertiesUtilOrderTest.java | 53 ++----
.../logging/log4j/util/PropertiesUtilTest.java | 110 ++++++++---
.../src/test/resources/Jira3413Test.properties | 18 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 136 ++++++-------
.../apache/logging/log4j/util/PropertySource.java | 10 +-
log4j-core-its/pom.xml | 2 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 2 -
.../log4j/core/layout/Rfc5424LayoutTest.java | 13 +-
.../core/net/ssl/SslConfigurationFactoryTest.java | 3 -
.../logging/log4j/core/util/NetUtilsTest.java | 7 +
.../logging/log4j/core/ContextDataInjector.java | 13 ++
.../log4j/core/appender/SyslogAppender.java | 2 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 38 ++--
.../log4j/core/filter/ThreadContextMapFilter.java | 16 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 41 ++--
.../ContextDataAsEntryListDeserializer.java | 9 +-
.../jackson/ContextDataAsEntryListSerializer.java | 3 +-
.../core/jackson/ContextDataDeserializer.java | 9 +-
.../log4j/core/jackson/ContextDataSerializer.java | 3 +-
.../logging/log4j/core/jackson/Initializers.java | 63 +++---
.../logging/log4j/core/jackson/JsonConstants.java | 10 +
.../log4j/core/jackson/Log4jJsonModule.java | 8 +-
.../logging/log4j/core/jackson/Log4jXmlModule.java | 4 +-
.../log4j/core/jackson/Log4jYamlModule.java | 6 +-
.../{LogEventJsonMixIn.java => LogEventMixIn.java} | 82 ++++----
.../core/jackson/LogEventWithContextListMixIn.java | 164 ----------------
.../logging/log4j/core/jackson/MapEntry.java | 2 +-
.../logging/log4j/core/jackson/package-info.java | 2 +-
.../org/apache/logging/log4j/core/jmx/Server.java | 12 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 165 ++++++++++------
.../logging/log4j/core/layout/package-info.java | 2 +-
.../log4j/core/lookup/ContextMapLookup.java | 8 +-
.../log4j/core/util/ContextDataProvider.java | 13 ++
.../apache/logging/log4j/core/util/NetUtils.java | 39 ++--
.../logging/log4j/core/util/package-info.java | 2 +-
.../appender/db/jpa/AbstractJpaAppenderTest.java | 3 -
.../org/apache/logging/log4j/jul/LogManager.java | 19 +-
.../logging/log4j/jul/test/ApiLoggerTest.java | 16 +-
.../logging/log4j/jul/test/CoreLoggerTest.java | 4 +
log4j-parent/pom.xml | 16 +-
log4j-perf-test/pom.xml | 2 +-
log4j-slf4j2-impl/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
pom.xml | 6 +-
...acing_support.xml => 1740_rfc5424_use_fqdn.xml} | 4 +-
.../1799_ignore_propertysource_errors.xml} | 6 +-
.../.2.x.x/1963_add_logging_to_properties_util.xml | 2 +-
....xml => 2331_custom_context_data_in_lookup.xml} | 4 +-
...iptor_warnings.xml => 2353_set_level_no-op.xml} | 4 +-
.../2778_configurator_no_op.xml} | 4 +-
.../2814_open_json_layout.xml} | 3 +-
.../2849-remove-token-based-matching.xml} | 6 +-
.../LOG4J2-3618_propertysource_comparator.xml} | 4 +-
src/changelog/.2.x.x/add_log4j_mongodb.xml | 1 +
src/changelog/.2.x.x/change-is-webapp.xml | 1 +
.../.2.x.x/deprecate-Message-getFormat.xml | 1 +
src/changelog/.2.x.x/deprecate_EventLogger.xml | 1 +
src/changelog/.2.x.x/deprecate_duration.xml | 1 +
.../deprecate_log4j2_default_status_level.xml | 1 +
src/changelog/.2.x.x/deprecate_log4j_mongodb4.xml | 1 +
src/changelog/.2.x.x/remove_log4j_mongodb3.xml | 1 +
.../.2.x.x/update_com_google_guava_guava.xml | 4 +-
.../update_commons_logging_commons_logging.xml | 4 +-
...de_flapdoodle_reverse_de_flapdoodle_reverse.xml | 4 +-
.../update_org_apache_commons_commons_compress.xml | 4 +-
.../.2.x.x/update_org_apache_maven_maven_core.xml | 4 +-
..._org_apache_maven_surefire_surefire_junit47.xml | 4 +-
src/changelog/.2.x.x/update_org_jmdns_jmdns.xml | 4 +-
..._mongodb.xml => update_org_slf4j_slf4j_api.xml} | 3 +-
...te_org_springframework_spring_framework_bom.xml | 4 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 0
src/site/antora/modules/ROOT/pages/jakarta.adoc | 6 +
.../ROOT/pages/manual/appenders/database.adoc | 10 +
.../ROOT/pages/manual/appenders/message-queue.adoc | 9 +
.../appender-deprecation.adoc} | 9 +-
.../systemproperties/properties-log4j-jul.adoc | 21 +-
104 files changed, 880 insertions(+), 1316 deletions(-)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/DOMTest4.xml (92%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/DOMTest4_A1.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/DOMTest4_A2.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/DOMTestCase1.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/categoryfactory1.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/categoryfactory2.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/defaultInit.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/loggerfactory1.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/testReset.xml (100%)
rename log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/xml =>
DOMTestCase}/throwableRenderer1.xml (100%)
copy log4j-api-test/src/test/resources/log4j2.system.properties =>
log4j-1.2-api/src/test/resources/PropertyConfiguratorTest/badEscape.properties
(92%)
rename
log4j-1.2-api/src/test/resources/{log4j1-1.2.17/input/filter1.properties =>
PropertyConfiguratorTest/filter.properties} (98%)
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel1.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel2.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel3.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel4.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger1.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger2.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger3.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/fallback1.xml
delete mode 100644
log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/{LogEventJsonMixIn.java
=> LogEventMixIn.java} (73%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventWithContextListMixIn.java
copy src/changelog/.2.x.x/{add_GcpLayout_tracing_support.xml =>
1740_rfc5424_use_fqdn.xml} (61%)
copy src/changelog/{2.22.0/fix_jlink.xml =>
.2.x.x/1799_ignore_propertysource_errors.xml} (62%)
copy
src/changelog/.2.x.x/{fix-TruncatingBufferedWriter-empty-input-handling.xml =>
2331_custom_context_data_in_lookup.xml} (59%)
copy src/changelog/.2.x.x/{2835_improve_plugin_descriptor_warnings.xml =>
2353_set_level_no-op.xml} (63%)
copy
src/changelog/{2.0-beta3/LOG4J2-29_Added_font_and_fontSize_parameters_to_HTMLLayout_Replace_ne.xml
=> .2.x.x/2778_configurator_no_op.xml} (59%)
copy
src/changelog/{2.0-beta2/DefaultConfiguration_was_not_starting_the_Console_Appender.xml
=> .2.x.x/2814_open_json_layout.xml} (64%)
copy
src/changelog/{2.11.2/LOG4J2-2527_Prevent_ConcurrentModificationException_while_iterating_over.xml
=> .2.x.x/2849-remove-token-based-matching.xml} (66%)
copy
src/changelog/{2.0-rc2/LOG4J2-468_Add_support_to_add_a_LoggerConfig_Document_two_ways_to_modi.xml
=> .2.x.x/LOG4J2-3618_propertysource_comparator.xml} (58%)
copy src/changelog/.2.x.x/{add_log4j_mongodb.xml =>
update_org_slf4j_slf4j_api.xml} (63%)
rename src/changelog/{2.19.0 =>
2.20.0}/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
(100%)
copy src/site/antora/modules/ROOT/partials/{features/config-properties.adoc =>
manual/appender-deprecation.adoc} (76%)
