This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch fuzzing in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 094580e91e76ac87f7aef4751c280154228cdae2 Merge: 48afb8fe43 c696ce20a3 Author: Volkan Yazıcı <[email protected]> AuthorDate: Sat Aug 31 17:37:48 2024 +0200 Merge remote-tracking branch 'origin/2.x' into fuzzing .github/workflows/build.yaml | 9 +- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 6 +- .github/workflows/merge-dependabot.yaml | 4 +- log4j-api-test/pom.xml | 2 +- .../log4j/test/spi/ThreadContextMapSuite.java | 139 ++++ .../log4j/ThreadContextInheritanceTest.java | 28 - .../map/StringArrayThreadContextMapTest.java | 287 ------- .../map/UnmodifiableArrayBackedMapTest.java | 6 +- .../log4j/spi/DefaultThreadContextMapTest.java | 158 +--- .../logging/log4j/spi/ThreadContextMapTest.java | 76 -- log4j-api/pom.xml | 11 +- .../org/apache/logging/log4j/MarkerManager.java | 7 +- .../org/apache/logging/log4j/ThreadContext.java | 5 - .../internal/map/StringArrayThreadContextMap.java | 199 ----- .../internal/map/UnmodifiableArrayBackedMap.java | 16 +- .../org/apache/logging/log4j/spi/CopyOnWrite.java | 2 + .../CopyOnWriteSortedArrayThreadContextMap.java | 255 ------ .../logging/log4j/spi/DefaultThreadContextMap.java | 154 ++-- .../logging/log4j/spi/NoOpThreadContextMap.java | 16 +- .../org/apache/logging/log4j/spi/Provider.java | 260 ++---- .../logging/log4j/spi/ThreadContextMapFactory.java | 4 +- .../async/AbstractAsyncThreadContextTestBase.java | 69 +- .../async/AsyncThreadContextCopyOnWriteTest.java | 40 - ...GarbageFreeSortedArrayThreadContextMapTest.java | 116 +++ .../core/impl/ThreadContextDataInjectorTest.java | 39 +- .../{ => core/impl}/ThreadContextTestAccess.java | 7 +- log4j-core/pom.xml | 7 + .../GarbageFreeSortedArrayThreadContextMap.java | 7 +- .../logging/log4j/core/impl/Log4jProvider.java | 119 +++ log4j-flume-ng/.log4j-plugin-processing-activator | 1 - log4j-flume-ng/pom.xml | 122 --- .../log4j/flume/appender/AbstractFlumeManager.java | 32 - .../apache/logging/log4j/flume/appender/Agent.java | 89 -- .../logging/log4j/flume/appender/BatchEvent.java | 41 - .../log4j/flume/appender/FlumeAppender.java | 373 --------- .../log4j/flume/appender/FlumeAvroManager.java | 377 --------- .../log4j/flume/appender/FlumeEmbeddedManager.java | 287 ------- .../logging/log4j/flume/appender/FlumeEvent.java | 385 --------- .../log4j/flume/appender/FlumeEventFactory.java | 45 - .../flume/appender/FlumePersistentManager.java | 911 --------------------- .../log4j/flume/appender/Log4jEventSource.java | 66 -- .../logging/log4j/flume/appender/package-info.java | 27 - .../log4j/flume/appender/FlumeAppenderTest.java | 491 ----------- .../flume/appender/FlumeEmbeddedAgentTest.java | 282 ------- .../flume/appender/FlumeEmbeddedAppenderTest.java | 309 ------- .../appender/FlumePersistentAppenderTest.java | 464 ----------- .../log4j/flume/appender/FlumePersistentPerf.java | 224 ----- .../logging/log4j/flume/test/FlumeKeyProvider.java | 39 - .../src/test/resources/default_embedded.xml | 37 - log4j-flume-ng/src/test/resources/embedded.xml | 53 -- log4j-flume-ng/src/test/resources/persistent.xml | 40 - .../layout/template/json/util/JsonReaderTest.java | 18 + .../layout/template/json/util/JsonReader.java | 4 + log4j-parent/pom.xml | 156 +--- .../log4j/perf/appender/StringAppender.java | 98 +++ .../log4j/perf/jmh/ThreadContextBenchmark.java | 10 +- .../log4j/perf/jmh/ThreadContextBenchmark2.java | 264 ++++++ .../CopyOnWriteOpenHashMapThreadContextMap.java | 46 -- .../GarbageFreeOpenHashMapThreadContextMap.java | 1 + log4j-to-jul/pom.xml | 13 + .../apache/logging/log4j/tojul/JULProvider.java | 10 +- log4j-to-slf4j/pom.xml | 7 + .../org/apache/logging/slf4j/SLF4JProvider.java | 4 +- pom.xml | 5 +- .../.2.x.x/2330_add_faster_web_app_context_map.xml | 2 +- ...ukaani_xz.xml => change_JsonReader_dup_key.xml} | 5 +- ...s_io_commons_io.xml => move_flume_appender.xml} | 6 +- src/changelog/.2.x.x/update_actions_checkout.xml | 8 - .../.2.x.x/update_actions_upload_artifact.xml | 8 - .../.2.x.x/update_apache_logging_parent.xml | 8 - ...pdate_co_elastic_clients_elasticsearch_java.xml | 8 - .../.2.x.x/update_com_github_luben_zstd_jni.xml | 4 +- .../.2.x.x/update_com_google_guava_guava.xml | 8 - ...pdate_com_gradle_develocity_maven_extension.xml | 8 - ..._flapdoodle_embed_de_flapdoodle_embed_mongo.xml | 8 - ...de_flapdoodle_reverse_de_flapdoodle_reverse.xml | 8 - src/changelog/.2.x.x/update_io_netty_netty_bom.xml | 8 - .../update_net_javacrumbs_json_unit_json_unit.xml | 8 - .../update_org_apache_activemq_activemq_broker.xml | 8 - .../update_org_apache_commons_commons_lang3.xml | 4 +- ...che_logging_log4j_log4j_docgen_maven_plugin.xml | 8 - .../update_org_apache_logging_logging_parent.xml | 3 +- .../.2.x.x/update_org_apache_maven_maven_core.xml | 8 - ..._org_apache_maven_surefire_surefire_junit47.xml | 8 - .../.2.x.x/update_org_assertj_assertj_core.xml | 8 - .../.2.x.x/update_org_awaitility_awaitility.xml | 8 - .../update_org_codehaus_groovy_groovy_bom.xml | 8 - ...pse_persistence_org_eclipse_persistence_jpa.xml | 8 - .../.2.x.x/update_org_hamcrest_hamcrest.xml | 8 - .../update_org_hdrhistogram_hdrhistogram.xml | 8 - src/changelog/.2.x.x/update_org_hsqldb_hsqldb.xml | 8 - src/changelog/.2.x.x/update_org_jmdns_jmdns.xml | 8 - .../.2.x.x/update_org_junit_junit_bom.xml | 8 - .../.2.x.x/update_org_mongodb_3.12.14.xml | 8 - .../.2.x.x/update_org_xmlunit_xmlunit_core.xml | 8 - .../modules/ROOT/pages/manual/garbagefree.adoc | 2 +- .../modules/ROOT/pages/manual/simple-logger.adoc | 12 +- .../ROOT/pages/manual/systemproperties.adoc | 2 +- .../modules/ROOT/pages/manual/thread-context.adoc | 20 +- ...xt.adoc => properties-thread-context-core.adoc} | 4 +- ...> properties-thread-context-simple-logger.adoc} | 29 +- 102 files changed, 1117 insertions(+), 6557 deletions(-) diff --cc log4j-parent/pom.xml index 15cbf1b08e,4bb07d1f59..3f3ada44f8 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@@ -107,10 -105,8 +105,9 @@@ <javax-servlet-jsp.version>2.3.3</javax-servlet-jsp.version> <jansi.version>2.4.1</jansi.version> <java-allocation-instrumenter.version>3.3.4</java-allocation-instrumenter.version> + <jazzer.version>0.22.1</jazzer.version> <jconsole.version>1.7.0</jconsole.version> <jctools.version>4.0.5</jctools.version> - <je.version>18.3.12</je.version> <jeromq.version>0.6.0</jeromq.version> <jetty.version>9.4.55.v20240627</jetty.version> <jmdns.version>3.5.12</jmdns.version> diff --cc pom.xml index c6250e59a7,a71a3958cb..2be4f1f0f9 --- a/pom.xml +++ b/pom.xml @@@ -247,8 -246,6 +247,7 @@@ <module>log4j-core-test</module> <module>log4j-couchdb</module> <module>log4j-docker</module> - <module>log4j-flume-ng</module> + <module>log4j-fuzz-test</module> <module>log4j-iostreams</module> <module>log4j-jakarta-smtp</module> <module>log4j-jakarta-web</module>
