This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a change to branch feature/3.x/port-3259 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 3089dfbfcd Merge branch 'main' into feature/3.x/port-3259 add e8c86e2059 Support `AsyncAppender::requiresLocation` (#3862) add d130efb756 Fix formatting of `s` pattern (#3469) (#3866) add 8de3a60bb9 Improve configuration error handling of HttpAppender (#3438) (#3865) add 6af1756063 Adjust GcpLayout JSON to latest format (#3586) (#3867) add ffbdfea40d Merge branch 'main' into feature/3.x/port-3259 No new revisions were added by this update. Summary of changes: .../log4j/core/appender/AsyncAppenderTest.java | 7 ++ .../core/appender/HttpAppenderBuilderTest.java | 130 +++++++++++++++++++++ .../InstantPatternDynamicFormatterTest.java | 29 +++-- ...j-comp-filter.xml => log4j-asynch-location.xml} | 12 +- .../logging/log4j/core/appender/AsyncAppender.java | 5 + .../appender/AsyncAppenderEventDispatcher.java | 9 ++ .../logging/log4j/core/appender/HttpAppender.java | 24 ++-- .../instant/InstantPatternDynamicFormatter.java | 66 ++++++----- .../log4j/layout/template/json/GcpLayoutTest.java | 44 ++----- .../src/main/resources/GcpLayout.json | 38 +++--- 10 files changed, 256 insertions(+), 108 deletions(-) create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderBuilderTest.java copy log4j-core-test/src/test/resources/{log4j-comp-filter.xml => log4j-asynch-location.xml} (82%)