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 05288f4 #335 Add Velocity support to JsonTemplateLayout manual. add 96956a2 #335 Rename JsonTemplateLayout artifact and package. add 58d9b49 Try improving RollingAppenderRestartTest to alleviate test report failures. add 4052a1c Try improving RollingDirectSizeTimeNewDirectoryTest to alleviate test report failures. No new revisions were added by this update. Summary of changes: log4j-bom/pom.xml | 2 +- .../rolling/RollingAppenderRestartTest.java | 48 +++++++---- .../RollingDirectSizeTimeNewDirectoryTest.java | 93 +++++++++++++--------- .../pom.xml | 2 +- .../layout/template/json}/JsonTemplateLayout.java | 19 +++-- .../template/json}/JsonTemplateLayoutDefaults.java | 6 +- .../json}/resolver/EndOfBatchResolver.java | 4 +- .../json}/resolver/EndOfBatchResolverFactory.java | 2 +- .../template/json}/resolver/EventResolver.java | 2 +- .../json}/resolver/EventResolverContext.java | 10 +-- .../json}/resolver/EventResolverFactories.java | 2 +- .../json}/resolver/EventResolverFactory.java | 2 +- .../resolver/ExceptionInternalResolverFactory.java | 2 +- .../template/json}/resolver/ExceptionResolver.java | 7 +- .../json}/resolver/ExceptionResolverFactory.java | 2 +- .../json}/resolver/ExceptionRootCauseResolver.java | 7 +- .../ExceptionRootCauseResolverFactory.java | 2 +- .../template/json}/resolver/LevelResolver.java | 4 +- .../json}/resolver/LevelResolverFactory.java | 2 +- .../template/json}/resolver/LoggerResolver.java | 4 +- .../json}/resolver/LoggerResolverFactory.java | 2 +- .../template/json}/resolver/MainMapResolver.java | 4 +- .../json}/resolver/MainMapResolverFactory.java | 2 +- .../template/json}/resolver/MapResolver.java | 4 +- .../json}/resolver/MapResolverFactory.java | 2 +- .../template/json}/resolver/MarkerResolver.java | 4 +- .../json}/resolver/MarkerResolverFactory.java | 2 +- .../template/json}/resolver/MessageResolver.java | 5 +- .../json}/resolver/MessageResolverFactory.java | 2 +- .../template/json}/resolver/PatternResolver.java | 7 +- .../json}/resolver/PatternResolverFactory.java | 2 +- .../template/json}/resolver/SourceResolver.java | 7 +- .../json}/resolver/SourceResolverFactory.java | 2 +- .../resolver/StackTraceElementObjectResolver.java | 4 +- .../StackTraceElementObjectResolverContext.java | 4 +- .../StackTraceElementObjectResolverFactories.java | 2 +- .../StackTraceElementObjectResolverFactory.java | 2 +- .../json}/resolver/StackTraceObjectResolver.java | 4 +- .../json}/resolver/StackTraceResolver.java | 2 +- .../json}/resolver/StackTraceStringResolver.java | 8 +- .../template/json}/resolver/TemplateResolver.java | 4 +- .../json}/resolver/TemplateResolverConfig.java | 4 +- .../json}/resolver/TemplateResolverContext.java | 4 +- .../json}/resolver/TemplateResolverFactory.java | 2 +- .../template/json}/resolver/TemplateResolvers.java | 8 +- .../json}/resolver/ThreadContextDataResolver.java | 8 +- .../resolver/ThreadContextDataResolverFactory.java | 2 +- .../json}/resolver/ThreadContextStackResolver.java | 4 +- .../ThreadContextStackResolverFactory.java | 2 +- .../template/json}/resolver/ThreadResolver.java | 4 +- .../json}/resolver/ThreadResolverFactory.java | 2 +- .../template/json}/resolver/TimestampResolver.java | 6 +- .../json}/resolver/TimestampResolverFactory.java | 2 +- .../layout/template/json}/util/DummyRecycler.java | 2 +- .../template/json}/util/DummyRecyclerFactory.java | 2 +- .../layout/template/json}/util/JsonReader.java | 2 +- .../layout/template/json}/util/JsonWriter.java | 2 +- .../layout/template/json}/util/MapAccessor.java | 2 +- .../template/json}/util/QueueingRecycler.java | 2 +- .../json}/util/QueueingRecyclerFactory.java | 2 +- .../log4j/layout/template/json}/util/Recycler.java | 2 +- .../template/json}/util/RecyclerFactories.java | 2 +- .../template/json}/util/RecyclerFactory.java | 2 +- .../template/json}/util/StringParameterParser.java | 2 +- .../template/json}/util/ThreadLocalRecycler.java | 2 +- .../json}/util/ThreadLocalRecyclerFactory.java | 2 +- .../json}/util/TruncatingBufferedPrintWriter.java | 2 +- .../json}/util/TruncatingBufferedWriter.java | 2 +- .../log4j/layout/template/json}/util/Uris.java | 2 +- .../src/main/resources/EcsLayout.json | 0 .../src/main/resources/GelfLayout.json | 0 .../src/main/resources/JsonLayout.json | 0 .../main/resources/LogstashJsonEventLayoutV1.json | 0 .../main/resources/StackTraceElementLayout.json | 0 .../src/site/manual/index.md | 0 .../src/site/site.xml | 0 .../json}/BlackHoleByteBufferDestination.java | 2 +- .../log4j/layout/template/json}/EcsLayoutTest.java | 6 +- .../layout/template/json}/GelfLayoutTest.java | 6 +- .../layout/template/json}/JacksonFixture.java | 2 +- .../layout/template/json}/JsonLayoutTest.java | 4 +- .../JsonTemplateLayoutConcurrentEncodeTest.java | 2 +- .../json}/JsonTemplateLayoutGcFreeTest.java | 2 +- .../JsonTemplateLayoutNullEventDelimiterTest.java | 2 +- .../template/json}/JsonTemplateLayoutTest.java | 12 +-- .../template/json}/LayoutComparisonHelpers.java | 4 +- .../layout/template/json}/LogEventFixture.java | 2 +- .../log4j/layout/template/json}/LogstashIT.java | 6 +- .../layout/template/json}/util/JsonReaderTest.java | 2 +- .../layout/template/json}/util/JsonWriterTest.java | 4 +- .../template/json}/util/RecyclerFactoriesTest.java | 2 +- .../json}/util/StringParameterParserTest.java | 12 +-- .../json}/util/TruncatingBufferedWriterTest.java | 2 +- .../log4j/layout/template/json}/util/UrisTest.java | 2 +- .../resources/gcFreeJsonTemplateLayoutLogging.xml | 0 ...nullEventDelimitedJsonTemplateLayoutLogging.xml | 0 .../src/test/resources/testJsonTemplateLayout.json | 0 log4j-perf/pom.xml | 4 +- .../json}/JsonTemplateLayoutBenchmark.java | 2 +- .../json}/JsonTemplateLayoutBenchmarkReport.java | 6 +- .../json}/JsonTemplateLayoutBenchmarkState.java | 8 +- .../pom.xml | 2 +- pom.xml | 4 +- .../asciidoc/manual/json-template-layout.adoc.vm | 18 ++--- 104 files changed, 266 insertions(+), 229 deletions(-) rename {log4j-layout-json-template => log4j-layout-template-json}/pom.xml (99%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayout.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayoutDefaults.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EndOfBatchResolver.java (91%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EndOfBatchResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EventResolver.java (93%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EventResolverContext.java (94%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EventResolverFactories.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/EventResolverFactory.java (93%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ExceptionInternalResolverFactory.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ExceptionResolver.java (94%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ExceptionResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ExceptionRootCauseResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ExceptionRootCauseResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/LevelResolver.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/LevelResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/LoggerResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/LoggerResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MainMapResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MainMapResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MapResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MapResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MarkerResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MarkerResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MessageResolver.java (98%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/MessageResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/PatternResolver.java (92%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/PatternResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/SourceResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/SourceResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceElementObjectResolver.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceElementObjectResolverContext.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceElementObjectResolverFactories.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceElementObjectResolverFactory.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceObjectResolver.java (94%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceResolver.java (93%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/StackTraceStringResolver.java (87%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TemplateResolver.java (90%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TemplateResolverConfig.java (88%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TemplateResolverContext.java (90%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TemplateResolverFactory.java (93%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TemplateResolvers.java (98%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadContextDataResolver.java (97%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadContextDataResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadContextStackResolver.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadContextStackResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadResolver.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/ThreadResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TimestampResolver.java (98%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/resolver/TimestampResolverFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/DummyRecycler.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/DummyRecyclerFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/JsonReader.java (99%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/JsonWriter.java (99%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/MapAccessor.java (98%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/QueueingRecycler.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/QueueingRecyclerFactory.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/Recycler.java (93%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/RecyclerFactories.java (99%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/RecyclerFactory.java (94%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/StringParameterParser.java (99%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/ThreadLocalRecycler.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/ThreadLocalRecyclerFactory.java (95%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/TruncatingBufferedPrintWriter.java (96%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/TruncatingBufferedWriter.java (98%) rename {log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json}/util/Uris.java (98%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/EcsLayout.json (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/GelfLayout.json (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/JsonLayout.json (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/LogstashJsonEventLayoutV1.json (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/StackTraceElementLayout.json (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/site/manual/index.md (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/site/site.xml (100%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/BlackHoleByteBufferDestination.java (96%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/EcsLayoutTest.java (94%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/GelfLayoutTest.java (95%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JacksonFixture.java (95%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JsonLayoutTest.java (95%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayoutConcurrentEncodeTest.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayoutGcFreeTest.java (96%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayoutNullEventDelimiterTest.java (98%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/JsonTemplateLayoutTest.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/LayoutComparisonHelpers.java (78%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/LogEventFixture.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/LogstashIT.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/JsonReaderTest.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/JsonWriterTest.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/RecyclerFactoriesTest.java (98%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/StringParameterParserTest.java (97%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/TruncatingBufferedWriterTest.java (99%) rename {log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template => log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json}/util/UrisTest.java (97%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml (100%) rename {log4j-layout-json-template => log4j-layout-template-json}/src/test/resources/testJsonTemplateLayout.json (100%) rename log4j-perf/src/main/java/org/apache/logging/log4j/layout/{json/template => template/json}/JsonTemplateLayoutBenchmark.java (99%) rename log4j-perf/src/main/java/org/apache/logging/log4j/layout/{json/template => template/json}/JsonTemplateLayoutBenchmarkReport.java (98%) rename log4j-perf/src/main/java/org/apache/logging/log4j/layout/{json/template => template/json}/JsonTemplateLayoutBenchmarkState.java (96%)