This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit eff04d2b98bc5a793ed55b391e0670b44815f48a Merge: deea4d4 381a7de Author: Matt Sicker <[email protected]> AuthorDate: Sun Mar 27 21:08:48 2022 -0500 Merge branch 'json-config' .../core/config/arbiters/BasicArbiterTest.java | 2 +- .../logging/log4j/core}/util/JsonReaderTest.java | 8 +- .../src/test/resources/log4j2-arbiters.json | 42 ++++ .../log4j/core/config/jason/JsonConfiguration.java | 247 +++++++++++++++++++++ .../{json => jason}/JsonConfigurationFactory.java | 35 +-- .../core/config/json/JsonConfigurationFactory.java | 4 - .../logging/log4j/core}/util/JsonReader.java | 23 +- .../json/resolver/CaseConverterResolver.java | 2 +- .../resolver/EventAdditionalFieldInterceptor.java | 4 +- .../template/json/resolver/TemplateResolvers.java | 2 +- .../JsonTemplateLayoutAdditionalFieldTest.java | 2 +- .../log4j/layout/template/json/TestHelpers.java | 2 +- .../json/resolver/CounterResolverTest.java | 2 +- .../json/resolver/MessageResolverTest.java | 4 +- .../json/JsonTemplateLayoutBenchmarkReport.java | 2 +- 15 files changed, 331 insertions(+), 50 deletions(-)
