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 cd6cc936e0 Improve changelog
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 e005b44bae Merge branch '2.x' into fix/issue-4166
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 59 +-
.../log4j/config/Log4j1ConfigurationConverter.java | 4 +-
.../log4j/config/Log4j1ConfigurationFactory.java | 3 +-
.../log4j/config/Log4j1ConfigurationParser.java | 39 +-
.../org/apache/log4j/xml/Log4jEntityResolver.java | 28 +-
.../config/XmlConfigurationExternalEntityTest.java | 99 +++
.../apache/logging/log4j/spi/LoggerContext.java | 2 +
.../log4j/core/fuzz/PatternLayoutFuzzer.java | 2 +-
.../src/test/java/foo/TestFriendlyException.java | 74 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 6 +-
.../logging/log4j/core/LoggerContextTest.java | 20 +
.../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 +++++++
.../properties/PropertiesConfigurationTest.java | 26 +
.../ExtendedThrowablePatternConverterTest.java | 51 ++
.../core/pattern/MessagePatternConverterTest.java | 17 +-
.../pattern/RootThrowablePatternConverterTest.java | 3 +
.../pattern/ThrowablePatternConverterTest.java | 5 +-
.../log4j/core/util/CronExpressionTest.java | 23 +
.../logging/log4j/core/util/ThrowablesTest.java | 9 +
...j2-properties-filter-attribute-case.properties} | 25 +-
.../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 +-
.../properties/PropertiesConfigurationBuilder.java | 22 +-
.../log4j/core/impl/Log4jContextFactory.java | 20 +
.../ThrowableExtendedStackTraceRenderer.java | 6 +-
.../logging/log4j/core/util/CronExpression.java | 3 +
.../apache/logging/log4j/core/util/Throwables.java | 5 +-
.../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 +
.../JsonTemplateLayoutConcurrentEncodeTest.java | 12 +-
.../template/json/JsonTemplateLayoutTest.java | 7 +-
.../log4j/layout/template/json/TestHelpers.java | 12 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 59 +-
.../logging/log4j/web/WebLoggerContextUtils.java | 29 +-
.../apache/logging/log4j/web/WebLookupTest.java | 52 ++
.../2791_rework_ComponentBuilder_API.xml} | 4 +-
...69_add_missing_RootLogger_withFilter_alias.xml} | 6 +-
...rror_in_ThrowableExtendedStackTraceRenderer.xml | 10 +
...16_fix_onMatch_onMismatch_properties_config.xml | 12 +
.../4181_routing_appender_security_docs.xml} | 4 +-
...ean_npe.xml => 4249_fix-circular-exception.xml} | 5 +-
..._context_and_migrate_to_map_get_put_object.xml} | 7 +-
...=> fix_cron_triggering_policy_slow_startup.xml} | 5 +-
...er.xml => fix_log4j1_xml_configuration_xxe.xml} | 4 +-
.../ROOT/pages/manual/appenders/delegating.adoc | 53 +-
102 files changed, 3713 insertions(+), 1298 deletions(-)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationExternalEntityTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilderTest.java
copy
log4j-core-test/src/test/resources/{log4j2-properties-root-only.properties =>
log4j2-properties-filter-attribute-case.properties} (59%)
copy src/changelog/{2.20.0/LOG4J2-3554_switch_to_Eclipse_Angus.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%)
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.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.x.x/{4185_fix_jmx_mbean_npe.xml =>
4249_fix-circular-exception.xml} (59%)
copy
src/changelog/.2.x.x/{4024_fix_roperties_configuration_support_for_logger_properties.xml
=> 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-MapMessage-JSON-non-finite-number.xml =>
fix_log4j1_xml_configuration_xxe.xml} (58%)
