This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch mean-bean-machine in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 221b3644301826acf42cf6da3396a06fcfd0155d Merge: b381d8d 9b7b036 Author: Matt Sicker <[email protected]> AuthorDate: Sat May 29 13:43:13 2021 -0500 Merge branch 'master' into mean-bean-machine .../log4j/message/MessageFormatMessageTest.java | 3 +- .../logging/log4j/core/time/MutableInstant.java | 77 ++++- .../logging/log4j/core/PatternSelectorTest.java | 14 +- .../logging/log4j/core/TimestampMessageTest.java | 3 + .../core/appender/ScriptAppenderSelectorTest.java | 4 + .../rolling/action/ScriptConditionTest.java | 5 + .../logging/log4j/core/config/FileOutputTest.java | 7 + .../core/config/arbiters/ScriptArbiterTest.java | 3 + .../core/filter/AbstractScriptFilterTest.java | 4 + .../logging/log4j/core/filter/TimeFilterTest.java | 3 + .../logging/log4j/core/impl/Log4jLogEventTest.java | 3 + .../log4j/core/time/MutableInstantTest.java | 55 +-- .../kafka/builder/ConfigurationBuilderTest.java | 27 +- .../log4j/jackson/ContextDataSerializer.java | 6 +- .../template/json/resolver/TimestampResolver.java | 105 +++--- .../template/json/util/InstantFormatter.java | 376 +++++++++++++++++++++ .../JsonTemplateLayoutNullEventDelimiterTest.java | 40 +-- .../template/json/JsonTemplateLayoutTest.java | 23 +- .../json/resolver/TimestampResolverTest.java | 65 ---- .../template/json/util/InstantFormatterTest.java | 47 +++ ...nullEventDelimitedJsonTemplateLayoutLogging.xml | 2 +- .../log4j/perf/jmh/DateTimeFormatBenchmark.java | 122 +++++++ src/changes/changes.xml | 6 + 23 files changed, 811 insertions(+), 189 deletions(-)
