This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 95f9d7e [LOG4J2-3014] Log4j1ConfigurationConverter on Windows
produces "
" at end of every line.
new 5f043f6 LOG4J2-2973 Rename EventTemplateAdditionalField#type
(conflicting with properties file parser) to #format. (#462)
new f1110cc LOG4J2-2973 Minor tweaks to previous work.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
log4j-layout-template-json/revapi.json | 15 +++++
.../layout/template/json/JsonTemplateLayout.java | 24 +++----
.../template/json/resolver/TemplateResolvers.java | 6 +-
...emplateLayoutAdditionalFieldPropertiesTest.java | 21 +++---
...nTemplateLayoutAdditionalFieldTestHelpers.java} | 18 ++---
.../JsonTemplateLayoutAdditionalFieldXmlTest.java | 21 +++---
.../JsonTemplateLayoutAdditionalFieldYamlTest.java | 21 +++---
.../template/json/JsonTemplateLayoutTest.java | 4 +-
...eldEnrichedJsonTemplateLayoutLogging.properties | 37 ++++++++++
...ionalFieldEnrichedJsonTemplateLayoutLogging.xml | 6 +-
...onalFieldEnrichedJsonTemplateLayoutLogging.yaml | 36 ++++++----
src/changes/changes.xml | 3 +
...layout.adoc.vm => json-template-layout.vm.adoc} | 78 +++++++++++++++++-----
13 files changed, 190 insertions(+), 100 deletions(-)
copy
log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutNoLookupDateTest.java
=>
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldPropertiesTest.java
(59%)
rename
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/{JsonTemplateLayoutAdditionalFieldTest.java
=> JsonTemplateLayoutAdditionalFieldTestHelpers.java} (82%)
copy
log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutNoLookupDateTest.java
=>
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldXmlTest.java
(59%)
copy
log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutNoLookupDateTest.java
=>
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldYamlTest.java
(59%)
create mode 100644
log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.properties
copy .dockerignore =>
log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.yaml
(58%)
rename src/site/asciidoc/manual/{json-template-layout.adoc.vm =>
json-template-layout.vm.adoc} (92%)
