This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 621288234b88a58aa9567e91c43e7e9fabaffaeb Merge: 4b8a03158c c5420410df Author: Volkan Yazıcı <[email protected]> AuthorDate: Fri Mar 1 18:04:01 2024 +0100 Merge remote-tracking branch 'origin/2.x' into 2.x-docgen .github/workflows/scorecards-analysis.yaml | 2 +- log4j-1.2-api/.log4j-plugin-processing-activator | 1 - log4j-1.2-api/pom.xml | 28 ++++++-- .../log4j/status/StatusLoggerLevelTest.java | 82 +++++++++++++++++++++ .../apache/logging/log4j/status/StatusLogger.java | 21 ++++-- log4j-cassandra/.log4j-plugin-processing-activator | 1 - log4j-cassandra/pom.xml | 26 +++++-- log4j-core-java9/pom.xml | 2 - log4j-core-test/.log4j-plugin-processing-activator | 1 - log4j-core-test/pom.xml | 20 ++++-- log4j-core/pom.xml | 72 +++---------------- .../appender/rolling/action/ScriptCondition.java | 4 +- log4j-couchdb/.log4j-plugin-processing-activator | 1 - log4j-couchdb/pom.xml | 26 +++++-- log4j-docker/.log4j-plugin-processing-activator | 1 - log4j-docker/pom.xml | 32 +++++++-- log4j-flume-ng/.log4j-plugin-processing-activator | 1 - log4j-flume-ng/pom.xml | 29 ++++++-- .../.log4j-plugin-processing-activator | 1 - log4j-jakarta-web/pom.xml | 26 ++++++- .../.log4j-plugin-processing-activator | 1 - log4j-jdbc-dbcp2/pom.xml | 26 +++++-- log4j-jpa/.log4j-plugin-processing-activator | 1 - log4j-jpa/pom.xml | 25 +++++-- log4j-kubernetes/pom.xml | 29 ++++++-- log4j-layout-template-json-test/pom.xml | 17 ++++- .../.log4j-plugin-processing-activator | 1 - log4j-layout-template-json/pom.xml | 40 ++++++++++- log4j-mongodb3/.log4j-plugin-processing-activator | 1 - log4j-mongodb3/pom.xml | 23 ++++-- log4j-mongodb4/.log4j-plugin-processing-activator | 1 - log4j-mongodb4/pom.xml | 23 ++++-- log4j-osgi-test/.log4j-plugin-processing-activator | 1 - log4j-osgi-test/pom.xml | 29 +++++--- log4j-parent/pom.xml | 83 +--------------------- .../.log4j-plugin-processing-activator | 1 - log4j-spring-boot/pom.xml | 29 ++++++-- log4j-web/pom.xml | 27 ++++++- ...verflow.xml => fix_StatusLogger_debug_mode.xml} | 3 +- .../.2.x.x/fix_StatusLogger_instant_formatting.xml | 1 + .../.2.x.x/fix_StatusLogger_stack_overflow.xml | 1 + .../.2.x.x/update_github_codeql_action.xml | 4 +- ..._jakarta_activation_jakarta_activation_api.xml} | 4 +- src/docgen-templates/license.adoc.ftl | 16 ----- src/site/_release-notes/_2.x.x.adoc | 9 ++- src/site/resources/plugin-reference.html | 26 ------- src/site/site.xml | 2 - 47 files changed, 509 insertions(+), 292 deletions(-)
