This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch fix/issue-4166
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 2f8a9eeb7e enhance: update documentation and validation for literal
key filtering in ReadOnlyStringMapResolver
add 6d4460755e Bump org.slf4j:slf4j-nop from 2.0.17 to 2.0.18 in
/log4j-mongodb4 in the dependencies group across 1 directory (#4139)
add 9ce46c1765 Bump actions/stale from 10.2.0 to 10.3.0 in the
dependencies group across 1 directory (#4137)
add 6bfe2359ed Update Dependabot configuration to handle WireMock 3.x
changes (#4192)
add b21bb32331 Open separate Dependabot PRs for major version updates
(#4200)
add de17f604c2 Fix NPE in ConfigurationScheduler by ensuring
scheduledFuture is chec… (#4118)
add 516e85bdbe Fix properties configuration support for per-logger
properties (#4142)
add dff7bfa261 Bump the maven-minor-updates group with 47 updates (#4206)
add acac6dd39c Align NOTICE files and drop redundant LICENSE resources
(#4170)
add 359ee520e3 Revamp XML configuration testing and documentation (#4155)
add 95888415f6 Pin snapshot reproducibility checks to the deployed
artifacts (#4215)
add 04c93c1d33 Split `integration-test` into per-deployment jobs (#4216)
add 246fc76eea fix: `InstantPatternLegacyFormatter` precision for legacy
`n` patterns (#4220)
add c59b0562e6 Add log4j-api-kotlin dependency to BOM (#4222)
add 494f26c71c Fix NPE in PluginElementVisitor when handling unresolved
child elements (#4250)
add 3c60ae0c04 Fix exceptions in the JMX integration (#4185)
add bf873ae58e Extend plugin processor message filtering and add `[Log4j]`
prefixes (#4228)
add ef6ebfbfc8 fix: close streams in
`LoggerContextAdmin::setConfigLocationUri` (#4218)
add ecf1f41c99 Change `build` and `codeql-analysis` triggers (#4212)
add 668c0ccaa3 Fix Log4j1SyslogLayout builder javadoc attributes (#4239)
add abcb38f9cc fix: treat null parameters as empty in `CsvParameterLayout`
(#4245)
add a4364da103 Fix date format from `mm` to `MM` in pattern layout (#4257)
add a8705789e1 Merge branch '2.x' into fix/issue-4166
No new revisions were added by this update.
Summary of changes:
.github/dependabot.yaml | 38 ++-
.github/workflows/build.yaml | 50 ++--
.github/workflows/close-stale.yaml | 2 +-
.github/workflows/codeql-analysis.yaml | 14 +-
NOTICE.txt | 4 +-
.../org/apache/log4j/jmx/AppenderDynamicMBean.java | 8 +
.../org/apache/log4j/jmx/LoggerDynamicMBean.java | 8 +-
.../apache/log4j/layout/Log4j1SyslogLayout.java | 11 +-
.../apache/log4j/jmx/AppenderDynamicMBeanTest.java | 83 ++++++
.../apache/log4j/jmx/LoggerDynamicMBeanTest.java | 102 +++++++
log4j-cassandra/pom.xml | 2 +-
log4j-core-its/pom.xml | 2 +-
log4j-core-test/pom.xml | 2 +-
.../src/{test => main}/resources/META-INF/NOTICE | 4 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 131 ---------
.../core/config/ConfigurationSchedulerTest.java | 83 ++++++
.../plugins/processor/GraalVmProcessorTest.java | 60 +++-
.../processor/PluginProcessorPublicSetterTest.java | 10 +-
.../properties/PropertiesConfigurationTest.java | 42 +++
.../XmlConfigurationConstructHierarchyTest.java | 307 +++++++++++++++++++++
...LoggerContextAdminSetConfigLocationUriTest.java | 134 +++++++++
.../log4j/core/layout/CsvParameterLayoutTest.java | 16 ++
.../core/pattern/NamedInstantPatternTest.java | 1 +
...InstantPatternLegacyFormatterPrecisionTest.java | 60 ++++
.../src/test/resources/META-INF/LICENSE | 202 --------------
.../included-fragment.xml} | 7 +-
.../included-with-id.xml} | 12 +-
.../included.xml} | 3 +-
.../nested.xml | 10 +-
.../src/test/resources/log4j-strict1.xml | 65 -----
.../test/resources/log4j2-properties.properties | 8 +
.../resources/log4j2-unresolved-layout.properties | 14 +-
.../log4j/core/config/ConfigurationScheduler.java | 32 ++-
.../config/plugins/processor/GraalVmProcessor.java | 50 +++-
.../config/plugins/processor/PluginProcessor.java | 26 +-
.../plugins/visitors/PluginElementVisitor.java | 4 +
.../properties/PropertiesConfigurationBuilder.java | 7 +-
.../log4j/core/config/xml/XmlConfiguration.java | 61 +---
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 24 +-
.../log4j/core/layout/CsvParameterLayout.java | 3 +-
.../instant/InstantPatternLegacyFormatter.java | 5 +-
log4j-core/src/main/resources/META-INF/LICENSE | 202 --------------
log4j-core/src/main/resources/META-INF/NOTICE | 13 +-
log4j-layout-template-json-test/pom.xml | 2 +-
log4j-mongodb/pom.xml | 4 +-
log4j-mongodb4/pom.xml | 2 +-
log4j-parent/pom.xml | 66 ++---
log4j-perf-test/pom.xml | 2 +-
log4j-slf4j2-impl/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
pom.xml | 18 +-
.../2073_fix_ConfigurationScheduler_NPE.xml} | 8 +-
.../3816_legacy_instant_pattern_precision.xml} | 7 +-
...onfiguration_support_for_logger_properties.xml} | 6 +-
.../4145_add_log4j_api_kotlin_to_bom.xml} | 4 +-
.../4185_fix_jmx_mbean_npe.xml} | 5 +-
...tion.xml => 4225_plugin_processor_messages.xml} | 5 +-
...243_fix_CsvParameterLayout_null_parameters.xml} | 5 +-
.../4248_fix_plugin_element_visitor_array_npe.xml} | 7 +-
...ix_logger_context_admin_config_stream_leak.xml} | 4 +-
src/changelog/.2.x.x/update_actions_stale.xml | 4 +-
...ate_biz.aqute.bnd_biz.aqute.bnd.annotation.xml} | 4 +-
...date_co.elastic.clients_elasticsearch-java.xml} | 4 +-
...pdate_co.elastic.logging_log4j2-ecs-layout.xml} | 4 +-
...=> update_com.code-intelligence_jazzer-api.xml} | 4 +-
...xml => update_com.code-intelligence_jazzer.xml} | 4 +-
.../update_com.fasterxml.jackson_jackson-bom.xml} | 4 +-
...stale.xml => update_com.github.jnr_jnr-ffi.xml} | 4 +-
...-instrumenter_java-allocation-instrumenter.xml} | 4 +-
....google.errorprone_error_prone_annotations.xml} | 6 +-
...l => update_com.google.guava_guava-testlib.xml} | 4 +-
.../update_com.google.guava_guava.xml} | 4 +-
.../update_commons-codec_commons-codec.xml} | 4 +-
.../update_commons-io_commons-io.xml} | 4 +-
.../update_commons-logging_commons-logging.xml} | 4 +-
.../update_io.fabric8_docker-maven-plugin.xml} | 4 +-
..._jakarta.activation_jakarta.activation-api.xml} | 4 +-
.../update_jakarta.mail_jakarta.mail-api.xml} | 4 +-
...s_stale.xml => update_net.java.dev.jna_jna.xml} | 4 +-
.../update_org.apache.activemq_activemq-broker.xml | 4 +-
...update_org.apache.commons_commons-compress.xml} | 4 +-
.../update_org.apache.commons_commons-csv.xml} | 4 +-
.../update_org.apache.commons_commons-dbcp2.xml} | 4 +-
.../update_org.apache.commons_commons-lang3.xml} | 4 +-
.../update_org.apache.commons_commons-pool2.xml} | 4 +-
....xml => update_org.apache.maven_maven-core.xml} | 4 +-
...xml => update_org.apache.maven_maven-model.xml} | 4 +-
...ale.xml => update_org.assertj_assertj-core.xml} | 4 +-
... => update_org.bouncycastle_bcpkix-jdk18on.xml} | 4 +-
... => update_org.codehaus.woodstox_stax2-api.xml} | 4 +-
.../update_org.eclipse.angus_angus-activation.xml} | 4 +-
.../update_org.eclipse.angus_jakarta.mail.xml} | 4 +-
...date_org.eclipse.platform_org.eclipse.osgi.xml} | 4 +-
...ticsearch.client_elasticsearch-rest-client.xml} | 4 +-
...radlex_gradle-module-metadata-maven-plugin.xml} | 4 +-
.../update_org.jctools_jctools-core.xml} | 4 +-
.../update_org.jmdns_jmdns.xml} | 4 +-
...ate_org.junit.jupiter_junit-jupiter-engine.xml} | 4 +-
.../update_org.junit_junit-bom.xml} | 4 +-
.../update_org.mongodb_bson.xml} | 4 +-
... => update_org.mongodb_mongodb-driver-core.xml} | 4 +-
... => update_org.mongodb_mongodb-driver-sync.xml} | 4 +-
...=> update_org.openjdk.nashorn_nashorn-core.xml} | 4 +-
.../update_org.slf4j_slf4j-api.xml} | 4 +-
...ns_stale.xml => update_org.slf4j_slf4j-nop.xml} | 4 +-
.../update_org.tukaani_xz.xml} | 4 +-
...ale.xml => update_org.xmlunit_xmlunit-core.xml} | 4 +-
.../update_org.xmlunit_xmlunit-matchers.xml} | 6 +-
...-encoding.xml => xinclude_fixup_attributes.xml} | 4 +-
...penders.xml => xinclude-xpointer-appenders.xml} | 5 +
...include-main.xml => xinclude-xpointer-main.xml} | 7 +-
.../modules/ROOT/pages/manual/configuration.adoc | 62 +----
.../modules/ROOT/pages/manual/pattern-layout.adoc | 2 +-
.../antora/modules/ROOT/pages/manual/plugins.adoc | 6 +-
.../partials/manual/configuration-xml-format.adoc | 111 ++++++++
115 files changed, 1460 insertions(+), 1004 deletions(-)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/jmx/AppenderDynamicMBeanTest.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/jmx/LoggerDynamicMBeanTest.java
rename log4j-core-test/src/{test => main}/resources/META-INF/NOTICE (68%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/ConfigurationSchedulerTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationConstructHierarchyTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminSetConfigLocationUriTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternLegacyFormatterPrecisionTest.java
delete mode 100644 log4j-core-test/src/test/resources/META-INF/LICENSE
copy log4j-core-test/src/test/resources/{log4j2-stringmatchfilter-3153-nok.xml
=> XmlConfigurationConstructHierarchyTest/included-fragment.xml} (91%)
copy log4j-core-test/src/test/resources/{log4j2-stringmatchfilter-3153-ok.xml
=> XmlConfigurationConstructHierarchyTest/included-with-id.xml} (81%)
copy log4j-core-test/src/test/resources/{log4j-empty.xml =>
XmlConfigurationConstructHierarchyTest/included.xml} (93%)
copy
src/site/antora/modules/ROOT/examples/manual/configuration/xinclude-appenders.xml
=>
log4j-core-test/src/test/resources/XmlConfigurationConstructHierarchyTest/nested.xml
(81%)
delete mode 100644 log4j-core-test/src/test/resources/log4j-strict1.xml
copy log4j-1.2-api/src/test/resources/config-1.2/log4j-NullAppender.properties
=> log4j-core-test/src/test/resources/log4j2-unresolved-layout.properties (77%)
delete mode 100644 log4j-core/src/main/resources/META-INF/LICENSE
copy src/changelog/{2.25.2/3828_fix_log_placeholder_mismatch.xml =>
.2.x.x/2073_fix_ConfigurationScheduler_NPE.xml} (56%)
copy
src/changelog/{2.10.0/LOG4J2-2091_Log4j_respects_the_configured_log4j2_is_webapp_property.xml
=> .2.x.x/3816_legacy_instant_pattern_precision.xml} (59%)
copy src/changelog/{2.25.2/3872_fix_RollingFileManager_initialTime.xml =>
.2.x.x/4024_fix_roperties_configuration_support_for_logger_properties.xml} (56%)
copy src/changelog/{2.26.0/rfc5424-setters.xml =>
.2.x.x/4145_add_log4j_api_kotlin_to_bom.xml} (60%)
copy src/changelog/{2.26.0/rfc5424-setters.xml =>
.2.x.x/4185_fix_jmx_mbean_npe.xml} (71%)
copy src/changelog/.2.x.x/{harden_message_deserialization.xml =>
4225_plugin_processor_messages.xml} (54%)
copy src/changelog/{2.25.1/3706_disruptor-tccl.xml =>
.2.x.x/4243_fix_CsvParameterLayout_null_parameters.xml} (56%)
copy src/changelog/{2.25.1/3706_disruptor-tccl.xml =>
.2.x.x/4248_fix_plugin_element_visitor_array_npe.xml} (57%)
copy src/changelog/{2.21.0/1312_add_environment_arbiter.xml =>
.2.x.x/fix_logger_context_admin_config_stream_leak.xml} (72%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_biz.aqute.bnd_biz.aqute.bnd.annotation.xml} (60%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_co.elastic.clients_elasticsearch-java.xml} (60%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_co.elastic.logging_log4j2-ecs-layout.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_com.code-intelligence_jazzer-api.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_com.code-intelligence_jazzer.xml} (61%)
copy src/changelog/{2.22.0/update_com_fasterxml_jackson_jackson_bom.xml =>
.2.x.x/update_com.fasterxml.jackson_jackson-bom.xml} (74%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_com.github.jnr_jnr-ffi.xml} (62%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_com.google.code.java-allocation-instrumenter_java-allocation-instrumenter.xml}
(56%)
copy
src/changelog/{2.5/LOG4J2-898_Added_system_property_to_allow_users_to_control_whether_mess.xml
=> .2.x.x/update_com.google.errorprone_error_prone_annotations.xml} (62%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_com.google.guava_guava-testlib.xml} (61%)
copy src/changelog/{2.22.1/update_com_google_guava_guava.xml =>
.2.x.x/update_com.google.guava_guava.xml} (75%)
copy src/changelog/{2.22.1/update_commons_codec_commons_codec.xml =>
.2.x.x/update_commons-codec_commons-codec.xml} (75%)
copy src/changelog/{2.22.1/update_commons_io_commons_io.xml =>
.2.x.x/update_commons-io_commons-io.xml} (76%)
copy src/changelog/{2.22.1/update_commons_logging_commons_logging.xml =>
.2.x.x/update_commons-logging_commons-logging.xml} (74%)
copy src/changelog/{2.24.0/update_io_fabric8_docker_maven_plugin.xml =>
.2.x.x/update_io.fabric8_docker-maven-plugin.xml} (74%)
copy
src/changelog/{2.23.1/update_jakarta_activation_jakarta_activation_api.xml =>
.2.x.x/update_jakarta.activation_jakarta.activation-api.xml} (73%)
copy src/changelog/{2.23.1/update_jakarta_mail_jakarta_mail_api.xml =>
.2.x.x/update_jakarta.mail_jakarta.mail-api.xml} (75%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_net.java.dev.jna_jna.xml} (62%)
copy src/changelog/{2.22.1/update_org_apache_commons_commons_compress.xml =>
.2.x.x/update_org.apache.commons_commons-compress.xml} (74%)
copy src/changelog/{2.24.0/update_org_apache_commons_commons_csv.xml =>
.2.x.x/update_org.apache.commons_commons-csv.xml} (74%)
copy src/changelog/{2.23.1/update_org_apache_commons_commons_dbcp2.xml =>
.2.x.x/update_org.apache.commons_commons-dbcp2.xml} (74%)
copy src/changelog/{2.23.1/update_org_apache_commons_commons_dbcp2.xml =>
.2.x.x/update_org.apache.commons_commons-lang3.xml} (74%)
copy src/changelog/{2.23.1/update_org_apache_commons_commons_dbcp2.xml =>
.2.x.x/update_org.apache.commons_commons-pool2.xml} (74%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.apache.maven_maven-core.xml} (62%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.apache.maven_maven-model.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.assertj_assertj-core.xml} (62%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.bouncycastle_bcpkix-jdk18on.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.codehaus.woodstox_stax2-api.xml} (61%)
copy src/changelog/{2.23.1/update_org_eclipse_angus_angus_activation.xml =>
.2.x.x/update_org.eclipse.angus_angus-activation.xml} (74%)
copy src/changelog/{2.23.1/update_org_eclipse_angus_jakarta_mail.xml =>
.2.x.x/update_org.eclipse.angus_jakarta.mail.xml} (75%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.eclipse.platform_org.eclipse.osgi.xml} (60%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.elasticsearch.client_elasticsearch-rest-client.xml} (59%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.gradlex_gradle-module-metadata-maven-plugin.xml} (59%)
copy src/changelog/{2.22.1/update_org_jctools_jctools_core.xml =>
.2.x.x/update_org.jctools_jctools-core.xml} (75%)
copy src/changelog/{2.25.0/update_org_jmdns_jmdns.xml =>
.2.x.x/update_org.jmdns_jmdns.xml} (77%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.junit.jupiter_junit-jupiter-engine.xml} (60%)
copy src/changelog/{2.26.0/update_org_junit_junit_bom.xml =>
.2.x.x/update_org.junit_junit-bom.xml} (76%)
copy src/changelog/{2.25.0/update_org_mongodb_bson.xml =>
.2.x.x/update_org.mongodb_bson.xml} (77%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.mongodb_mongodb-driver-core.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.mongodb_mongodb-driver-sync.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.openjdk.nashorn_nashorn-core.xml} (61%)
copy src/changelog/{2.24.0/update_org_slf4j_slf4j_api.xml =>
.2.x.x/update_org.slf4j_slf4j-api.xml} (76%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.slf4j_slf4j-nop.xml} (63%)
copy src/changelog/{2.25.0/update_actions_stale.xml =>
.2.x.x/update_org.tukaani_xz.xml} (64%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.xmlunit_xmlunit-core.xml} (62%)
copy src/changelog/{2.24.0/add_GcpLayout_tracing_support.xml =>
.2.x.x/update_org.xmlunit_xmlunit-matchers.xml} (62%)
copy src/changelog/.2.x.x/{fix-StructuredDataMessage-XML-encoding.xml =>
xinclude_fixup_attributes.xml} (65%)
copy
src/site/antora/modules/ROOT/examples/manual/configuration/{xinclude-appenders.xml
=> xinclude-xpointer-appenders.xml} (84%)
copy
src/site/antora/modules/ROOT/examples/manual/configuration/{xinclude-main.xml
=> xinclude-xpointer-main.xml} (83%)
create mode 100644
src/site/antora/modules/ROOT/partials/manual/configuration-xml-format.adoc
