This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch 2.x-StatusLogger-revamp
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from e0090d418b Merge branch '2.x' into 2.x-StatusLogger-revamp
add a8889222e4 Update `org.assertj:assertj-core` to version `3.25.3`
(#2262)
add 7d6f427af9 Update `github/codeql-action` to version `3.24.0` (#2264)
add 39b3684bc9 Update `org.junit:junit-bom` to version `5.10.2` (#2261)
add 71ca0865b8 [LOG4J2-3680] Allow deserialization of arrays
add 249a4f18dd Apply review suggestions
add e5d1c024c3 Fix regression in `JdkMapAdapterStringMap` performance
add 329fa64a05 Improve deprecated constructor and javadoc
add d992d4d4ce Remove test of deprecated constructor
add 9565d4b301 Fix BND failure
add 6e6655157d Simplify configuration after BND 7.x upgrade
add f1626ff0dd Reclassify PR as `changed`
add ed5098bfbe Add `[email protected]` to `generate-email.sh`
add e2e983fc4c Merge remote-tracking branch 'origin/2.x' into
2.x-StatusLogger-revamp
add 8632e09111 Update auto-generated files
add 36c4d48abb Remove `[email protected]` in `generate-email.sh`
add 73cd685d5a Remove nested logging tests
add 1afd1891c9 Remove `[email protected]` in `generate-email.sh`
add f8df1796dc Update auto-generated files
add bfb5197cf9 Merge remote-tracking branch 'origin/2.x' into
2.x-StatusLogger-revamp
add 9720939006 Remove `QueueFullAsync*` tests relying on nested logging
add c0235e3d85 Trim recently added public methods to `StatusLogger`
add b8e490c421 Deprecate buffering provided by `StatusLogger`
add bfdbde45d7 Match level comparison in `StatusConsoleListener` and
`StatusLogger`
add fab3f1547c Add getter for the fallback listener in `StatusLogger`
add a5397ebd50 Update `org.jctools:jctools-core` to version `4.0.3` (#2270)
add 200d605b08 Update `co.elastic.clients:elasticsearch-java` to version
`8.12.1` (#2269)
add 3333d00cf4 Update `org.zeromq:jeromq` to version `0.6.0` (#2271)
add 9f7533fa50 Merge remote-tracking branch 'origin/2.x' into
2.x-StatusLogger-revamp
add 4d43e827a8 Improve `StatusLogger` javadoc
No new revisions were added by this update.
Summary of changes:
.github/workflows/scorecards-analysis.yaml | 2 +-
.../util/internal/DefaultObjectInputFilter.java | 9 +-
.../log4j/util/internal/SerializationUtil.java | 4 +
.../logging/log4j/test/junit/SerialUtil.java | 49 +++++--
.../log4j/test/junit/StatusListenerExtension.java | 45 ++----
.../test/junit/StatusLoggerMockExtension.java | 14 +-
.../apache/logging/log4j/AbstractLoggerTest.java | 4 +-
.../logging/log4j/message/ObjectMessageTest.java | 8 +-
.../log4j/message/ParameterizedMessageTest.java | 16 ++-
.../log4j/status/StatusLoggerLevelTest.java | 2 +-
.../log4j/util/SortedArrayStringMapTest.java | 21 +--
.../log4j/util/internal/SerializationUtilTest.java | 54 ++++++++
log4j-api/pom.xml | 4 -
.../log4j/status/StatusConsoleListener.java | 2 +-
.../apache/logging/log4j/status/StatusData.java | 1 -
.../apache/logging/log4j/status/StatusLogger.java | 153 +++++++++-----------
.../log4j/util/FilteredObjectInputStream.java | 3 +-
.../log4j/util/internal/SerializationUtil.java | 71 +++++++++-
log4j-core-test/pom.xml | 1 -
.../apache/logging/log4j/core/LogEventTest.java | 60 +++-----
.../core/appender/OutputStreamManagerTest.java | 2 +-
.../core/appender/mom/kafka/KafkaAppenderTest.java | 16 +--
.../rolling/action/AbstractActionTest.java | 4 +-
.../core/appender/rolling/action/IfAllTest.java | 2 +-
.../core/appender/rolling/action/IfAnyTest.java | 2 +-
.../rolling/action/IfLastModifiedTest.java | 2 +-
.../core/appender/rolling/action/IfNotTest.java | 2 +-
.../log4j/core/async/QueueFullAbstractTest.java | 90 ------------
...rTest.java => QueueFullAsyncAppender1Test.java} | 2 +-
...Test2.java => QueueFullAsyncAppender2Test.java} | 2 +-
...gerTest.java => QueueFullAsyncLogger1Test.java} | 2 +-
...erTest2.java => QueueFullAsyncLogger2Test.java} | 2 +-
...erTest3.java => QueueFullAsyncLogger3Test.java} | 2 +-
...t.java => QueueFullAsyncLoggerConfig1Test.java} | 2 +-
...2.java => QueueFullAsyncLoggerConfig2Test.java} | 2 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 53 -------
...lAsyncLoggerConfigLoggingFromToStringTest2.java | 37 -----
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 50 -------
...eueFullAsyncLoggerLoggingFromToStringTest2.java | 44 ------
.../log4j/core/async/RingBufferLogEventTest.java | 13 +-
.../log4j/core/config/LoggersPluginTest.java | 2 +-
.../core/config/xml/XmlConfigurationPropsTest.java | 7 +-
.../core/impl/JdkMapAdapterStringMapTest.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEventTest.java | 22 +--
.../log4j/core/impl/MutableLogEventTest.java | 36 +----
.../core/impl/NestedLoggingFromToStringTest.java | 154 ---------------------
.../log4j/core/layout/SerializedLayoutTest.java | 33 +----
.../src/test/resources/log4j-sync-to-list.xml | 34 -----
...derTest.xml => QueueFullAsyncAppender1Test.xml} | 0
...est.xml => QueueFullAsyncLoggerConfig1Test.xml} | 0
.../core/async/QueueFullAsyncLoggerConfigTest.xml | 27 ----
log4j-core/pom.xml | 8 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 1 -
.../core/config/status/StatusConfiguration.java | 6 +-
.../log4j/core/impl/JdkMapAdapterStringMap.java | 44 +++++-
.../log4j/core/impl/ThreadContextDataInjector.java | 14 +-
.../logging/log4j/core/impl/package-info.java | 2 +-
.../log4j/core/util/ContextDataProvider.java | 10 +-
log4j-docker/pom.xml | 5 -
log4j-jcl/pom.xml | 7 +-
log4j-jdbc-dbcp2/pom.xml | 4 -
log4j-jpa/pom.xml | 5 -
.../layout/template/json/util/JsonWriterTest.java | 4 +-
log4j-parent/pom.xml | 10 +-
log4j-slf4j2-impl/pom.xml | 10 --
log4j-to-slf4j/pom.xml | 5 -
log4j-web/pom.xml | 2 +-
..._kubernetes.xml => 2238_fix_jdk_string_map.xml} | 3 +-
...ml => LOG4J2-3680_fix_serial_filter_arrays.xml} | 3 +-
... simplify_configuration_after_bnd_7_update.xml} | 8 +-
...pdate_co_elastic_clients_elasticsearch_java.xml | 4 +-
.../.2.x.x/update_github_codeql_action.xml | 4 +-
.../.2.x.x/update_org_assertj_assertj_core.xml | 4 +-
.../update_org_jctools_jctools_core.xml | 4 +-
...g_parent.xml => update_org_junit_junit_bom.xml} | 4 +-
.../update_org_zeromq_jeromq.xml | 4 +-
.../1906_harden_serialization_process.xml} | 4 +-
src/site/_release-notes/_2.22.0.adoc | 1 +
src/site/_release-notes/_2.x.x.adoc | 16 ++-
79 files changed, 454 insertions(+), 913 deletions(-)
create mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/internal/SerializationUtilTest.java
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncAppenderTest.java
=> QueueFullAsyncAppender1Test.java} (95%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncAppenderTest2.java
=> QueueFullAsyncAppender2Test.java} (94%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerTest.java
=> QueueFullAsyncLogger1Test.java} (96%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerTest2.java
=> QueueFullAsyncLogger2Test.java} (95%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerTest3.java
=> QueueFullAsyncLogger3Test.java} (98%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerConfigTest.java
=> QueueFullAsyncLoggerConfig1Test.java} (96%)
rename
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerConfigTest2.java
=> QueueFullAsyncLoggerConfig2Test.java} (94%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest2.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest2.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java
delete mode 100644 log4j-core-test/src/test/resources/log4j-sync-to-list.xml
rename
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/async/{QueueFullAsyncAppenderTest.xml
=> QueueFullAsyncAppender1Test.xml} (100%)
rename
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/async/{QueueFullAsyncLoggerConfigLoggingFromToStringTest.xml
=> QueueFullAsyncLoggerConfig1Test.xml} (100%)
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigTest.xml
copy src/changelog/.2.x.x/{fix_typo_kubernetes.xml =>
2238_fix_jdk_string_map.xml} (71%)
copy src/changelog/.2.x.x/{fix_typo_kubernetes.xml =>
LOG4J2-3680_fix_serial_filter_arrays.xml} (71%)
copy src/changelog/.2.x.x/{fix_security_manager_use_in_LoaderUtil.xml =>
simplify_configuration_after_bnd_7_update.xml} (74%)
copy src/changelog/{2.22.1 => .2.x.x}/update_org_jctools_jctools_core.xml (76%)
copy src/changelog/.2.x.x/{update_apache_logging_parent.xml =>
update_org_junit_junit_bom.xml} (64%)
copy src/changelog/{2.22.0 => .2.x.x}/update_org_zeromq_jeromq.xml (77%)
copy src/changelog/{2.20.0/1197_preserve_location.xml =>
2.22.0/1906_harden_serialization_process.xml} (59%)
