[logging-log4j2] branch master updated (55480fc -> 8b02317)

[vy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.


    from 55480fc  Set timeout for Linux for consistency. Fix test bug
     add 8b02317  LOG4J2-3004 Add plugin support to JsonTemplateLayout. (#476)

No new revisions were added by this update.

Summary of changes:
 log4j-layout-template-json/revapi.json             | 440 ---------------
 .../layout/template/json/JsonTemplateLayout.java   |  64 ++-
 .../template/json/resolver/EndOfBatchResolver.java |   5 +-
 .../json/resolver/EndOfBatchResolverFactory.java   |  15 +-
 .../resolver/EventAdditionalFieldInterceptor.java  |  98 ++++
 .../template/json/resolver/EventResolver.java      |   5 +-
 .../json/resolver/EventResolverContext.java        | 110 ++--
 .../json/resolver/EventResolverFactories.java      |  49 +-
 .../json/resolver/EventResolverFactory.java        |  21 +-
 ...Resolver.java => EventResolverInterceptor.java} |  18 +-
 ...esolver.java => EventResolverInterceptors.java} |  19 +-
 ...er.java => EventResolverStringSubstitutor.java} |  38 +-
 .../resolver/EventRootObjectKeyInterceptor.java    |  53 ++
 .../template/json/resolver/ExceptionResolver.java  | 151 ++++-
 .../json/resolver/ExceptionResolverFactory.java    |  13 +-
 .../json/resolver/ExceptionRootCauseResolver.java  |   8 +-
 .../ExceptionRootCauseResolverFactory.java         |  15 +-
 .../template/json/resolver/LevelResolver.java      |  29 +-
 .../json/resolver/LevelResolverFactory.java        |  12 +-
 .../template/json/resolver/LoggerResolver.java     |   9 +-
 .../json/resolver/LoggerResolverFactory.java       |  12 +-
 .../template/json/resolver/MainMapResolver.java    |   2 +-
 .../json/resolver/MainMapResolverFactory.java      |  12 +-
 .../layout/template/json/resolver/MapResolver.java |   2 +-
 .../template/json/resolver/MapResolverFactory.java |  12 +-
 .../template/json/resolver/MarkerResolver.java     |   2 +-
 .../json/resolver/MarkerResolverFactory.java       |  16 +-
 .../json/resolver/MessageParameterResolver.java    |   2 +-
 .../resolver/MessageParameterResolverFactory.java  |  15 +-
 .../template/json/resolver/MessageResolver.java    |   2 +-
 .../json/resolver/MessageResolverFactory.java      |  12 +-
 .../template/json/resolver/PatternResolver.java    |   2 +-
 .../json/resolver/PatternResolverFactory.java      |  12 +-
 .../template/json/resolver/SourceResolver.java     |  22 +-
 .../json/resolver/SourceResolverFactory.java       |  12 +-
 .../StackTraceElementObjectResolverContext.java    |  93 ----
 .../StackTraceElementObjectResolverFactories.java  |  41 --
 ...esolver.java => StackTraceElementResolver.java} |  27 +-
 .../resolver/StackTraceElementResolverContext.java | 121 ++++
 ....java => StackTraceElementResolverFactory.java} |  33 +-
 ...tackTraceElementResolverStringSubstitutor.java} |  39 +-
 .../json/resolver/StackTraceObjectResolver.java    |   3 +
 .../template/json/resolver/StackTraceResolver.java |   3 +
 .../json/resolver/StackTraceStringResolver.java    |   3 +
 .../json/resolver/TemplateResolverConfig.java      |  37 +-
 .../json/resolver/TemplateResolverContext.java     |  32 +-
 .../json/resolver/TemplateResolverFactories.java   | 130 +++++
 .../json/resolver/TemplateResolverFactory.java     |  25 +-
 .../json/resolver/TemplateResolverInterceptor.java |  56 ++
 .../resolver/TemplateResolverInterceptors.java     | 131 +++++
 ...java => TemplateResolverStringSubstitutor.java} |  22 +-
 .../template/json/resolver/TemplateResolvers.java  | 109 +---
 .../json/resolver/ThreadContextDataResolver.java   |   2 +-
 .../resolver/ThreadContextDataResolverFactory.java |  13 +-
 .../json/resolver/ThreadContextStackResolver.java  |   2 +-
 .../ThreadContextStackResolverFactory.java         |  17 +-
 .../template/json/resolver/ThreadResolver.java     |  12 +-
 .../json/resolver/ThreadResolverFactory.java       |  12 +-
 .../template/json/resolver/TimestampResolver.java  |   4 +-
 .../json/resolver/TimestampResolverFactory.java    |  12 +-
 .../template/json/util/RecyclerFactories.java      |   8 -
 ...rFactory.java => RecyclerFactoryConverter.java} |  25 +-
 .../src/main/resources/EcsLayout.json              |   1 +
 .../log4j/layout/template/json/EcsLayoutTest.java  |  10 +
 .../template/json/JsonTemplateLayoutTest.java      | 124 ++++-
 .../log4j/layout/template/json/LogstashIT.java     |   3 +-
 .../json/JsonTemplateLayoutBenchmarkState.java     |  11 +-
 .../plugins/convert/TypeConverterRegistry.java     |  59 +-
 .../logging/log4j/plugins/util/PluginUtil.java     |  96 ++++
 .../plugins/convert/TypeConverterRegistryTest.java |  82 ++-
 pom.xml                                            |   2 +-
 src/changes/changes.xml                            |  26 +-
 ...layout.vm.adoc => json-template-layout.adoc.vm} | 616 ++++++++++++++++-----
 src/site/asciidoc/manual/layouts.adoc              |   7 +-
 src/site/asciidoc/manual/plugins.adoc              |   7 +-
 75 files changed, 2243 insertions(+), 1122 deletions(-)
 delete mode 100644 log4j-layout-template-json/revapi.json
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventAdditionalFieldInterceptor.java
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{EventResolver.java => EventResolverInterceptor.java} (68%)
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{EventResolver.java => EventResolverInterceptors.java} (65%)
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{ExceptionRootCauseResolver.java => EventResolverStringSubstitutor.java} (55%)
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventRootObjectKeyInterceptor.java
 delete mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverContext.java
 delete mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java
 rename log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{StackTraceElementObjectResolver.java => StackTraceElementResolver.java} (84%)
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementResolverContext.java
 rename log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{StackTraceElementObjectResolverFactory.java => StackTraceElementResolverFactory.java} (56%)
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{TemplateResolverContext.java => StackTraceElementResolverStringSubstitutor.java} (53%)
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactories.java
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptor.java
 create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptors.java
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/{TemplateResolverContext.java => TemplateResolverStringSubstitutor.java} (67%)
 copy log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/{DummyRecyclerFactory.java => RecyclerFactoryConverter.java} (60%)
 create mode 100644 log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/PluginUtil.java
 rename src/site/asciidoc/manual/{json-template-layout.vm.adoc => json-template-layout.adoc.vm} (65%)