This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch fuzzing
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 9a31233c0d Simplify `FUZZING.adoc` instructions
new 48afb8fe43 More troubleshooting aid
add 200f852b45 Update `org.apache.maven.surefire:surefire-junit47` to
version `3.5.0` (#2898)
add f27f6bce68 Clean up `ThreadContextMap` implementations
add 10b7112bbf Clean-up release notes
add cc8c58fbe6 Update `com.github.luben:zstd-jni` to version `1.5.6-5`
(#2901)
add 9cd50db127 Move `log4j-flume-ng` to its own repo
add 835c24a735 Remove Flume dependencies from dep management
add 39dba0a24a Add changelog entry for #2902
add 517ce84866 Upgrade `logging-parent` to version `11.2.0`
add 773f65483a Update `org.apache.commons:commons-lang3` to version
`3.17.0` (#2907)
add 23cae42b76 chore: use `computIfAbsent` in `MarkerManager
add c696ce20a3 Disallow duplicate keys in JTL templates
new 094580e91e Merge remote-tracking branch 'origin/2.x' into fuzzing
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +-
oss-fuzz-build.sh | 6 +-
pom.xml | 5 +-
.../.2.x.x/2330_add_faster_web_app_context_map.xml | 2 +-
.../change_JsonReader_dup_key.xml} | 2 +-
.../move_flume_appender.xml} | 4 +-
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 -
.../.2.x.x/update_commons_io_commons_io.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 -
src/changelog/.2.x.x/update_org_tukaani_xz.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 +-
105 files changed, 1120 insertions(+), 6571 deletions(-)
create mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/spi/ThreadContextMapSuite.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/StringArrayThreadContextMapTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/ThreadContextMapTest.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/internal/map/StringArrayThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncThreadContextCopyOnWriteTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/context/internal/GarbageFreeSortedArrayThreadContextMapTest.java
rename log4j-core-test/src/test/java/org/apache/logging/log4j/{ =>
core/impl}/ThreadContextTestAccess.java (80%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-core/src/main/java/org/apache/logging/log4j/core/context/internal}/GarbageFreeSortedArrayThreadContextMap.java
(95%)
delete mode 100644 log4j-flume-ng/.log4j-plugin-processing-activator
delete mode 100644 log4j-flume-ng/pom.xml
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java
delete mode 100644
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/package-info.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
delete mode 100644
log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
delete mode 100644 log4j-flume-ng/src/test/resources/default_embedded.xml
delete mode 100644 log4j-flume-ng/src/test/resources/embedded.xml
delete mode 100644 log4j-flume-ng/src/test/resources/persistent.xml
create mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/appender/StringAppender.java
create mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark2.java
delete mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
copy src/changelog/{2.14.0/Update_jackson_2_11_0_2_11_2.xml =>
.2.x.x/change_JsonReader_dup_key.xml} (74%)
copy src/changelog/{2.14.0/LOG4J2-2851_Drop_log4j_mongodb2_module.xml =>
.2.x.x/move_flume_appender.xml} (62%)
delete mode 100644 src/changelog/.2.x.x/update_actions_checkout.xml
delete mode 100644 src/changelog/.2.x.x/update_actions_upload_artifact.xml
delete mode 100644 src/changelog/.2.x.x/update_apache_logging_parent.xml
delete mode 100644
src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml
delete mode 100644 src/changelog/.2.x.x/update_com_google_guava_guava.xml
delete mode 100644
src/changelog/.2.x.x/update_com_gradle_develocity_maven_extension.xml
delete mode 100644 src/changelog/.2.x.x/update_commons_io_commons_io.xml
delete mode 100644
src/changelog/.2.x.x/update_de_flapdoodle_embed_de_flapdoodle_embed_mongo.xml
delete mode 100644
src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml
delete mode 100644 src/changelog/.2.x.x/update_io_netty_netty_bom.xml
delete mode 100644
src/changelog/.2.x.x/update_net_javacrumbs_json_unit_json_unit.xml
delete mode 100644
src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.xml
delete mode 100644
src/changelog/.2.x.x/update_org_apache_logging_log4j_log4j_docgen_maven_plugin.xml
delete mode 100644 src/changelog/.2.x.x/update_org_apache_maven_maven_core.xml
delete mode 100644
src/changelog/.2.x.x/update_org_apache_maven_surefire_surefire_junit47.xml
delete mode 100644 src/changelog/.2.x.x/update_org_assertj_assertj_core.xml
delete mode 100644 src/changelog/.2.x.x/update_org_awaitility_awaitility.xml
delete mode 100644
src/changelog/.2.x.x/update_org_codehaus_groovy_groovy_bom.xml
delete mode 100644
src/changelog/.2.x.x/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
delete mode 100644 src/changelog/.2.x.x/update_org_hamcrest_hamcrest.xml
delete mode 100644
src/changelog/.2.x.x/update_org_hdrhistogram_hdrhistogram.xml
delete mode 100644 src/changelog/.2.x.x/update_org_hsqldb_hsqldb.xml
delete mode 100644 src/changelog/.2.x.x/update_org_jmdns_jmdns.xml
delete mode 100644 src/changelog/.2.x.x/update_org_junit_junit_bom.xml
delete mode 100644 src/changelog/.2.x.x/update_org_mongodb_3.12.14.xml
delete mode 100644 src/changelog/.2.x.x/update_org_tukaani_xz.xml
delete mode 100644 src/changelog/.2.x.x/update_org_xmlunit_xmlunit_core.xml
copy
src/site/antora/modules/ROOT/partials/manual/systemproperties/{properties-thread-context.adoc
=> properties-thread-context-core.adoc} (95%)
rename
src/site/antora/modules/ROOT/partials/manual/systemproperties/{properties-thread-context.adoc
=> properties-thread-context-simple-logger.adoc} (78%)
