You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/10/10 11:21:08 UTC
(logging-log4j2) branch fix/2.x/MDC-remove updated (edc4f3ed6c -> df5ec81159)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch fix/2.x/MDC-remove
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from edc4f3ed6c Decrease visibility in `CloseableThreadContextTest` (2nd time)
add 466815490d Remove `println()` in test
add 28da72086f Migrate `log4j-to-slf4j` to JUnit5 (#3040)
add 070e1a82bf Fix `LowerLookup` link in docs (#3051)
add f90dee81f5 Migrate `log4j-jakarta-smtp` to JUnit 5 (#3052)
add a14f0ad57e Add `reachability-metadata.json` to all Log4j modules (#3053)
add 4281c6949f Add changelog and release notes
add c31f9d9371 Add `resource-config.json` to JTL
add cbe7e91304 Try fixing Dependabot
add d451aefc2c refactor log4j-jpa to use junit5
add a306d95e0e Update `org.apache.maven.surefire:surefire-junit47` to version `3.5.1` (#3062)
add bd40913a7b Remove ancient test fixtures and dependencies (#3039)
add c055b45b94 Fix Javadoc
add e9c7480034 Remove unused private constructor
add 7683460816 Javadoc
add 1e154d446f Prefix stack traces with a newline in Pattern Layout (#3045)
add ab0fdbc517 Document GraalVM usage with Log4j (#3054)
add 2d61fe0e6a Upgrades JUnit to version 5.11.x (#3069)
add a0ff439ef6 Merge remote-tracking branch 'origin/2.x' into fix/2.x/MDC-remove
add df5ec81159 Add a `copyAndRemoveAll()` test
No new revisions were added by this update.
Summary of changes:
.github/dependabot.yaml | 58 +++-
log4j-1.2-api/pom.xml | 34 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 2 -
.../test/java/org/apache/log4j/VelocityTest.java | 60 ----
.../log4j/util/AbsoluteDateAndTimeFilter.java | 35 --
.../org/apache/log4j/util/AbsoluteTimeFilter.java | 34 --
.../test/java/org/apache/log4j/util/Compare.java | 155 ---------
.../java/org/apache/log4j/util/ControlFilter.java | 45 ---
.../log4j/util/EnhancedJunitTestRunnerFilter.java | 64 ----
.../log4j/util/EnhancedLineNumberFilter.java | 41 ---
.../test/java/org/apache/log4j/util/Filter.java | 34 --
.../java/org/apache/log4j/util/ISO8601Filter.java | 34 --
.../apache/log4j/util/JunitTestRunnerFilter.java | 53 ---
.../org/apache/log4j/util/LineNumberFilter.java | 35 --
.../org/apache/log4j/util/RelativeTimeFilter.java | 35 --
.../org/apache/log4j/util/SunReflectFilter.java | 42 ---
.../java/org/apache/log4j/util/Transformer.java | 59 ----
.../log4j/util/UnexpectedFormatException.java | 26 --
.../apache/log4j/util/XMLLineAttributeFilter.java | 35 --
.../org/apache/log4j/util/XMLTimestampFilter.java | 32 --
.../java/org/apache/log4j/xml/DOMTestCase.java | 383 ++-------------------
.../src/test/resources/DOMTestCase/DOMTest4.xml | 44 ---
.../src/test/resources/DOMTestCase/DOMTest4_A1.xml | 26 --
.../src/test/resources/DOMTestCase/DOMTest4_A2.xml | 24 --
.../resources/DOMTestCase/categoryfactory1.xml | 35 --
.../resources/DOMTestCase/categoryfactory2.xml | 38 --
.../test/resources/DOMTestCase/loggerfactory1.xml | 35 --
...ableRenderer1.xml => testThrowableRenderer.xml} | 8 +-
log4j-1.2-api/src/test/resources/hello.vm | 6 -
.../logging/log4j/test/junit/SetTestProperty.java | 5 +-
.../logging/log4j/test/junit/TempLoggingDir.java | 3 +-
.../log4j/test/junit/TempLoggingDirectory.java | 44 ++-
.../log4j/test/junit/UsingStatusListener.java | 4 +-
.../log4j/test/junit/UsingTestProperties.java | 3 +-
.../logging/log4j/test/junit/package-info.java | 4 +-
.../logging/log4j/CloseableThreadContextTest.java | 1 -
.../map/UnmodifiableArrayBackedMapTest.java | 20 ++
.../log4j/test/junit/TempLoggingDirectoryTest.java | 6 +-
.../log4j-api/resource-config.json | 9 +
log4j-core-test/pom.xml | 63 +++-
.../log4j/core/test/junit/LoggerContextSource.java | 10 +-
.../log4j/core/test/junit/package-info.java | 2 +-
.../src/test/java/foo/TestFriendlyException.java | 27 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 151 ++++----
.../log4j/core/GarbageCollectionHelper.java | 66 ----
.../org/apache/logging/log4j/core/GcHelper.java | 54 +++
.../apache/logging/log4j/core/GcHelperTest.java | 14 +-
.../logging/log4j/core/GcPressureGenerator.java | 81 +++++
...ReusableParameterizedMessageMemoryLeakTest.java | 37 +-
.../rolling/RollingAppenderDirectWriteTest.java | 5 +-
.../async/AsyncLoggerArgumentFreedOnErrorTest.java | 79 ++---
.../core/async/QueueFullAsyncLogger3Test.java | 73 +---
.../config/plugins/processor/FakeAnnotations.java | 83 +++++
.../core/config/plugins/processor/FakePlugin.java | 54 +++
.../plugins/processor/GraalVmProcessorTest.java | 144 ++++++++
.../NestedLoggingFromThrowableMessageTest.java | 7 +-
.../PatternLayoutDefaultExceptionHandlerTest.java | 75 ++++
.../ExtendedThrowablePatternConverterTest.java | 9 +-
.../pattern/RootThrowablePatternConverterTest.java | 27 +-
.../pattern/ThrowablePatternConverterTest.java | 71 ++--
.../logging/log4j/core/pattern/ThrowableTest.java | 229 ------------
.../logging/log4j/core/util/ThrowablesTest.java | 19 +-
.../resources/EventParameterMemoryLeakTest.xml | 35 --
.../config/plugins/processor/GraalVmProcessor.java | 312 +++++++++++++++++
.../config/plugins/processor/PluginProcessor.java | 51 +--
.../plugins/processor/internal/Annotations.java | 147 ++++++++
.../processor/internal/ReachabilityMetadata.java | 290 ++++++++++++++++
.../config/plugins/processor/package-info.java | 2 +-
.../logging/log4j/core/filter/CompositeFilter.java | 4 -
.../log4j/core/filter/StringMatchFilter.java | 6 +-
.../logging/log4j/core/filter/ThresholdFilter.java | 13 +-
.../pattern/ExtendedThrowablePatternConverter.java | 8 +-
.../pattern/RootThrowablePatternConverter.java | 13 +-
...hrowableExtendedStackTraceRendererFactory.java} | 20 +-
.../ThrowableInvertedPropertyRendererFactory.java | 35 +-
.../ThrowableInvertedStackTraceRenderer.java | 2 +-
...hrowableInvertedStackTraceRendererFactory.java} | 20 +-
.../core/pattern/ThrowablePatternConverter.java | 55 +--
.../core/pattern/ThrowablePropertyRenderer.java | 98 ------
.../pattern/ThrowablePropertyRendererFactory.java | 120 +++++++
.../core/pattern/ThrowableStackTraceRenderer.java | 10 +
.../ThrowableStackTraceRendererFactory.java} | 24 +-
.../apache/logging/log4j/core/util/Throwables.java | 37 +-
.../log4j-core/resource-config.json | 12 +
log4j-jakarta-smtp/pom.xml | 6 -
.../logging/log4j/smtp/SmtpAppenderAsyncTest.java | 43 ++-
.../logging/log4j/smtp/SmtpAppenderTest.java | 19 +-
.../apache/logging/log4j/smtp/SmtpManagerTest.java | 2 +-
log4j-jpa/pom.xml | 5 -
.../appender/db/jpa/AbstractJpaAppenderTest.java | 117 ++++---
.../appender/db/jpa/JpaHsqldbAppenderTest.java | 21 +-
.../core/appender/db/jpa/LogEventEntityTest.java | 9 +-
.../ContextDataAttributeConverterTest.java | 26 +-
.../ContextDataJsonAttributeConverterTest.java | 35 +-
.../ContextMapAttributeConverterTest.java | 26 +-
.../ContextMapJsonAttributeConverterTest.java | 35 +-
.../ContextStackAttributeConverterTest.java | 30 +-
.../ContextStackJsonAttributeConverterTest.java | 42 +--
.../converter/InstantAttributeConverterTest.java | 33 +-
.../converter/MarkerAttributeConverterTest.java | 53 ++-
.../converter/MessageAttributeConverterTest.java | 31 +-
.../StackTraceElementAttributeConverterTest.java | 103 +++---
.../converter/ThrowableAttributeConverterTest.java | 39 +--
.../template/json/JsonTemplateLayoutDefaults.java | 4 +-
.../json/resolver/StackTraceStringResolver.java | 6 +-
.../resource-config.json | 9 +
log4j-parent/pom.xml | 16 +-
.../logging/log4j/taglib/CatchingTagTest.java | 15 +-
.../log4j/taglib/LoggingMessageTagSupportTest.java | 32 +-
log4j-to-slf4j/pom.xml | 5 -
.../logging/slf4j/CallerInformationTest.java | 10 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 26 +-
src/changelog/.2.x.x/.release-notes.adoc.ftl | 18 +-
.../3045_change_PatternLayout_prefix.xml} | 3 +-
...xml => 3045_fix_PatternLayout_rEx_property.xml} | 4 +-
.../3045_remove_PatternLayout_ex_ansi.xml} | 4 +-
.../3053_graalvm_processor.xml} | 6 +-
...org_apache_maven_surefire_surefire_junit47.xml} | 4 +-
src/changelog/2.0.1/.release-notes.adoc.ftl | 2 +-
src/changelog/2.0.2/.release-notes.adoc.ftl | 2 +-
src/changelog/2.0/.release-notes.adoc.ftl | 6 +-
src/changelog/2.1/.release-notes.adoc.ftl | 2 +-
src/changelog/2.15.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.16.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.17.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.17.1/.release-notes.adoc.ftl | 2 +-
src/changelog/2.17.2/.release-notes.adoc.ftl | 2 +-
src/changelog/2.18.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.19.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.2/.release-notes.adoc.ftl | 2 +-
src/changelog/2.20.0/.release-notes.adoc.ftl | 2 +-
src/changelog/2.21.0/.release-notes.adoc.ftl | 6 +-
src/changelog/2.21.1/.release-notes.adoc.ftl | 6 +-
src/changelog/2.24.0/.release-notes.adoc.ftl | 4 +-
src/changelog/2.3/.release-notes.adoc.ftl | 2 +-
src/changelog/2.4.1/.release-notes.adoc.ftl | 2 +-
src/changelog/2.4/.release-notes.adoc.ftl | 2 +-
src/site/antora/modules/ROOT/nav.adoc | 1 +
src/site/antora/modules/ROOT/pages/graalvm.adoc | 128 +++++++
.../modules/ROOT/pages/manual/installation.adoc | 60 +++-
.../antora/modules/ROOT/pages/manual/lookups.adoc | 2 +-
.../modules/ROOT/pages/manual/pattern-layout.adoc | 150 ++++----
.../antora/modules/ROOT/pages/manual/plugins.adoc | 45 ++-
.../antora/modules/ROOT/pages/release-notes.adoc | 6 +
144 files changed, 2770 insertions(+), 2816 deletions(-)
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/AbsoluteTimeFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/Compare.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/ControlFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/EnhancedLineNumberFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/Filter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/ISO8601Filter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/LineNumberFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/RelativeTimeFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/SunReflectFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/Transformer.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/UnexpectedFormatException.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/XMLLineAttributeFilter.java
delete mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/util/XMLTimestampFilter.java
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/DOMTest4.xml
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/DOMTest4_A1.xml
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/DOMTest4_A2.xml
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/categoryfactory1.xml
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/categoryfactory2.xml
delete mode 100644 log4j-1.2-api/src/test/resources/DOMTestCase/loggerfactory1.xml
rename log4j-1.2-api/src/test/resources/DOMTestCase/{throwableRenderer1.xml => testThrowableRenderer.xml} (86%)
delete mode 100644 log4j-1.2-api/src/test/resources/hello.vm
create mode 100644 log4j-api/src/main/resources/META-INF/native-image/org.apache.logging.log4j/log4j-api/resource-config.json
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/GcHelper.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContextAccessor.java => log4j-core-test/src/test/java/org/apache/logging/log4j/core/GcHelperTest.java (76%)
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/GcPressureGenerator.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/plugins/processor/FakeAnnotations.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/plugins/processor/GraalVmProcessorTest.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutDefaultExceptionHandlerTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java
delete mode 100644 log4j-core-test/src/test/resources/EventParameterMemoryLeakTest.xml
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/GraalVmProcessor.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/internal/Annotations.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/internal/ReachabilityMetadata.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/{PlainTextRenderer.java => ThrowableExtendedStackTraceRendererFactory.java} (61%)
copy log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertySourceCamelCaseTest.java => log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowableInvertedPropertyRendererFactory.java (50%)
copy log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/{PlainTextRenderer.java => ThrowableInvertedStackTraceRendererFactory.java} (61%)
delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePropertyRenderer.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePropertyRendererFactory.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/{config/plugins/convert/HexConverter.java => pattern/ThrowableStackTraceRendererFactory.java} (63%)
create mode 100644 log4j-core/src/main/resources/META-INF/native-image/org.apache.logging.log4j/log4j-core/resource-config.json
create mode 100644 log4j-layout-template-json/src/main/resources/META-INF/native-image/org.apache.logging.log4j/log4j-layout-template-json/resource-config.json
copy src/changelog/{2.0-beta1/Update_the_versions_of_SLF4J_and_Logback.xml => .2.x.x/3045_change_PatternLayout_prefix.xml} (62%)
copy src/changelog/.2.x.x/{2937-http-watcher.xml => 3045_fix_PatternLayout_rEx_property.xml} (60%)
copy src/changelog/{2.14.0/LOG4J2-2851_Drop_log4j_mongodb2_module.xml => .2.x.x/3045_remove_PatternLayout_ex_ansi.xml} (59%)
copy src/changelog/{2.20.0/LOG4J2-1631_Honor-timezone-in-file-name-pattern.xml => .2.x.x/3053_graalvm_processor.xml} (60%)
copy src/changelog/.2.x.x/{update_ch_qos_logback_logback_core.xml => update_org_apache_maven_surefire_surefire_junit47.xml} (60%)
create mode 100644 src/site/antora/modules/ROOT/pages/graalvm.adoc