This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch
dependabot/maven/2.x/org.springframework.cloud-spring-cloud-context-5.0.2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from e2bdef9b5a Merge branch '2.x' into
dependabot/maven/2.x/org.springframework.cloud-spring-cloud-context-5.0.2
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 c64ef11a41 Add missing RootLogger.Builder withFilter alias (#4224)
add 33c8236d88 docs: Routing Appender security considerations for
high-cardinality keys (#4217)
add 4ce9212cd3 resolve external entities through ConfigurationSource in
log4j 1.x XmlConfiguration (#4198)
add 466f98f471 Catch `LinkageError` in
`ThrowableExtendedStackTraceRenderer#loadClass` (#4028) (#4049)
add d1f9355a55 Fix startup delay and direct write file naming in
CronTriggeringPolicy (#4226)
add c685326e6d Deprecate externalContext and migrate to Map-backed
getObject/putObject (#4070)
add 4606de451b Fix handling of `onMatch` and `onMismatch` attributes in
the properties configuration format (#4116)
add 9f3b57983e Fix circular references in exceptions (#4249)
add 008f69bd29 Switches from `protected_branches` to `rulesets` (#4095)
add 1ca70aabfa Remove the unused Maven and Plexus dependencies of the test
modules (#4281)
add 3711ee3f6a Add Dependabot configuration for `2.25.x` and rename update
groups (#4284)
add dd04ae859e Bump the maven-minor-2-x group with 16 updates (#4291)
add ded9666696 Bump actions/stale from 10.3.0 to 11.0.0 in the
actions-all-2-x group (#4289)
add 12522eb408 Merge branch '2.x' into
dependabot/maven/2.x/org.springframework.cloud-spring-cloud-context-5.0.2
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 59 +-
.github/dependabot.yaml | 45 +-
.github/workflows/build.yaml | 50 +-
.github/workflows/close-stale.yaml | 2 +-
.github/workflows/codeql-analysis.yaml | 14 +-
.github/workflows/process-dependabot.yaml | 10 +-
NOTICE.txt | 4 +-
.../log4j/config/Log4j1ConfigurationConverter.java | 4 +-
.../log4j/config/Log4j1ConfigurationFactory.java | 3 +-
.../log4j/config/Log4j1ConfigurationParser.java | 39 +-
.../org/apache/log4j/jmx/AppenderDynamicMBean.java | 8 +
.../org/apache/log4j/jmx/LoggerDynamicMBean.java | 8 +-
.../apache/log4j/layout/Log4j1SyslogLayout.java | 11 +-
.../org/apache/log4j/xml/Log4jEntityResolver.java | 28 +-
.../config/XmlConfigurationExternalEntityTest.java | 99 +++
.../apache/log4j/jmx/AppenderDynamicMBeanTest.java | 83 ++
.../apache/log4j/jmx/LoggerDynamicMBeanTest.java | 102 +++
log4j-api-test/pom.xml | 21 +-
.../logging/log4j/test/junit/BundleTestInfo.java | 68 --
.../logging/log4j/test/junit/package-info.java | 3 +
.../apache/logging/log4j/spi/LoggerContext.java | 2 +
log4j-cassandra/pom.xml | 20 +-
.../log4j/core/fuzz/PatternLayoutFuzzer.java | 2 +-
log4j-core-java9/pom.xml | 5 -
log4j-core-test/pom.xml | 12 -
.../src/{test => main}/resources/META-INF/NOTICE | 4 +-
.../src/test/java/foo/TestFriendlyException.java | 74 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 6 +-
.../logging/log4j/core/LoggerContextTest.java | 20 +
.../logging/log4j/core/StrictXmlConfigTest.java | 131 ----
.../core/appender/ReconfigureAppenderTest.java | 11 +-
.../core/appender/SocketAppenderReconnectTest.java | 46 +-
.../SocketAppenderSslSocketOptionsTest.java | 56 +-
.../appender/nosql/NoSqlDatabaseManagerTest.java | 25 +
.../appender/rolling/CronTriggeringPolicyTest.java | 38 +
.../RollingFileAppenderInterruptedThreadTest.java | 13 +-
.../rolling/RollingFileAppenderUpdateDataTest.java | 25 +-
.../async/AsyncWaitStrategyFactoryConfigTest.java | 7 +-
.../log4j/core/config/Configurator1Test.java | 64 +-
.../log4j/core/config/LoggerConfigTest.java | 16 +
.../log4j/core/config/MissingLanguageTest.java | 23 +-
.../logging/log4j/core/config/NoLanguagesTest.java | 23 +-
.../config/builder/ConfigurationAssemblerTest.java | 4 +-
.../config/builder/ConfigurationBuilderTest.java | 24 +-
.../config/builder/CustomConfigurationFactory.java | 21 +-
.../builder/impl/DefaultComponentBuilderTest.java | 290 +++++++
.../plugins/processor/GraalVmProcessorTest.java | 60 +-
.../processor/PluginProcessorPublicSetterTest.java | 10 +-
.../properties/PropertiesConfigurationTest.java | 52 ++
.../XmlConfigurationConstructHierarchyTest.java | 307 ++++++++
...LoggerContextAdminSetConfigLocationUriTest.java | 134 ++++
.../log4j/core/layout/CsvParameterLayoutTest.java | 16 +
.../ExtendedThrowablePatternConverterTest.java | 51 ++
.../core/pattern/MessagePatternConverterTest.java | 17 +-
.../core/pattern/NamedInstantPatternTest.java | 1 +
.../pattern/RootThrowablePatternConverterTest.java | 3 +
.../pattern/ThrowablePatternConverterTest.java | 5 +-
.../log4j/core/util/CronExpressionTest.java | 23 +
.../logging/log4j/core/util/ThrowablesTest.java | 9 +
...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 --
...j2-properties-filter-attribute-case.properties} | 25 +-
.../resources/log4j2-unresolved-layout.properties | 14 +-
.../apache/logging/log4j/core/LoggerContext.java | 12 +-
.../core/appender/nosql/NoSqlDatabaseManager.java | 10 +-
.../appender/rolling/CronTriggeringPolicy.java | 5 +-
.../rolling/DirectWriteRolloverStrategy.java | 2 -
.../logging/log4j/core/config/LoggerConfig.java | 8 +
.../builder/api/AppenderComponentBuilder.java | 32 +-
.../builder/api/AppenderRefComponentBuilder.java | 57 +-
.../log4j/core/config/builder/api/Component.java | 71 +-
.../core/config/builder/api/ComponentBuilder.java | 185 ++++-
.../config/builder/api/ConfigurationBuilder.java | 647 +++++++++------
.../builder/api/ConfigurationBuilderFactory.java | 18 +-
.../builder/api/CustomLevelComponentBuilder.java | 24 +-
.../config/builder/api/FilterComponentBuilder.java | 71 +-
.../builder/api/FilterableComponentBuilder.java | 12 +-
.../builder/api/KeyValuePairComponentBuilder.java | 42 +-
.../config/builder/api/LayoutComponentBuilder.java | 10 +-
.../builder/api/LoggableComponentBuilder.java | 70 +-
.../config/builder/api/LoggerComponentBuilder.java | 38 +-
.../builder/api/PropertyComponentBuilder.java | 10 +-
.../builder/api/RootLoggerComponentBuilder.java | 11 +-
.../config/builder/api/ScriptComponentBuilder.java | 42 +-
.../builder/api/ScriptFileComponentBuilder.java | 129 ++-
.../core/config/builder/api/package-info.java | 4 +-
.../config/builder/impl/BuiltConfiguration.java | 221 +++---
.../impl/DefaultAppenderComponentBuilder.java | 35 +-
.../impl/DefaultAppenderRefComponentBuilder.java | 22 +-
.../DefaultComponentAndConfigurationBuilder.java | 64 +-
.../builder/impl/DefaultComponentBuilder.java | 192 ++++-
.../DefaultCompositeFilterComponentBuilder.java | 28 +-
.../builder/impl/DefaultConfigurationBuilder.java | 870 ++++++++++++++-------
.../impl/DefaultCustomLevelComponentBuilder.java | 23 +-
.../impl/DefaultFilterComponentBuilder.java | 27 +-
.../impl/DefaultKeyValuePairComponentBuilder.java | 20 +-
.../impl/DefaultLayoutComponentBuilder.java | 21 +-
.../impl/DefaultLoggerComponentBuilder.java | 91 +--
.../impl/DefaultPropertyComponentBuilder.java | 25 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 79 +-
.../impl/DefaultScriptComponentBuilder.java | 30 +-
.../impl/DefaultScriptFileComponentBuilder.java | 46 +-
.../core/config/builder/impl/package-info.java | 4 +-
.../logging/log4j/core/config/package-info.java | 2 +-
.../config/plugins/processor/GraalVmProcessor.java | 50 +-
.../config/plugins/processor/PluginProcessor.java | 26 +-
.../plugins/visitors/PluginElementVisitor.java | 4 +
.../properties/PropertiesConfigurationBuilder.java | 22 +-
.../log4j/core/config/xml/XmlConfiguration.java | 61 +-
.../log4j/core/impl/Log4jContextFactory.java | 20 +
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 24 +-
.../log4j/core/layout/CsvParameterLayout.java | 3 +-
.../ThrowableExtendedStackTraceRenderer.java | 6 +-
.../logging/log4j/core/util/CronExpression.java | 3 +
.../apache/logging/log4j/core/util/Throwables.java | 5 +-
.../instant/InstantPatternLegacyFormatter.java | 5 +-
log4j-core/src/main/resources/META-INF/LICENSE | 202 -----
log4j-core/src/main/resources/META-INF/NOTICE | 13 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 58 +-
.../logging/log4j/web/WebLoggerContextUtils.java | 30 +-
.../apache/logging/log4j/web/WebLookupTest.java | 61 ++
.../jpa/converter/ThrowableAttributeConverter.java | 20 +-
.../converter/ThrowableAttributeConverterTest.java | 14 +
log4j-layout-template-json-test/pom.xml | 2 +-
.../JsonTemplateLayoutConcurrentEncodeTest.java | 12 +-
.../template/json/JsonTemplateLayoutTest.java | 7 +-
.../log4j/layout/template/json/TestHelpers.java | 12 +-
log4j-mongodb/pom.xml | 2 +-
log4j-parent/pom.xml | 75 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 59 +-
.../logging/log4j/web/WebLoggerContextUtils.java | 29 +-
.../apache/logging/log4j/web/WebLookupTest.java | 52 ++
pom.xml | 10 +-
.../2791_rework_ComponentBuilder_API.xml} | 3 +-
...69_add_missing_RootLogger_withFilter_alias.xml} | 6 +-
.../3816_legacy_instant_pattern_precision.xml} | 7 +-
...rror_in_ThrowableExtendedStackTraceRenderer.xml | 10 +
...16_fix_onMatch_onMismatch_properties_config.xml | 12 +
.../4145_add_log4j_api_kotlin_to_bom.xml} | 4 +-
.../4181_routing_appender_security_docs.xml} | 4 +-
.../4185_fix_jmx_mbean_npe.xml} | 6 +-
...ding.xml => 4225_plugin_processor_messages.xml} | 6 +-
...243_fix_CsvParameterLayout_null_parameters.xml} | 5 +-
.../4248_fix_plugin_element_visitor_array_npe.xml} | 7 +-
.../4249_fix-circular-exception.xml} | 6 +-
.../4281_remove_maven_core_dependency.xml} | 4 +-
..._context_and_migrate_to_map_get_put_object.xml} | 7 +-
...=> fix_cron_triggering_policy_slow_startup.xml} | 5 +-
...ge.xml => fix_log4j1_xml_configuration_xxe.xml} | 5 +-
...ix_logger_context_admin_config_stream_leak.xml} | 4 +-
src/changelog/.2.x.x/update_actions_stale.xml | 4 +-
...date_biz.aqute.bnd_biz.aqute.bnd.annotation.xml | 4 +-
...pdate_co.elastic.clients_elasticsearch-java.xml | 4 +-
.../update_com.fasterxml.jackson_jackson-bom.xml | 4 +-
.../.2.x.x/update_com.github.jnr_jnr-ffi.xml | 4 +-
.../update_com.google.guava_guava-testlib.xml | 4 +-
.../.2.x.x/update_commons-codec_commons-codec.xml | 4 +-
.../update_io.fabric8_docker-maven-plugin.xml | 4 +-
.../update_org.apache.activemq_activemq-broker.xml | 4 +-
...sticsearch.client_elasticsearch-rest-client.xml | 4 +-
.../.2.x.x/update_org.jctools_jctools-core.xml | 4 +-
..._stale.xml => update_org.jspecify_jspecify.xml} | 4 +-
src/changelog/.2.x.x/update_org.mongodb_bson.xml | 4 +-
.../update_org.mongodb_mongodb-driver-core.xml | 4 +-
.../update_org.mongodb_mongodb-driver-sync.xml | 4 +-
.../.2.x.x/update_org.xmlunit_xmlunit-core.xml | 4 +-
.../.2.x.x/update_org.xmlunit_xmlunit-matchers.xml | 4 +-
.../xinclude_fixup_attributes.xml} | 4 +-
...penders.xml => xinclude-xpointer-appenders.xml} | 5 +
...include-main.xml => xinclude-xpointer-main.xml} | 7 +-
.../ROOT/pages/manual/appenders/delegating.adoc | 53 +-
.../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 +++
180 files changed, 4953 insertions(+), 2372 deletions(-)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationExternalEntityTest.java
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
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/BundleTestInfo.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/builder/impl/DefaultComponentBuilderTest.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-core-test/src/test/resources/{log4j2-properties-root-only.properties =>
log4j2-properties-filter-attribute-case.properties} (59%)
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.23.0/simplify_configuration_after_bnd_7_update.xml =>
.2.x.x/2791_rework_ComponentBuilder_API.xml} (70%)
copy src/changelog/{2.26.0/rfc5424-setters.xml =>
.2.x.x/3369_add_missing_RootLogger_withFilter_alias.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%)
create mode 100644
src/changelog/.2.x.x/4049_fix_catch_LinkageError_in_ThrowableExtendedStackTraceRenderer.xml
create mode 100644
src/changelog/.2.x.x/4116_fix_onMatch_onMismatch_properties_config.xml
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.0-alpha2/LOG4J2-65_Allow_variable_substitution_on_the_configuration_attributes.xml
=> .2.x.x/4181_routing_appender_security_docs.xml} (59%)
copy src/changelog/{2.26.0/3874_remove_jvmrunargs_lookup.xml =>
.2.x.x/4185_fix_jmx_mbean_npe.xml} (71%)
copy
src/changelog/.2.x.x/{fix-circular-reference-detection-for-exceptions-with-colliding.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.25.4/3975_prevent_warning_for_last_null_argument.xml =>
.2.x.x/4249_fix-circular-exception.xml} (59%)
copy src/changelog/{2.26.0/3874_remove_jvmrunargs_lookup.xml =>
.2.x.x/4281_remove_maven_core_dependency.xml} (63%)
copy src/changelog/{2.25.2/3872_fix_RollingFileManager_initialTime.xml =>
.2.x.x/deprecate_external_context_and_migrate_to_map_get_put_object.xml} (52%)
copy src/changelog/.2.x.x/{3926_revamp_list_appender.xml =>
fix_cron_triggering_policy_slow_startup.xml} (62%)
copy src/changelog/.2.x.x/{fix-StructuredDataMessage-XML-message.xml =>
fix_log4j1_xml_configuration_xxe.xml} (58%)
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_org.jspecify_jspecify.xml} (62%)
copy src/changelog/{2.25.1/3706_disruptor-tccl.xml =>
.2.x.x/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
