[logging-log4j2] branch recycler-api-3.x updated (2b12ba237a -> 7b695446b9)

[vy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch recycler-api-3.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 2b12ba237a More test fixes
     add c72f4c3e44 Make sure `LogBuilder` recycles `DefaultLogBuilder`
     add 108361a559 Renormalize Java file line endings
     add b5d3cea6ec Port changes from `2.x` irrelevant to code (log4j-1.2-api)
     add 043665dfa0 Fix spotless errors
     add a8d66b5e9b updated email for security issues to security@
     add 7a6a59467e Add DependencyChain::toString implementations
     add efee62c559 Remove unused field
     add 57af66b97e LOG4J2-3658 - Allow Log4j 2 properties in JSON files
     add dd80a43887 Fix `PatternLayout.Builder#withHeader()` javadoc (#1411)
     add 3e91aac282 Fix `SimpleDateFormat`-related JDK bug URL in `FastDateParser` javadoc (#1404)
     add 6b478f6a6b Ensure `FileOutputStream` is closed in `CommonsCompressAction.execute()` (#1415)
     add b789099f9d Fix nullability docs in `StrSubstitutor` (#1422)
     add 295424a81d Change `{@literal null}` to `{@code null}` (#1424)
     add 67babc5e03 Remove deprecated docs from `PatternParser#extractConverter()` (#1423)
     add 7ea33d0439 Bump actions/checkout from 3.4.0 to 3.5.2 (#1434)
     add 97dbb496d1 Bump actions/setup-python from 4.3.0 to 4.6.0 (#1440)
     add 7b695446b9 Merge remote-tracking branch 'origin/main' into recycler-api-3.x

No new revisions were added by this update.

Summary of changes:
 .gitattributes                                     |   4 +
 .github/workflows/benchmark.yml                    |   8 +-
 .github/workflows/build.yml                        |   4 +-
 .github/workflows/codeql-analysis.yml              |   2 +-
 .github/workflows/log4j-kafka-test.yml             |   2 +-
 SECURITY.md                                        |   2 +-
 .../src/main/java/org/apache/log4j/Category.java   |   2 -
 .../src/main/java/org/apache/log4j/Hierarchy.java  |  81 ---
 .../builders/filter/LevelRangeFilterBuilder.java   |  13 +-
 .../log4j/config/Log4j1ConfigurationParser.java    |   2 +-
 .../java/org/apache/log4j/spi/ErrorHandler.java    |   6 -
 .../org/apache/log4j/CallerInformationTest.java    | 130 ++--
 .../test/java/org/apache/log4j/LoggingTest.java    |  82 +--
 .../org/apache/log4j/config/StartsWithFilter.java  |  76 +--
 .../logging/log4j/util/PropertiesUtilTest.java     |  11 +
 .../src/test/resources/PropertiesUtilTest.json     |  25 +
 .../java/org/apache/logging/log4j/LogBuilder.java  |   2 +-
 .../logging/log4j/internal/DefaultLogBuilder.java  |  70 +--
 .../apache/logging/log4j/message/EntryMessage.java |  52 +-
 .../apache/logging/log4j/message/ExitMessage.java  |  52 +-
 .../apache/logging/log4j/message/FlowMessage.java  |  78 +--
 .../apache/logging/log4j/spi/AbstractLogger.java   |  36 +-
 .../logging/log4j/util/JsonPropertySource.java     | 104 +++
 .../org/apache/logging/log4j}/util/JsonReader.java |   2 +-
 .../apache/logging/log4j/util/PropertiesUtil.java  |  60 +-
 .../logging/log4j/core/util/JsonReaderTest.java    |  11 +-
 .../rolling/action/CommonsCompressAction.java      |   4 +-
 .../log4j/core/config/jason/JsonConfiguration.java |   4 +-
 .../logging/log4j/core/layout/PatternLayout.java   |   2 +-
 .../logging/log4j/core/lookup/StrSubstitutor.java  |   8 +-
 .../logging/log4j/core/parser/LogEventParser.java  |   4 +-
 .../log4j/core/parser/TextLogEventParser.java      |   2 +-
 .../logging/log4j/core/pattern/PatternParser.java  |   8 -
 .../core/time/internal/format/FastDateParser.java  |   2 +-
 .../log4j/flume/appender/FlumeAvroManager.java     | 698 ++++++++++-----------
 .../logging/log4j/io/AbstractStreamTest.java       | 117 ++--
 .../log4j/io/IoBuilderCallerInfoTesting.java       | 110 ++--
 .../org/apache/logging/log4j/io/IoBuilderTest.java | 102 +--
 .../log4j/io/LoggerPrintWriterJdbcH2Test.java      | 192 +++---
 .../logging/log4j/jcl/CallerInformationTest.java   | 134 ++--
 .../apache/logging/log4j/jul/ApiLoggerAdapter.java |  79 ++-
 .../logging/log4j/jul/CoreLoggerAdapter.java       |  85 ++-
 .../logging/log4j/jul/Log4jBridgeHandler.java      | 638 +++++++++----------
 .../JsonTemplateLayoutAdditionalFieldTest.java     |  12 +-
 .../log4j/layout/template/json/TestHelpers.java    |   2 +-
 .../json/resolver/CounterResolverTest.java         |   6 +-
 .../json/resolver/MessageResolverTest.java         |  16 +-
 .../json/resolver/CaseConverterResolver.java       |   8 +-
 .../resolver/EventAdditionalFieldInterceptor.java  |   6 +-
 .../template/json/resolver/TemplateResolvers.java  |   6 +-
 .../liquibase/ext/logging/log4j2/Log4j2Logger.java | 186 +++---
 .../json/JsonTemplateLayoutBenchmarkReport.java    |   2 +-
 .../logging/log4j/plugins/di/DependencyChains.java |  15 +
 .../log4j/plugins/model/PluginRegistry.java        |   7 -
 .../apache/logging/log4j/taglib/DumpTagTest.java   | 243 ++++---
 .../logging/slf4j/CallerInformationTest.java       | 131 ++--
 .../apache/logging/slf4j/LoggerContextRule.java    | 145 ++---
 ...s.xml => LOG4J2-3658_Allow_Json_Properties.xml} |   4 +-
 58 files changed, 2004 insertions(+), 1891 deletions(-)
 create mode 100644 log4j-api-test/src/test/resources/PropertiesUtilTest.json
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/JsonPropertySource.java
 rename {log4j-core/src/main/java/org/apache/logging/log4j/core => log4j-api/src/main/java/org/apache/logging/log4j}/util/JsonReader.java (99%)
 copy src/changelog/.3.x.x/{LOG4J2-2690_Locate_plugins_in_modules.xml => LOG4J2-3658_Allow_Json_Properties.xml} (85%)