This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch doc/2.x/extending in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fc1953b8452254f608e63ba73f7078613b8a78d5 Merge: 65b9924f21 26cc544418 Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Jun 20 09:53:30 2024 +0200 Merge remote-tracking branch 'origin/2.x' into doc/2.x/extending .github/workflows/build.yaml | 5 +- .github/workflows/deploy-site.yaml | 2 +- .github/workflows/labeler.yaml | 8 +- .github/workflows/merge-dependabot.yaml | 1 + antora-playbook.yaml | 3 + log4j-1.2-api/pom.xml | 11 - .../java/org/apache/logging/log4j/EventLogger.java | 5 +- log4j-core-test/pom.xml | 11 - .../logging/log4j/core/layout/XmlLayoutTest.java | 4 +- log4j-jul/pom.xml | 3 + .../resources/threadLocalRecyclerNestedLogging.xml | 4 +- .../json/resolver/TemplateResolverContext.java | 2 +- .../TemplateResolverStringSubstitutor.java | 4 +- .../template/json/resolver/package-info.java | 2 +- log4j-osgi-test/pom.xml | 53 +++- log4j-parent/pom.xml | 12 +- pom.xml | 37 +++ ...cate_duration.xml => deprecate_EventLogger.xml} | 4 +- src/changelog/.2.x.x/deprecate_duration.xml | 4 +- .../deprecate_log4j2_default_status_level.xml | 2 +- src/changelog/.2.x.x/deprecate_log4j_mongodb4.xml | 4 +- ...pdate_co_elastic_clients_elasticsearch_java.xml | 4 +- .../.2.x.x/update_org_apache_maven_maven_core.xml | 4 +- ...org_apache_maven_surefire_surefire_junit47.xml} | 4 +- ...te_org_springframework_spring_framework_bom.xml | 4 +- src/site/antora/antora.tmpl.yml | 2 + src/site/antora/antora.yml | 4 +- .../ROOT/examples/manual/flowtracing/log4j2.json | 43 +++ .../{markers => flowtracing}/log4j2.properties | 32 ++- .../manual/{markers => flowtracing}/log4j2.xml | 27 +- .../manual/{markers => flowtracing}/log4j2.yaml | 30 +- .../ROOT/examples/manual/flowtracing/logback.xml | 78 ++++++ .../log4j2.json | 0 .../log4j2.properties | 0 .../log4j2.xml | 0 .../log4j2.yaml | 0 .../property-substitution/log4j2.json | 27 ++ .../property-substitution}/log4j2.properties | 25 +- .../log4j2.xml | 17 +- .../log4j2.yaml | 14 +- .../ROOT/examples/manual/markers/log4j2.json | 17 +- .../ROOT/examples/manual/markers/log4j2.properties | 20 +- .../ROOT/examples/manual/markers/log4j2.xml | 14 +- .../ROOT/examples/manual/markers/log4j2.yaml | 11 +- .../ROOT/examples/manual/markers/logback.xml | 41 ++- src/site/antora/modules/ROOT/nav.adoc | 4 +- src/site/antora/modules/ROOT/pages/faq.adoc | 2 +- src/site/antora/modules/ROOT/pages/manual/api.adoc | 11 +- .../modules/ROOT/pages/manual/appenders.adoc | 2 +- .../modules/ROOT/pages/manual/architecture.adoc | 4 +- .../antora/modules/ROOT/pages/manual/async.adoc | 2 +- .../modules/ROOT/pages/manual/config-intro.adoc | 33 +++ .../modules/ROOT/pages/manual/configuration.adoc | 105 +++---- .../modules/ROOT/pages/manual/eventlogging.adoc | 242 ++-------------- .../antora/modules/ROOT/pages/manual/filters.adoc | 2 +- .../modules/ROOT/pages/manual/flowtracing.adoc | 305 ++++++++++++--------- .../modules/ROOT/pages/manual/garbagefree.adoc | 2 +- .../modules/ROOT/pages/manual/getting-started.adoc | 4 +- .../modules/ROOT/pages/manual/installation.adoc | 11 +- .../ROOT/pages/manual/json-template-layout.adoc | 153 +++++++++-- .../antora/modules/ROOT/pages/manual/layouts.adoc | 19 +- .../antora/modules/ROOT/pages/manual/lookups.adoc | 1 + .../antora/modules/ROOT/pages/manual/markers.adoc | 86 ++++-- .../antora/modules/ROOT/pages/manual/messages.adoc | 165 +++++++---- .../modules/ROOT/pages/manual/pattern-layout.adoc | 56 +++- .../ROOT/pages/manual/systemproperties.adoc | 2 +- .../modules/ROOT/pages/migrate-from-logback.adoc | 5 +- .../modules/ROOT/pages/migrate-from-slf4j.adoc | 12 +- .../antora/modules/ROOT/partials/concepts.adoc | 6 +- .../ROOT/partials/manual/async-trade-offs.adoc | 2 +- ...-gcfree-lookup.adoc => structured-logging.adoc} | 8 +- .../properties-log4j-core-misc.adoc | 2 + 72 files changed, 1066 insertions(+), 779 deletions(-) diff --cc src/site/antora/modules/ROOT/pages/manual/lookups.adoc index 41c17fd577,b417b5cd9e..86fbe88923 --- a/src/site/antora/modules/ROOT/pages/manual/lookups.adoc +++ b/src/site/antora/modules/ROOT/pages/manual/lookups.adoc @@@ -477,7 -469,8 +477,8 @@@ page for information on how to set the </Routing> ---- + [#marker-lookup] -== Marker Lookup +=== Marker Lookup The marker lookup allows you to use markers in interesting configurations like a routing appender. Consider the following YAML
