You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/06/20 10:01:36 UTC
(logging-log4j2) branch doc/2.x/levels-logback updated (4f2434bcd6 -> c3212333ae)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch doc/2.x/levels-logback
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 4f2434bcd6 Apply review suggestions (2)
add f56454a88f Fix `flowtracing.adoc` examples (#2662)
add 2658de1ac3 Update `org.apache.maven.surefire:surefire-junit47` to version `3.3.0` (#2669)
add f56fe04539 Update `org.apache.maven:maven-core` to version `3.9.8` (#2668)
add a669c16833 Fix website build broken due to `flowtracing.adoc`
add be863cf901 Improve layout docs on property substitution (#2667)
add 4049815995 Disable reproducibility check on non-critical builds
add 4a1a1455e5 Synchronize OSGi test names with `main`
add 26cc544418 Improve AsciiDoc admonition styling
add be67580367 Upgrade to Maven 3.9.8
add c3212333ae Merge remote-tracking branch 'apache/2.x' into doc/2.x/levels-logback
No new revisions were added by this update.
Summary of changes:
.github/workflows/build.yaml | 1 +
.github/workflows/merge-dependabot.yaml | 1 +
.mvn/wrapper/maven-wrapper.properties | 4 +-
antora-playbook.yaml | 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 | 10 +-
log4j-parent/pom.xml | 4 +-
.../.2.x.x/update_org_apache_maven_maven_core.xml | 4 +-
...org_apache_maven_surefire_surefire_junit47.xml} | 3 +-
src/site/antora/antora.tmpl.yml | 2 +
src/site/antora/antora.yml | 4 +-
.../ROOT/examples/manual/flowtracing/log4j2.json | 43 +++
.../log4j2.properties | 17 +-
.../log4j2.xml | 7 +-
.../log4j2.yaml | 17 +-
.../ROOT/examples/manual/flowtracing/logback.xml | 78 ++++++
.../log4j2.json | 0
.../log4j2.properties | 0
.../log4j2.xml | 0
.../log4j2.yaml | 0
.../property-substitution/log4j2.json | 27 ++
.../log4j2.properties | 6 +-
.../{usage => property-substitution}/log4j2.xml | 7 +-
.../{usage => property-substitution}/log4j2.yaml | 6 +-
src/site/antora/modules/ROOT/pages/faq.adoc | 2 +-
src/site/antora/modules/ROOT/pages/manual/api.adoc | 2 +-
.../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/configuration.adoc | 8 +-
.../antora/modules/ROOT/pages/manual/filters.adoc | 2 +-
.../modules/ROOT/pages/manual/flowtracing.adoc | 305 ++++++++++++---------
.../modules/ROOT/pages/manual/garbagefree.adoc | 4 +-
.../modules/ROOT/pages/manual/getting-started.adoc | 4 +-
.../modules/ROOT/pages/manual/installation.adoc | 11 +-
.../ROOT/pages/manual/json-template-layout.adoc | 155 +++++++++--
.../antora/modules/ROOT/pages/manual/layouts.adoc | 4 -
.../antora/modules/ROOT/pages/manual/lookups.adoc | 1 +
.../modules/ROOT/pages/manual/pattern-layout.adoc | 58 +++-
.../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 +-
.../partials/manual/layouts-gcfree-lookup.adoc | 21 --
.../properties-log4j-core-misc.adoc | 2 +
49 files changed, 614 insertions(+), 256 deletions(-)
copy src/changelog/.2.x.x/{remove_log4j_mongodb3.xml => update_org_apache_maven_surefire_surefire_junit47.xml} (60%)
create mode 100644 src/site/antora/modules/ROOT/examples/manual/flowtracing/log4j2.json
copy src/site/antora/modules/ROOT/examples/manual/{pattern-layout/marker-pattern-selector => flowtracing}/log4j2.properties (61%)
copy src/site/antora/modules/ROOT/examples/manual/{pattern-layout/marker-pattern-selector => flowtracing}/log4j2.xml (81%)
copy src/site/antora/modules/ROOT/examples/manual/{pattern-layout/marker-pattern-selector => flowtracing}/log4j2.yaml (73%)
create mode 100644 src/site/antora/modules/ROOT/examples/manual/flowtracing/logback.xml
rename src/site/antora/modules/ROOT/examples/manual/json-template-layout/{eventTemplateAdditionalField => event-template-additional-field}/log4j2.json (100%)
rename src/site/antora/modules/ROOT/examples/manual/json-template-layout/{eventTemplateAdditionalField => event-template-additional-field}/log4j2.properties (100%)
rename src/site/antora/modules/ROOT/examples/manual/json-template-layout/{eventTemplateAdditionalField => event-template-additional-field}/log4j2.xml (100%)
rename src/site/antora/modules/ROOT/examples/manual/json-template-layout/{eventTemplateAdditionalField => event-template-additional-field}/log4j2.yaml (100%)
create mode 100644 src/site/antora/modules/ROOT/examples/manual/json-template-layout/property-substitution/log4j2.json
copy src/site/antora/modules/ROOT/examples/manual/json-template-layout/{usage => property-substitution}/log4j2.properties (66%)
copy src/site/antora/modules/ROOT/examples/manual/json-template-layout/{usage => property-substitution}/log4j2.xml (79%)
copy src/site/antora/modules/ROOT/examples/manual/json-template-layout/{usage => property-substitution}/log4j2.yaml (76%)
delete mode 100644 src/site/antora/modules/ROOT/partials/manual/layouts-gcfree-lookup.adoc