This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch fuzzing
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit efd670bc1724cb3bf601c96420fd0e22767d9d63
Merge: 7bb87ada90 fa049aa928
Author: Volkan Yazıcı <vol...@yazi.ci>
AuthorDate: Mon Jul 29 13:30:12 2024 +0200
Merge remote-tracking branch 'origin/2.x' into fuzzing
.asf.yaml | 7 +
.github/dependabot.yaml | 44 +-
.github/workflows/build.yaml | 3 +-
.github/workflows/deploy-site.yaml | 2 -
.../workflows/develocity-publish-build-scans.yaml | 38 +
.github/workflows/merge-dependabot.yaml | 3 +-
docs/2.17.0-interpolation.md | 172 --
.../apache/logging/log4j/message/MapMessage.java | 11 +-
.../log4j/message/StructuredDataMessage.java | 2 +-
.../org/apache/logging/log4j/package-info.java | 2 +-
.../lookup/MainInputArgumentsJmxLookupTest.java | 18 +-
log4j-core/pom.xml | 5 +
.../apache/logging/log4j/core/LoggerContext.java | 38 +-
.../core/appender/MemoryMappedFileManager.java | 7 +-
.../log4j/core/appender/TlsSyslogFrame.java | 2 +-
.../core/appender/rolling/action/DeleteAction.java | 10 +-
.../appender/rolling/action/DeletingVisitor.java | 2 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 7 +-
.../logging/log4j/core/impl/ContextData.java | 17 +-
.../org/apache/logging/log4j/core/jmx/Server.java | 7 +-
.../internal/JmxUtil.java} | 36 +-
.../logging/log4j/core/lookup/AbstractLookup.java | 2 +
.../log4j/core/lookup/EnvironmentLookup.java | 4 +-
.../logging/log4j/core/lookup/JavaLookup.java | 4 +-
.../lookup/JmxRuntimeInputArgumentsLookup.java | 7 +-
.../logging/log4j/core/lookup/JndiLookup.java | 3 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 2 +-
.../logging/log4j/core/lookup/LowerLookup.java | 16 +-
.../logging/log4j/core/lookup/MainMapLookup.java | 2 +-
.../log4j/core/lookup/ResourceBundleLookup.java | 4 +-
.../log4j/core/lookup/StructuredDataLookup.java | 12 +-
.../log4j/core/net/Rfc1349TrafficClass.java | 2 +-
.../log4j/core/net/ssl/SslConfiguration.java | 4 +-
.../apache/logging/log4j/core/time/Instant.java | 2 +-
.../logging/log4j/core/time/MutableInstant.java | 2 +-
.../apache/logging/log4j/core/util/TypeUtil.java | 4 +-
.../apache/logging/log4j/docker/DockerLookup.java | 2 +-
.../org/apache/logging/log4j/web/WebLookup.java | 2 +-
.../org/apache/logging/log4j/web/package-info.java | 2 +-
log4j-parent/pom.xml | 22 +-
.../org/apache/logging/log4j/web/package-info.java | 2 +-
pom.xml | 67 +-
src/changelog/.2.x.x/1539_graalvm_friendly.xml | 2 +-
.../.2.x.x/1963_add_logging_to_properties_util.xml | 2 +-
...3_add_logback_throwable_consuming_semantics.xml | 2 +-
src/changelog/.2.x.x/2703_log4j_debug.xml | 2 +-
...380_insufficient_args_in_ParameterFormatter.xml | 2 +-
.../fix_disruptor3_cce.xml} | 6 +-
.../fix_jmx_module_dep.xml} | 6 +-
...pdate_co_elastic_clients_elasticsearch_java.xml | 4 +-
.../.2.x.x/update_com_github_luben_zstd_jni.xml | 4 +-
.../.2.x.x/update_commons_codec_commons_codec.xml | 4 +-
..._flapdoodle_embed_de_flapdoodle_embed_mongo.xml | 4 +-
...e_flapdoodle_reverse_de_flapdoodle_reverse.xml} | 4 +-
src/changelog/.2.x.x/update_io_netty_netty_bom.xml | 4 +-
.../update_net_javacrumbs_json_unit_json_unit.xml | 4 +-
...=> update_org_apache_commons_commons_lang3.xml} | 4 +-
.../update_org_apache_kafka_kafka_clients.xml | 4 +-
..._org_apache_maven_surefire_surefire_junit47.xml | 4 +-
.../.2.x.x/update_org_assertj_assertj_core.xml | 4 +-
src/changelog/2.0.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.0.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.10.0/.release-notes.adoc.ftl | 7 +-
src/changelog/2.11.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.11.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.11.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.12.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.12.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.13.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.13.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.13.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.13.3/.release-notes.adoc.ftl | 3 +-
src/changelog/2.14.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.14.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.15.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.16.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.17.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.17.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.17.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.18.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.19.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.20.0/.release-notes.adoc.ftl | 3 +-
.../2.20.0/1202_disableAnsi_spurious_warning.xml | 2 +-
.../1274_fix_RewriteAppender_requiresLocation.xml | 2 +-
src/changelog/2.21.0/.release-notes.adoc.ftl | 8 +-
.../1281_remove_locale-dependent_toLowerCase.xml | 2 +-
.../2.21.0/1284_redirect_old_javadoc_urls.xml | 2 +-
.../2.21.0/1312_add_environment_arbiter.xml | 2 +-
src/changelog/2.21.0/1366_fix_java_sql_date.xml | 2 +-
.../2.21.0/1369_bump_build_requirement_jdk_11.xml | 2 +-
...tringResolver_uses_instance_after_recycling.xml | 2 +-
..._fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml | 2 +-
...5_fix_DatePatternConverter_when_TL_disabled.xml | 2 +-
.../2.21.0/1533_set_fqcn_eventbuilder.xml | 2 +-
.../2.21.0/1550_multiple_filter_invocations.xml | 2 +-
.../2.21.0/1681_fix_and_improve_lookup_docs.xml | 2 +-
.../2.21.0/update-1runtime-angus-activation.xml | 2 +-
.../2.21.0/update-1runtime-angus-mail.xml | 2 +-
.../2.21.0/update-1runtime-cassandra-driver.xml | 2 +-
src/changelog/2.21.0/update-1runtime-cassandra.xml | 2 +-
.../2.21.0/update-1runtime-commons-compress.xml | 2 +-
.../2.21.0/update-1runtime-commons-csv.xml | 2 +-
src/changelog/2.21.0/update-1runtime-jackson.xml | 2 +-
.../2.21.0/update-1runtime-jakarta-activation.xml | 2 +-
.../2.21.0/update-1runtime-jakarta-mail.xml | 2 +-
src/changelog/2.21.0/update-1runtime-jctools.xml | 2 +-
src/changelog/2.21.0/update-1runtime-kafka.xml | 2 +-
.../2.21.0/update-1runtime-kubernetes.xml | 2 +-
src/changelog/2.21.0/update-1runtime-mongodb.xml | 2 +-
src/changelog/2.21.0/update-1runtime-netty.xml | 2 +-
.../2.21.0/update-1runtime-spring-boot.xml | 2 +-
.../2.21.0/update-1runtime-spring-framework.xml | 2 +-
.../2.21.0/update-1runtime-tomcat-juli.xml | 2 +-
src/changelog/2.21.0/update-1runtime-woodstox.xml | 2 +-
src/changelog/2.21.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.22.0/.release-notes.adoc.ftl | 6 +-
.../2.22.0/change_basic_auth_encoding.xml | 2 +-
.../2.22.1/fix_NPE_in_closeable_thread_context.xml | 2 +-
src/changelog/2.22.1/fix_create_parent_dir.xml | 2 +-
.../2.22.1/fix_log4j_to_slf4j_descriptor.xml | 2 +-
src/changelog/2.22.1/java_17.xml | 2 +-
src/changelog/2.22.1/workaround_coursier_bug.xml | 2 +-
src/changelog/2.23.0/2282_fix_1_2_set_level.xml | 2 +-
src/changelog/2.23.0/2282_fix_jul_set_level.xml | 2 +-
.../2.23.0/add_support_for_disruptor_4.xml | 2 +-
.../2.23.0/fix_spring_cloud_config_client_deps.xml | 2 +-
.../2309_fix_logger_context_aware_lookups.xml | 2 +-
.../2.23.1/2346_unix_millis_data_pattern.xml | 2 +-
src/changelog/2.3/.release-notes.adoc.ftl | 3 +-
src/changelog/2.4.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.4/.release-notes.adoc.ftl | 3 +-
src/changelog/2.5/.release-notes.adoc.ftl | 3 +-
src/changelog/2.6.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.6.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.6/.release-notes.adoc.ftl | 3 +-
src/changelog/2.7/.release-notes.adoc.ftl | 3 +-
src/changelog/2.8.1/.release-notes.adoc.ftl | 3 +-
src/changelog/2.8.2/.release-notes.adoc.ftl | 3 +-
src/changelog/2.8/.release-notes.adoc.ftl | 3 +-
src/changelog/2.9.0/.release-notes.adoc.ftl | 3 +-
src/changelog/2.9.1/.release-notes.adoc.ftl | 3 +-
src/site/antora/antora.tmpl.yml | 3 +-
src/site/antora/antora.yml | 3 +-
.../examples/manual/lookups/MainArgsExample.java | 42 +-
.../ROOT/examples/manual/lookups/mainArgs.json | 31 +
.../examples/manual/lookups/mainArgs.properties | 29 +
.../ROOT/examples/manual/lookups/mainArgs.xml | 36 +
.../ROOT/examples/manual/lookups/mainArgs.yaml | 33 +
.../examples/manual/rolling-file/logrotate.json | 33 +
.../manual/rolling-file/logrotate.properties | 41 +
.../examples/manual/rolling-file/logrotate.xml | 42 +
.../examples/manual/rolling-file/logrotate.yaml | 37 +
.../examples/manual/rolling-file/per-month.json | 31 +
.../manual/rolling-file/per-month.properties | 38 +
.../examples/manual/rolling-file/per-month.xml | 43 +
.../examples/manual/rolling-file/per-month.yaml | 36 +
.../examples/manual/rolling-file/policies.json | 27 +
.../manual/rolling-file/policies.properties | 33 +
.../ROOT/examples/manual/rolling-file/policies.xml | 42 +
.../examples/manual/rolling-file/policies.yaml | 34 +
.../manual/rolling-file/script-condition.groovy | 46 +-
.../manual/rolling-file/script-condition.json | 33 +
.../rolling-file/script-condition.properties | 37 +
.../manual/rolling-file/script-condition.xml | 45 +
.../manual/rolling-file/script-condition.yaml | 36 +
.../examples/manual/rolling-file/timestamped.json | 33 +
.../manual/rolling-file/timestamped.properties | 40 +
.../examples/manual/rolling-file/timestamped.xml | 43 +
.../examples/manual/rolling-file/timestamped.yaml | 37 +
src/site/antora/modules/ROOT/nav.adoc | 17 +-
.../antora/modules/ROOT/pages/development.adoc | 14 +-
src/site/antora/modules/ROOT/pages/download.adoc | 6 +-
src/site/antora/modules/ROOT/pages/faq.adoc | 8 +-
src/site/antora/modules/ROOT/pages/hibernate.adoc | 2 +-
src/site/antora/modules/ROOT/pages/index.adoc | 2 +-
src/site/antora/modules/ROOT/pages/jakarta.adoc | 16 +-
.../antora/modules/ROOT/pages/log4j-docker.adoc | 2 +-
.../antora/modules/ROOT/pages/log4j-iostreams.adoc | 6 +-
src/site/antora/modules/ROOT/pages/manual/api.adoc | 6 +-
.../modules/ROOT/pages/manual/appenders.adoc | 1443 +++--------------
.../modules/ROOT/pages/manual/architecture.adoc | 4 +-
.../modules/ROOT/pages/manual/configuration.adoc | 67 +-
.../modules/ROOT/pages/manual/customloglevels.adoc | 16 +-
.../modules/ROOT/pages/manual/installation.adoc | 12 +-
.../ROOT/pages/manual/json-template-layout.adoc | 25 +-
.../antora/modules/ROOT/pages/manual/layouts.adoc | 6 +-
.../antora/modules/ROOT/pages/manual/logsep.adoc | 116 --
.../antora/modules/ROOT/pages/manual/lookups.adoc | 1236 ++++++++------
.../antora/modules/ROOT/pages/manual/messages.adoc | 4 +-
.../modules/ROOT/pages/manual/pattern-layout.adoc | 23 +-
.../antora/modules/ROOT/pages/manual/plugins.adoc | 12 +-
.../modules/ROOT/pages/manual/rolling-file.adoc | 1710 ++++++++++++++++++++
.../ROOT/pages/manual/systemproperties.adoc | 6 +-
.../modules/ROOT/pages/manual/thread-context.adoc | 6 +-
.../modules/ROOT/pages/migrate-from-log4j1.adoc | 28 +-
src/site/antora/modules/ROOT/pages/soa.adoc | 3 +-
.../antora/modules/ROOT/partials/concepts.adoc | 2 +-
.../modules/ROOT/partials/log4j-features.adoc | 6 +-
.../manual/dependencies-log4j-docker.adoc} | 26 +-
.../manual/dependencies-log4j-spring-boot.adoc} | 28 +-
.../systemproperties/properties-async-logger.adoc | 4 +-
.../manual/systemproperties/properties-meta.adoc | 3 +-
.../systemproperties/properties-status-logger.adoc | 2 +-
src/site/resources/.htaccess | 1 +
207 files changed, 4204 insertions(+), 2515 deletions(-)
diff --cc log4j-parent/pom.xml
index 47fbec8bf2,fa749a730c..24dfd22191
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@@ -120,10 -118,9 +120,10 @@@
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<junit-pioneer.version>1.9.1</junit-pioneer.version>
- <kafka.version>3.7.1</kafka.version>
+ <kafka.version>3.8.0</kafka.version>
<lightcouch.version>0.2.0</lightcouch.version>
<log4j.version>1.2.17</log4j.version>
+ <log4j-transform.version>0.1.0</log4j-transform.version>
<log4j2-cachefile-transformer.version>2.15.0</log4j2-cachefile-transformer.version>
<log4j2-ecs-layout.version>1.6.0</log4j2-ecs-layout.version>
<logback.version>1.3.14</logback.version>
