This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch 2.x-site-pro in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5915a28780cdd69c151f97391fe563d4f600f486 Merge: d280c3b3c2 5f683c6dc8 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sun Sep 29 17:21:23 2024 +0200 Merge branch '2.x' into 2.x-site-pro .github/generate-email.sh | 12 +- .github/workflows/build.yaml | 6 +- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 6 +- .../workflows/develocity-publish-build-scans.yaml | 6 +- .github/workflows/merge-dependabot.yaml | 4 +- .mvn/wrapper/maven-wrapper.properties | 4 +- BUILDING.adoc | 7 + FUZZING.adoc | 106 +++++ .../map/UnmodifiableArrayBackedMapTest.java | 13 +- log4j-api/pom.xml | 4 +- .../internal/map/UnmodifiableArrayBackedMap.java | 1 + .../log4j/message/LocalizedMessageFactory.java | 22 + .../apache/logging/log4j/message/package-info.java | 2 +- .../logging/log4j/simple/SimpleLoggerContext.java | 35 +- .../apache/logging/log4j/simple/package-info.java | 2 +- .../apache/logging/log4j/spi/AbstractLogger.java | 4 + .../apache/logging/log4j/spi/LoggerContext.java | 7 +- .../apache/logging/log4j/spi/LoggerRegistry.java | 297 +++++++++++--- .../org/apache/logging/log4j/spi/package-info.java | 2 +- log4j-appserver/pom.xml | 10 + log4j-cassandra/pom.xml | 21 + {log4j-appserver => log4j-core-fuzz-test}/pom.xml | 48 +-- .../log4j/core/fuzz/PatternLayoutFuzzer.java | 43 ++ log4j-core-its/pom.xml | 10 +- log4j-core-test/pom.xml | 4 +- .../logging/log4j/core/LoggerContextTest.java | 40 ++ .../core/appender/SocketAppenderReconnectTest.java | 13 + .../RollingAppenderDeleteScriptFri13thTest.java | 9 +- .../log4j/core/async/AsyncLoggerContextTest.java | 27 +- .../log4j/core/config/ConfigurationSourceTest.java | 62 +-- .../filter/HttpThreadContextMapFilterTest.java | 202 ---------- .../filter/MutableThreadContextMapFilterTest.java | 250 +++++++++--- .../log4j/core/net/UrlConnectionFactoryTest.java | 213 +++++----- .../logging/log4j/core/net/WireMockUtil.java | 84 ++++ .../core/net/ssl/KeyStoreConfigurationTest.java | 11 +- .../core/net/ssl/SslConfigurationFactoryTest.java | 53 ++- .../log4j/core/net/ssl/SslKeyStoreConstants.java | 4 + .../apache/logging/log4j/core/util/AssertTest.java | 53 --- .../logging/log4j/core/util/HttpWatcherTest.java | 160 ++++++++ .../logging/log4j/core/util/WatchHttpTest.java | 156 ------- .../logging/log4j/core/util/WatchManagerTest.java | 177 ++++---- .../resources/config/ConfigurationSourceTest.xml | 16 +- .../src/test/resources/emptyConfig.json | 4 - .../filter/MutableThreadContextMapFilterTest.xml | 21 +- .../src/test/resources/filterConfig.json | 6 - log4j-core/pom.xml | 1 + .../java/org/apache/logging/log4j/core/Logger.java | 2 +- .../apache/logging/log4j/core/LoggerContext.java | 66 +-- .../logging/log4j/core/async/package-info.java | 2 +- .../log4j/core/config/AbstractConfiguration.java | 30 +- .../log4j/core/config/ConfigurationSource.java | 120 +++--- .../logging/log4j/core/config/HttpWatcher.java | 39 +- .../logging/log4j/core/config/package-info.java | 2 +- .../log4j/core/config/xml/XmlConfiguration.java | 12 +- .../core/filter/MutableThreadContextMapFilter.java | 57 ++- .../apache/logging/log4j/core/package-info.java | 2 +- .../org/apache/logging/log4j/core/util/Loader.java | 5 +- .../org/apache/logging/log4j/core/util/Source.java | 45 ++- .../logging/log4j/core/util/WatchManager.java | 23 +- .../log4j/core/util/datetime/FastDatePrinter.java | 2 +- .../core/util/internal/HttpInputStreamUtil.java | 96 ++++- .../logging/log4j/core/util/package-info.java | 2 +- log4j-fuzz-test/.log4j-plugin-processing-activator | 1 + {log4j-to-jul => log4j-fuzz-test}/pom.xml | 64 +-- .../logging/log4j/fuzz/EncodingAppender.java | 62 +++ .../org/apache/logging/log4j/fuzz/FuzzingUtil.java | 194 +++++++++ .../logging/log4j/fuzz/JsonEncodingAppender.java | 66 +++ .../org/apache/logging/log4j/fuzz/JsonUtil.java | 47 +++ .../apache/logging/log4j/fuzz/package-info.java | 12 +- log4j-jdbc-dbcp2/pom.xml | 6 - .../db/jdbc/PoolableConnectionFactoryTest.java | 18 +- .../db/jdbc/PoolingDriverConnectionSourceTest.java | 10 +- log4j-jpl/pom.xml | 5 - .../logging/log4j/jpl/Log4jSystemLoggerTest.java | 18 +- .../log4j/jul/test/Log4jBridgeHandlerTest.java | 2 +- .../.log4j-plugin-processing-activator | 1 + .../pom.xml | 56 ++- .../json/fuzz/JsonTemplateLayoutCodecFuzzer.java | 82 ++++ .../json/fuzz/JsonTemplateLayoutFuzzer.java | 42 ++ log4j-layout-template-json-test/pom.xml | 143 ++++--- .../log4j/layout/template/json/LogstashIT.java | 152 ++++--- .../layout/template/json/util/JsonWriterTest.java | 96 ----- .../layout/template/json/util/JsonWriter.java | 7 +- log4j-mongodb/pom.xml | 157 ++++++-- ...appedTest.java => AbstractMongoDbCappedIT.java} | 11 +- ...ldsTest.java => MongoDbAdditionalFieldsIT.java} | 14 +- ...hFailureTest.java => MongoDbAuthFailureIT.java} | 15 +- ...CappedLongTest.java => MongoDbCappedIntIT.java} | 16 +- ...bResolverTest.java => MongoDbCappedLongIT.java} | 24 +- .../mongodb/{MongoDbTest.java => MongoDbIT.java} | 14 +- ...apMessageTest.java => MongoDbMapMessageIT.java} | 14 +- .../logging/log4j/mongodb/MongoDbResolver.java | 135 +------ ...oDbResolverTest.java => MongoDbResolverIT.java} | 7 +- .../log4j/mongodb/MongoDbTestConstants.java | 3 +- ...-capped-int.xml => MongoDbAdditionalFields.xml} | 19 +- ...odb-capped-int.xml => MongoDbAuthFailureIT.xml} | 14 +- ...ngodb-capped-int.xml => MongoDbCappedIntIT.xml} | 12 +- ...odb-capped-long.xml => MongoDbCappedLongIT.xml} | 12 +- ...g4j2-mongodb-auth-failure.xml => MongoDbIT.xml} | 13 +- .../src/test/resources/MongoDbMapMessageIT.xml | 12 +- log4j-mongodb4/pom.xml | 144 ++++++- ...ppedTest.java => AbstractMongoDb4CappedIT.java} | 11 +- ...dsTest.java => MongoDb4AdditionalFieldsIT.java} | 14 +- ...FailureTest.java => MongoDb4AuthFailureIT.java} | 15 +- ...appedLongTest.java => MongoDb4CappedIntIT.java} | 16 +- ...appedIntTest.java => MongoDb4CappedLongIT.java} | 16 +- .../{MongoDb4Test.java => MongoDb4IT.java} | 14 +- ...pMessageTest.java => MongoDb4MapMessageIT.java} | 14 +- .../logging/log4j/mongodb4/MongoDb4Resolver.java | 137 +------ ...b4ResolverTest.java => MongoDb4ResolverIT.java} | 7 +- .../log4j/mongodb4/MongoDb4TestConstants.java | 3 +- .../test/resources/MongoDb4AdditionalFields.xml | 19 +- ...-auth-failure.xml => MongoDb4AuthFailureIT.xml} | 12 +- ...godb-capped-int.xml => MongoDb4CappedIntIT.xml} | 12 +- ...db-capped-long.xml => MongoDb4CappedLongIT.xml} | 12 +- .../src/test/resources/MongoDb4IT.xml | 16 +- .../src/test/resources/MongoDb4MapMessageIT.xml | 12 +- .../resources/log4j2-mongodb-additional-fields.xml | 33 -- .../src/test/resources/log4j2-mongodb.xml | 29 -- log4j-osgi-test/pom.xml | 8 +- log4j-parent/pom.xml | 182 ++++++--- log4j-perf-test/README.adoc | 30 ++ log4j-perf-test/pom.xml | 58 +-- .../pom.xml | 49 +-- .../logging/slf4j/fuzz/Slf4jLoggerFacade.java | 65 +++ ...jToLog4jBridgeWithJsonTemplateLayoutFuzzer.java | 38 ++ .../Slf4jToLog4jBridgeWithPatternLayoutFuzzer.java | 38 ++ ...4jToLog4jBridgeWithJsonTemplateLayoutFuzzer.xml | 18 +- .../Slf4jToLog4jBridgeWithPatternLayoutFuzzer.xml | 23 +- log4j-spring-cloud-config-client/pom.xml | 2 +- log4j-taglib/pom.xml | 14 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 94 +++-- .../apache/logging/log4j/taglib/package-info.java | 2 +- log4j-to-jul/pom.xml | 4 + .../logging/log4j/tojul/JULLoggerContext.java | 33 +- .../apache/logging/log4j/tojul/package-info.java | 2 +- log4j-to-slf4j/pom.xml | 4 + .../apache/logging/slf4j/SLF4JLoggerContext.java | 34 +- .../org/apache/logging/slf4j/package-info.java | 2 +- mvnw | 447 +++++++++------------ mvnw.cmd | 303 ++++++-------- oss-fuzz-build.sh | 218 ++++++++++ pom.xml | 48 ++- src/changelog/.2.x.x/2229_mongodb_docker.xml | 8 + ...eprecate_AbstractLogger_checkMessageFactory.xml | 8 + src/changelog/.2.x.x/2937-http-watcher.xml | 8 + .../.2.x.x/2942_fix_ThreadContext_putAll.xml | 8 + src/changelog/.2.x.x/2949_add_fuzzing.xml | 8 + .../.2.x.x/fix_JsonWriter_surrogate_handling.xml | 7 + .../.2.x.x/update_ch_qos_logback_logback_core.xml | 8 + .../update_com_fasterxml_jackson_jackson_bom.xml | 8 + .../.2.x.x/update_com_github_luben_zstd_jni.xml | 8 + .../.2.x.x/update_commons_io_commons_io.xml | 8 + .../.2.x.x/update_net_java_dev_jna_jna.xml | 8 + .../update_org_apache_logging_logging_parent.xml | 7 + .../update_org_apache_tomcat_tomcat_juli.xml | 8 + ...pdate_org_eclipse_platform_org_eclipse_osgi.xml | 8 + ..._org_openrewrite_maven_rewrite_maven_plugin.xml | 8 + ...enrewrite_recipe_rewrite_logging_frameworks.xml | 8 + ...org_openrewrite_recipe_rewrite_migrate_java.xml | 8 + .../.2.x.x/update_org_slf4j_slf4j_nop.xml | 8 + ..._springframework_cloud_spring_cloud_context.xml | 8 + src/changelog/2.24.1/.release-notes.adoc.ftl | 27 ++ .../changelog/2.24.1/.release.xml | 16 +- src/changelog/2.24.1/2229_mongodb_docker.xml | 8 + ...ke_LoggerRegistry_MessageFactory_namespaced.xml | 9 + src/changelog/2.24.1/2937-http-watcher.xml | 8 + .../2.24.1/2942_fix_ThreadContext_putAll.xml | 8 + .../2.24.1/2953_enable_docker_for_JTL.xml | 8 + .../update_org_apache_logging_logging_parent.xml | 7 + .../antora/modules/ROOT/pages/development.adoc | 7 +- .../ROOT/pages/manual/appenders/rolling-file.adoc | 27 +- .../ROOT/partials/features/compression.adoc | 42 ++ src/site/resources/.htaccess | 5 + 175 files changed, 4240 insertions(+), 2655 deletions(-)
