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 2023/11/28 20:45:23 UTC
(logging-log4j2) branch main updated (cf2ccc5149 -> 9651905cbe)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from cf2ccc5149 Use String#isEmpty()
new 1be544d128 Remove deprecated `log4j-distribution` et al.
new aa581bd862 Sync `pom.xml`s with the ones in `2.x`
new cc7797d4f8 Rename `log4j-osgi` to `log4j-osgi-test`
new c56514a0f6 Remove unused `benchmark.yml` workflow
new af6cc67e65 Rename `log4j-perf` to `log4j-perf-test`
new 8fa369a6df Revamp README
new ec75825f57 Rename `.yml` to `.yaml`, the official extension
new 9651905cbe Improve auxiliary support files
The 8 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/{dependabot.yml => dependabot.yaml} | 0
.github/workflows/benchmark.yml | 236 ---------
.github/workflows/{build.yml => build.yaml} | 0
.../{codeql-analysis.yml => codeql-analysis.yaml} | 0
BUILDING.md | 1 -
CODE_OF_CONDUCT.md | 2 +-
NOTICE.txt | 3 -
README.adoc | 23 +
README.md | 117 -----
RELEASE-NOTES.adoc | 98 ----
CODE_OF_CONDUCT.md => RELEASE-NOTES.md | 3 +-
SECURITY.md | 25 +-
log4j-1.2-api/pom.xml | 2 -
log4j-appserver/pom.xml | 2 -
log4j-core-its/pom.xml | 2 -
.../log4j/core/config/JiraLog4j2_2134Test.java | 2 +-
.../SequenceNumberPatternConverterTest.java | 2 +-
...quenceNumberPatternConverterZeroPaddedTest.java | 2 +-
...yml => SequenceNumberPatternConverterTest.yaml} | 0
...uenceNumberPatternConverterZeroPaddedTest.yaml} | 0
.../{log4j2-2134.yml => log4j2-2134.yaml} | 0
.../core/time/internal/format/FixedDateFormat.java | 4 +-
log4j-csv/pom.xml | 2 -
log4j-distribution/pom.xml | 576 ---------------------
log4j-distribution/src/assembly/bin.xml | 56 --
log4j-distribution/src/assembly/src.xml | 80 ---
log4j-docker/pom.xml | 2 -
log4j-flume-ng/pom.xml | 2 -
log4j-gctests/pom.xml | 2 -
log4j-iostreams/pom.xml | 2 -
log4j-jcl/pom.xml | 2 -
log4j-jdbc-dbcp2/pom.xml | 2 -
log4j-jdbc/pom.xml | 2 -
log4j-jndi-test/pom.xml | 2 -
log4j-jndi/pom.xml | 2 -
log4j-kubernetes/pom.xml | 2 -
log4j-layout-jackson-xml/pom.xml | 2 -
log4j-layout-jackson/pom.xml | 2 -
log4j-layout-template-json-test/pom.xml | 2 -
log4j-layout-template-json/pom.xml | 2 -
log4j-mongodb4/pom.xml | 2 -
{log4j-osgi => log4j-osgi-test}/pom.xml | 4 +-
.../log4j/osgi/tests/AbstractLoadBundleTest.java | 0
.../logging/log4j/osgi/tests/AbstractOsgiTest.java | 0
.../logging/log4j/osgi/tests/CoreOsgiTest.java | 0
.../log4j/osgi/tests/CustomConfiguration.java | 0
.../osgi/tests/CustomConfigurationFactory.java | 0
.../logging/log4j/osgi/tests/JULProviderTest.java | 0
.../log4j/osgi/tests/SLF4JProviderTest.java | 0
.../tests/equinox/EquinoxLoadApiBundleTest.java | 0
.../osgi/tests/felix/FelixLoadApiBundleTest.java | 0
.../log4j/osgi/tests/junit/OsgiTestRule.java | 0
.../src/test/resources/log4j2.custom | 0
{log4j-perf => log4j-perf-test}/pom.xml | 2 +-
.../log4j/ThreadContextBenchmarkAccess.java | 0
.../json/BlackHoleByteBufferDestination.java | 0
.../template/json/JsonTemplateLayoutBenchmark.java | 0
.../json/JsonTemplateLayoutBenchmarkReport.java | 0
.../json/JsonTemplateLayoutBenchmarkState.java | 0
.../log4j/message/ParameterFormatterBenchmark.java | 0
...bstractStringLayoutStringEncodingBenchmark.java | 0
.../perf/jmh/AnnotationVsMarkerInterface.java | 0
.../perf/jmh/AsyncAppenderLog4j1Benchmark.java | 0
.../jmh/AsyncAppenderLog4j1LocationBenchmark.java | 0
.../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 0
.../jmh/AsyncAppenderLog4j2LocationBenchmark.java | 0
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 0
.../jmh/AsyncAppenderLogbackLocationBenchmark.java | 0
.../log4j/perf/jmh/AsyncLoggersBenchmark.java | 0
.../perf/jmh/AsyncLoggersLocationBenchmark.java | 0
.../logging/log4j/perf/jmh/ClocksBenchmark.java | 0
.../log4j/perf/jmh/CollectionsBenchmark.java | 0
.../jmh/ConcurrentAsyncLoggerToFileBenchmark.java | 0
.../perf/jmh/ConfiguratorInitializeBenchmark.java | 0
.../log4j/perf/jmh/DateTimeFormatBenchmark.java | 0
.../log4j/perf/jmh/DebugDisabledBenchmark.java | 0
.../log4j/perf/jmh/FileAppenderBenchmark.java | 0
.../perf/jmh/FileAppenderParamsBenchmark.java | 0
.../perf/jmh/FileAppenderThrowableBenchmark.java | 0
.../jmh/FileAppenderWithLocationBenchmark.java | 0
.../log4j/perf/jmh/FormatterLoggerBenchmark.java | 0
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 0
.../jmh/Log4j2AppenderComparisonBenchmark.java | 0
.../log4j/perf/jmh/Log4jLogEventBenchmark.java | 0
.../perf/jmh/LogBuilderMarkerFilterBenchmark.java | 0
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 0
.../log4j/perf/jmh/LoggingDisabledBenchmark.java | 0
.../logging/log4j/perf/jmh/MDCFilterBenchmark.java | 0
.../log4j/perf/jmh/MarkerFilterBenchmark.java | 0
.../log4j/perf/jmh/MemoryHandlerJULBenchmark.java | 0
.../jmh/MemoryHandlerJULLocationBenchmark.java | 0
.../perf/jmh/NamePatternConverterBenchmark.java | 0
.../logging/log4j/perf/jmh/NanotimeBenchmark.java | 0
.../logging/log4j/perf/jmh/OutputBenchmark.java | 0
.../perf/jmh/ParameterizedMessageBenchmark.java | 0
.../jmh/ParameterizedMessageInliningBenchmark.java | 0
.../log4j/perf/jmh/PatternLayoutBenchmark.java | 0
.../perf/jmh/PatternLayoutComparisonBenchmark.java | 0
.../log4j/perf/jmh/ReflectionBenchmark.java | 0
.../logging/log4j/perf/jmh/SimpleBenchmark.java | 0
.../perf/jmh/SortedArrayVsHashMapBenchmark.java | 0
.../logging/log4j/perf/jmh/StackWalkBenchmark.java | 0
.../perf/jmh/StringBuilderEscapeBenchmark.java | 0
.../log4j/perf/jmh/StringEncodingBenchmark.java | 0
.../log4j/perf/jmh/TextEncoderHelperBenchmark.java | 0
.../log4j/perf/jmh/ThreadContextBenchmark.java | 0
.../ThreadLocalVsConcurrentHashMapBenchmark.java | 0
.../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 0
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 0
.../log4j/perf/jmh/TimeFormatBenchmark.java | 0
.../logging/log4j/perf/jmh/UnboxBenchmark.java | 0
.../log4j/perf/jmh/UuidGeneratorBenchmark.java | 0
.../logging/log4j/perf/jmh/VarargsBenchmark.java | 0
.../logging/log4j/perf/jmh/package-info.java | 0
.../logging/log4j/perf/nogc/AbstractLogger.java | 0
.../logging/log4j/perf/nogc/ClassicLogger.java | 0
.../logging/log4j/perf/nogc/DemoAppender.java | 0
.../apache/logging/log4j/perf/nogc/NoGcLayout.java | 0
.../apache/logging/log4j/perf/nogc/NoGcLogger.java | 0
.../logging/log4j/perf/nogc/NoGcMessage.java | 0
.../perf/nogc/NoGcMessagePatternConverter.java | 0
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 0
.../log4j/perf/nogc/ParameterizedMessage.java | 0
.../org/apache/logging/log4j/perf/nogc/Test.java | 0
.../log4j/perf/util/BenchmarkMessageParams.java | 0
.../logging/log4j/perf/util/DemoAppender.java | 0
.../logging/log4j/perf/util/NoOpJULHandler.java | 0
.../logging/log4j/perf/util/NoOpLog4jAppender.java | 0
.../log4j/perf/util/NoOpLogbackAppender.java | 0
.../logging/log4j/perf/util/StackDriver.java | 0
.../CopyOnWriteOpenHashMapThreadContextMap.java | 0
.../GarbageFreeOpenHashMapThreadContextMap.java | 0
...rrentAsyncLoggerToFileBenchmark-asyncConfig.xml | 0
.../ConcurrentAsyncLoggerToFileBenchmark.xml | 0
.../main/resources/log4j12-perf-file-throwable.xml | 0
.../src/main/resources/log4j12-perf.xml | 0
.../src/main/resources/log4j12-perf2.xml | 0
.../src/main/resources/log4j12-perfloc.xml | 0
.../main/resources/log4j2-appenderComparison.xml | 0
.../src/main/resources/log4j2-jdbc-appender.xml | 0
.../main/resources/log4j2-markerFilter-perf.xml | 0
.../main/resources/log4j2-markerFilter-perf2.xml | 0
.../src/main/resources/log4j2-noFilter-perf.xml | 0
.../main/resources/log4j2-perf-file-throwable.xml | 0
.../src/main/resources/log4j2-perf.xml | 0
.../src/main/resources/log4j2-perf2.xml | 0
.../src/main/resources/log4j2-perf3.xml | 0
.../src/main/resources/log4j2-perfloc.xml | 0
.../resources/log4j2-threadContextFilter-perf.xml | 0
.../main/resources/logback-markerFilter-perf.xml | 0
.../src/main/resources/logback-mdcFilter-perf.xml | 0
.../main/resources/logback-perf-file-throwable.xml | 0
.../src/main/resources/logback-perf.xml | 0
.../src/main/resources/logback-perf2.xml | 0
.../src/main/resources/logback-perfloc.xml | 0
.../resources/perf-WithoutAnyAppender-location.xml | 0
.../src/main/resources/perf-WithoutAnyAppender.xml | 0
.../perf-log4j12-async-location-noOpAppender.xml | 0
.../resources/perf-log4j12-async-noOpAppender.xml | 0
.../src/main/resources/perf-log4j12-async.xml | 0
.../perf-logback-async-location-noOpAppender.xml | 0
.../resources/perf-logback-async-noOpAppender.xml | 0
.../src/main/resources/perf-logback-async.xml | 0
.../src/main/resources/perf3PlainNoLoc.xml | 0
.../perf5AsyncApndDsrptrNoLoc-noOpAppender.xml | 0
.../perf5AsyncApndDsrptrWithLoc-noOpAppender.xml | 0
.../perf5AsyncApndMpscQNoLoc-noOpAppender.xml | 0
.../perf5AsyncApndMpscQWithLoc-noOpAppender.xml | 0
.../resources/perf5AsyncApndNoLoc-noOpAppender.xml | 0
.../src/main/resources/perf5AsyncApndNoLoc.xml | 0
.../perf5AsyncApndWithLoc-noOpAppender.xml | 0
.../perf5AsyncApndXferQNoLoc-noOpAppender.xml | 0
.../perf5AsyncApndXferQWithLoc-noOpAppender.xml | 0
log4j-plugin-processor/pom.xml | 2 -
log4j-plugins-test/pom.xml | 2 -
log4j-plugins/pom.xml | 2 -
log4j-slf4j-impl/pom.xml | 2 -
log4j-slf4j2-impl/pom.xml | 2 -
log4j-spring-cloud-config-client/pom.xml | 2 -
log4j-to-jul/pom.xml | 2 -
log4j-to-slf4j/pom.xml | 2 -
pom.xml | 57 +-
src/assembly/site.xml | 31 --
src/site/asciidoc/manual/garbagefree.adoc | 2 +-
src/site/asciidoc/manual/logbuilder.adoc | 2 +-
src/site/asciidoc/performance.adoc | 10 +-
src/site/asciidoc/runtime-dependencies.adoc | 4 -
src/site/markdown/manual/cloud.md | 2 +-
188 files changed, 107 insertions(+), 1291 deletions(-)
rename .github/{dependabot.yml => dependabot.yaml} (100%)
delete mode 100644 .github/workflows/benchmark.yml
rename .github/workflows/{build.yml => build.yaml} (100%)
rename .github/workflows/{codeql-analysis.yml => codeql-analysis.yaml} (100%)
create mode 100644 README.adoc
delete mode 100644 README.md
delete mode 100644 RELEASE-NOTES.adoc
copy CODE_OF_CONDUCT.md => RELEASE-NOTES.md (83%)
rename log4j-core-test/src/test/resources/{SequenceNumberPatternConverterTest.yml => SequenceNumberPatternConverterTest.yaml} (100%)
rename log4j-core-test/src/test/resources/{SequenceNumberPatternConverterZeroPaddedTest.yml => SequenceNumberPatternConverterZeroPaddedTest.yaml} (100%)
rename log4j-core-test/src/test/resources/{log4j2-2134.yml => log4j2-2134.yaml} (100%)
delete mode 100644 log4j-distribution/pom.xml
delete mode 100644 log4j-distribution/src/assembly/bin.xml
delete mode 100644 log4j-distribution/src/assembly/src.xml
rename {log4j-osgi => log4j-osgi-test}/pom.xml (98%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java (100%)
rename {log4j-osgi => log4j-osgi-test}/src/test/resources/log4j2.custom (100%)
rename {log4j-perf => log4j-perf-test}/pom.xml (99%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ConfiguratorInitializeBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderWithLocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/FormatterLoggerBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/LoggingDisabledBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/jmh/package-info.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/perf/util/StackDriver.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j12-perf-file-throwable.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j12-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j12-perf2.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j12-perfloc.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-appenderComparison.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-jdbc-appender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-markerFilter-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-markerFilter-perf2.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-noFilter-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-perf-file-throwable.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-perf2.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-perf3.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-perfloc.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/log4j2-threadContextFilter-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-markerFilter-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-mdcFilter-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-perf-file-throwable.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-perf.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-perf2.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/logback-perfloc.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-WithoutAnyAppender-location.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-WithoutAnyAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-log4j12-async-location-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-log4j12-async-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-log4j12-async.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-logback-async-location-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-logback-async-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf-logback-async.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf3PlainNoLoc.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndNoLoc.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml (100%)
rename {log4j-perf => log4j-perf-test}/src/main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml (100%)
delete mode 100644 src/assembly/site.xml
(logging-log4j2) 08/08: Improve auxiliary support files
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9651905cbefbc2a92c6b98ff41bc60e4959b1aff
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Nov 28 11:57:34 2023 +0100
Improve auxiliary support files
---
BUILDING.md | 1 -
CODE_OF_CONDUCT.md | 2 +-
NOTICE.txt | 3 --
RELEASE-NOTES.adoc | 98 ----------------------------------
CODE_OF_CONDUCT.md => RELEASE-NOTES.md | 3 +-
SECURITY.md | 25 +++++----
6 files changed, 18 insertions(+), 114 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index b7e8ead10f..1223bda341 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -18,7 +18,6 @@
# Requirements
* JDK 11+
-* Apache Maven 3.x (optional)
* A modern Linux, OSX, or Windows host
<a name="building"></a>
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 3ed501501d..e13878a151 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-The Apache code of conduct page is [https://www.apache.org/foundation/policies/conduct.html](https://www.apache.org/foundation/policies/conduct.html).
+See [the Apache Software Foundation's Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/NOTICE.txt b/NOTICE.txt
index bdf985e45c..e51fe310c8 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,9 +4,6 @@ Copyright 1999-2023 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
TypeUtil.java
Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
diff --git a/RELEASE-NOTES.adoc b/RELEASE-NOTES.adoc
deleted file mode 100644
index 0166af7e81..0000000000
--- a/RELEASE-NOTES.adoc
+++ /dev/null
@@ -1,98 +0,0 @@
-////
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-= 3.0.0 (2023-06-17)
-
-As the Java ecosystem has evolved, requests have been received from users, and the need for improved security has
-become more apparent, changes were necessariy in Log4j's design:
-
-* With the introduction of the Java Platform Module System (JPMS) changes were needed to how the various log4j modules
-are packaged. While not every log4j module is now a fully compliant JPMS module with its own module-info.java file,
-all the modules likely to be used in a JPMS environment are.
-* Many optional components, such as Scripting, JNDI, JPA and JMS, have been moved to their own modules. This makes
-Log4j-core slightly smaller in 3.x and aids in security by not having jars with unwanted behaviors present, making
-disabling them via system properties unnecessary.
-* All plugins constructed using Log4j 3.x are now located using Java's ServiceLoader. This avoids many of the problems
-users had packaging plugins in "shaded" jars as that technology directly supports ServiceLoader. Plugins constructed
-using Log4j 2.x will still function in Log4j 3.x.
-* Log4j's annotation processor has been individually packaged separate from Log4j-core and the plugin system it enables.
-For applications using the module path this makes it easier to provide the annotation processor since it must be
-explicitly declared in those cases.
-* Log4j 3.x now uses an internal dependency injection framework to allow plugins to be injected with instances of
-classes they are dependent on.
-* Many system properties used by Log4j can now be set to apply to a single LoggerContext making configuration
-in application frameworks that support multiple applications more flexible.
-* Some deprecated classes have been removed. However, every attempt has been made to ensure that user code compiled
-for Log4j 2.x will continue to operate with the Log4j 3.x libraries present instead.
-
-== Changes
-
-=== Added
-
-* Allow plugins to be created through more flexible dependency injection patterns. (for https://issues.apache.org/jira/browse/LOG4J2-1188[LOG4J2-1188] by Matt Sicker)
-* Allow to force LOG4J2 to use TCCL only. (for https://issues.apache.org/jira/browse/LOG4J2-2171[LOG4J2-2171] by `rmannibucau`, Ralph Goers)
-* Allow web lookup to access more information. (for https://issues.apache.org/jira/browse/LOG4J2-2523[LOG4J2-2523] by Romain Manni-Bucau, Ralph Goers)
-* Allow web lookup of session attributes. (for https://issues.apache.org/jira/browse/LOG4J2-2688[LOG4J2-2688] by Ralph Goers, Romain Manni-Bucau)
-* Add support for injecting plugin configuration via builder methods. (for https://issues.apache.org/jira/browse/LOG4J2-2700[LOG4J2-2700] by Matt Sicker)
-* Add scopes API for customizing plugin instance lifecycle. (for https://issues.apache.org/jira/browse/LOG4J2-2852[LOG4J2-2852] by Matt Sicker)
-* Add qualifier annotations for distinguishing instances of the same type. (for https://issues.apache.org/jira/browse/LOG4J2-2853[LOG4J2-2853] by Matt Sicker)
-* Create standardized dependency injection API. This is supported in several plugin categories and other configurable instances previously defined via system properties. (for https://issues.apache.org/jira/browse/LOG4J2-2854[LOG4J2-2854] by Matt Sicker)
-* Add conditional annotations to support more declarative binding factory bundle classes. (for https://issues.apache.org/jira/browse/LOG4J2-3300[LOG4J2-3300] by Matt Sicker)
-* Add built-in JSON configuration parser for a useful structured configuration file format which only requires the `java.base` module. (for https://issues.apache.org/jira/browse/LOG4J2-3415[LOG4J2-3415] by Matt Sicker)
-* Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name. (for https://issues.apache.org/jira/browse/LOG4J2-857[LOG4J2-857] by Matt Sicker)
-
-=== Changed
-
-* Simplify Maven `site` phase and align it with the one in `2.x` branch. (for https://github.com/apache/logging-log4j2/pull/1220[1220] by Volkan Yazıcı)
-* Update build to use Java 11 bytecode. (for https://github.com/apache/logging-log4j2/pull/480[480] by Ralph Goers)
-* Convert documentation into AsciiDoc format. (for https://issues.apache.org/jira/browse/LOG4J2-1802[LOG4J2-1802] by Matt Sicker)
-* Rename package `core.util.datetime` to `core.time.internal.format` to clarify these classes are to be considered private. (for https://issues.apache.org/jira/browse/LOG4J2-2224[LOG4J2-2224] by Remko Popma)
-* Move time-related classes from `core.util` to `core.time`. Classes considered private moved to `core.time.internal`. (for https://issues.apache.org/jira/browse/LOG4J2-2225[LOG4J2-2225] by Remko Popma)
-* Split off Kafka support into a new module `log4j-kafka`. (for https://issues.apache.org/jira/browse/LOG4J2-2227[LOG4J2-2227] by Gary Gregory)
-* Split off ZeroMq/JeroMq support into a new module `log4j-jeromq`. (for https://issues.apache.org/jira/browse/LOG4J2-2228[LOG4J2-2228] by Gary Gregory)
-* Split off SMTP support into a new module `log4j-smtp`. (for https://issues.apache.org/jira/browse/LOG4J2-2230[LOG4J2-2230] by Gary Gregory)
-* Split off CSV layout into a new module `log4j-csv`. (for https://issues.apache.org/jira/browse/LOG4J2-2231[LOG4J2-2231] by Gary Gregory)
-* Split off JMS support into a new module `log4j-jms`. (for https://issues.apache.org/jira/browse/LOG4J2-2232[LOG4J2-2232] by Gary Gregory)
-* Split off JDBC support into a new module `log4j-jdbc`. (for https://issues.apache.org/jira/browse/LOG4J2-2233[LOG4J2-2233] by Gary Gregory)
-* Split off Jackson-based layouts into their own modules: `log4j-layout-jackson-json`, `log4j-layout-jackson-xml` and `log4j-layout-jackson-yaml`. (for https://issues.apache.org/jira/browse/LOG4J2-2237[LOG4J2-2237] by Gary Gregory)
-* Update builder methods from the "with" prefix to the "set" prefix. (for https://issues.apache.org/jira/browse/LOG4J2-2492[LOG4J2-2492] by Gary Gregory)
-* Remove deprecated code. (for https://issues.apache.org/jira/browse/LOG4J2-2493[LOG4J2-2493] by Gary Gregory)
-* Fix typo in method `MergeStrategy.mergeConfigurations`. (for https://issues.apache.org/jira/browse/LOG4J2-2617[LOG4J2-2617] by Matt Sicker)
-* Separate plugin support to its own module. Plugin annotation processor will now generate a Java source file compatible with java.util.ServiceLoader instead of a binary file. (for https://issues.apache.org/jira/browse/LOG4J2-2621[LOG4J2-2621] by Ralph Goers)
-* Rename `PluginVisitor` and related classes to `ConfigurationInjectionBuilder`. (for https://issues.apache.org/jira/browse/LOG4J2-2683[LOG4J2-2683] by Matt Sicker)
-* Locate plugins in modules. (for https://issues.apache.org/jira/browse/LOG4J2-2690[LOG4J2-2690] by Ralph Goers)
-* Split off JNDI support into a new module `log4j-jndi`. (for https://issues.apache.org/jira/browse/LOG4J2-3242[LOG4J2-3242] by Ralph Goers)
-* Split off scripting support into a new module `log4j-script`. (for https://issues.apache.org/jira/browse/LOG4J2-3307[LOG4J2-3307] by Ralph Goers)
-* Defer loading of `StrLookup` plugin classes until first usage. (for https://issues.apache.org/jira/browse/LOG4J2-3441[LOG4J2-3441] by Matt Sicker)
-* Flatten the `ThreadContextMap` interfaces with default methods. (for https://issues.apache.org/jira/browse/LOG4J2-3626[LOG4J2-3626] by Matt Sicker)
-* Allow Log4j properties to be provided in JSON files. (for https://issues.apache.org/jira/browse/LOG4J2-3658[LOG4J2-3658] by Ralph Goers)
-* Unify plugin builders and plugin factories. (for https://issues.apache.org/jira/browse/LOG4J2-860[LOG4J2-860] by Matt Sicker)
-* Update Conversant Disruptor from 1.12.15 to 1.12.21. The new version requires Java 11. (for https://issues.apache.org/jira/browse/LOG4J2-2079[LOG4J2-2079] by Ralph Goers, Volkan Yazıcı)
-
-=== Removed
-
-* Remove support for `java.io.Serializable` in several classes including `Message`, `Layout`, `LogEvent`, `Logger`, and `ReadOnlyStringMap`. (for https://issues.apache.org/jira/browse/LOG4J2-3228[LOG4J2-3228] by Matt Sicker)
-
-=== Fixed
-
-* `EnvironmentLookup` may throw NPE. (for https://issues.apache.org/jira/browse/LOG4J2-2244[LOG4J2-2244] by Gary Gregory)
-* Move `ProcessIdUtil` from `log4j-api` to `log4j-core`. (for https://issues.apache.org/jira/browse/LOG4J2-2279[LOG4J2-2279] by Gary Gregory, Remko Popma)
-* `FixedDateFormat` parses timezone offsets, -8:00 is interpreted as GMT-8:00. (for https://issues.apache.org/jira/browse/LOG4J2-2306[LOG4J2-2306] by Carter Kozak)
-* `RoutingAppender.Builder#setPurgePolicy` fluently returns the builder instance. (for https://issues.apache.org/jira/browse/LOG4J2-2545[LOG4J2-2545] by Carter Kozak)
-* Reduce Log4j 2 initialization time by deferring loading Plugin classes. (for https://issues.apache.org/jira/browse/LOG4J2-2795[LOG4J2-2795] by Ralph Goers)
-* Fixes incorrect constructor call in `LocalizedMessageFactory`. (for https://issues.apache.org/jira/browse/LOG4J2-2850[LOG4J2-2850] by Volkan Yazıcı, sandeepbarnwal)
-* Fix file descriptor leak on Tomcat. (for https://issues.apache.org/jira/browse/LOG4J2-3663[LOG4J2-3663] by `lenoch7`, Piotr P. Karwasz)
diff --git a/CODE_OF_CONDUCT.md b/RELEASE-NOTES.md
similarity index 83%
copy from CODE_OF_CONDUCT.md
copy to RELEASE-NOTES.md
index 3ed501501d..bba82bc6af 100644
--- a/CODE_OF_CONDUCT.md
+++ b/RELEASE-NOTES.md
@@ -14,4 +14,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-The Apache code of conduct page is [https://www.apache.org/foundation/policies/conduct.html](https://www.apache.org/foundation/policies/conduct.html).
+
+See [the Release Notes page](https://logging.apache.org/log4j/3.x/release-notes.html).
diff --git a/SECURITY.md b/SECURITY.md
index faece48db7..9465922ed5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,18 @@
-# Security Policy
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
-## Supported Versions
+ http://www.apache.org/licenses/LICENSE-2.0
-Only the most recent release of Apache Log4j 2 is supported.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
-## Reporting a Vulnerability
-
-If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, please report them privately to the [Log4j Security Team](mailto:security@logging.apache.org).
-
-## Past Vulnerabilities
-
-See [Apache Log4j Security Vulnerabilities](https://logging.apache.org/log4j/2.x/security.html).
+See [the Security page](https://logging.apache.org/log4j/3.x/security.html).
(logging-log4j2) 02/08: Sync `pom.xml`s with the ones in `2.x`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit aa581bd862180fb5a2790162f7ac602f3fb6d149
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 15:46:01 2023 +0100
Sync `pom.xml`s with the ones in `2.x`
---
log4j-1.2-api/pom.xml | 2 -
log4j-appserver/pom.xml | 2 -
log4j-core-its/pom.xml | 2 -
log4j-csv/pom.xml | 2 -
log4j-distribution/pom.xml | 576 -------------------------------
log4j-docker/pom.xml | 2 -
log4j-flume-ng/pom.xml | 2 -
log4j-gctests/pom.xml | 2 -
log4j-iostreams/pom.xml | 2 -
log4j-jcl/pom.xml | 2 -
log4j-jdbc-dbcp2/pom.xml | 2 -
log4j-jdbc/pom.xml | 2 -
log4j-jndi-test/pom.xml | 2 -
log4j-jndi/pom.xml | 2 -
log4j-kubernetes/pom.xml | 2 -
log4j-layout-jackson-xml/pom.xml | 2 -
log4j-layout-jackson/pom.xml | 2 -
log4j-layout-template-json-test/pom.xml | 2 -
log4j-layout-template-json/pom.xml | 2 -
log4j-mongodb4/pom.xml | 2 -
log4j-osgi/pom.xml | 2 -
log4j-plugin-processor/pom.xml | 2 -
log4j-plugins-test/pom.xml | 2 -
log4j-plugins/pom.xml | 2 -
log4j-slf4j-impl/pom.xml | 2 -
log4j-slf4j2-impl/pom.xml | 2 -
log4j-spring-cloud-config-client/pom.xml | 2 -
log4j-to-jul/pom.xml | 2 -
log4j-to-slf4j/pom.xml | 2 -
pom.xml | 53 ++-
30 files changed, 49 insertions(+), 636 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 15ec761ae2..95ff919fd6 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j 1.x Compatibility API</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j 1.2 Documentation</docLabel>
- <projectDir>/log4j12-api</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index 2b1e62704d..6e50f9d2e8 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -31,8 +31,6 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Web Documentation</docLabel>
- <projectDir>/log4j-appserver</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 3c13a7b914..46edbf02b8 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -30,8 +30,6 @@
<description>Integration Tests for the Apache Log4j Implementation</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Core Integration Tests Documentation</docLabel>
- <projectDir>/log4j-core-its</projectDir>
<bnd.baseline.skip>true</bnd.baseline.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
diff --git a/log4j-csv/pom.xml b/log4j-csv/pom.xml
index 0815eba586..d9efac8623 100644
--- a/log4j-csv/pom.xml
+++ b/log4j-csv/pom.xml
@@ -29,8 +29,6 @@
<description>Apache Log4j CSV Layout.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j CSV Documentation</docLabel>
- <projectDir>/log4j-csv</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
deleted file mode 100644
index 4cccca9db4..0000000000
--- a/log4j-distribution/pom.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${revision}</version>
- <relativePath>../log4j-parent</relativePath>
- </parent>
-
- <artifactId>log4j-distribution</artifactId>
- <packaging>pom</packaging>
- <name>Log4j Distribution</name>
- <description>The Apache Log4j distribution archives.</description>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- <maven.test.skip>true</maven.test.skip>
- <spotless.check.skip>true</spotless.check.skip>
- <httpclient.version>4.5.13</httpclient.version>
- <httpcore.version>4.4.12</httpcore.version>
- <slf4j.version>1.7.36</slf4j.version>
- <snappy.version>1.1.10.5</snappy.version>
- <spring-cloud.version>3.1.7</spring-cloud.version>
- </properties>
- <dependencyManagement>
- <!-- Note that none of the dependencies listed here really matter. Only the Log4j jars will be included
- in the distribution archive file -->
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <!-- log4j-1.2-api -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-api -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-appserver -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-appserver</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-appserver</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-core -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core-test</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core-test</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-csv -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-csv</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-docker</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-docker</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-flume-ng -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- log4j-iostreams -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-iostreams</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-iostreams</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jcl -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jdbc -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jdbc</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jdbc-dbcp2 -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jdbc-dbcp2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jdbc-dbcp2</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jndi -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jndi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jndi</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jpl -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jpl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jpl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-jul -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-kubernetes -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kubernetes</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kubernetes</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-layout-jackson -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-jackson</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-jackson</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-layout-jackson-xml -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-jackson-xml</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-jackson-xml</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-layout-template-json -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-template-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-template-json</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-mongodb4 -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-mongodb4</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-mongodb4</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-osgi -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-osgi</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-plugin-processor -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-plugin-processor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-plugin-processor</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-plugins -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-plugins</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-plugins</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-script -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-script</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-script</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-sfl4j-impl -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- log4j-slf4j2-impl -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- log4j-spring-cloud-config-client -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-cloud-config-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-cloud-config-client</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-to-jul -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-jul</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-jul</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- log4j-to-slf4j -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <!-- calculate checksums of source release for Apache dist area -->
- <plugin>
- <groupId>net.nicoulaj.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>calculate-checksums</id>
- <goals>
- <goal>files</goal>
- </goals>
- <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 -->
- <phase>post-integration-test</phase>
- <configuration>
- <algorithms>
- <algorithm>SHA-256</algorithm>
- <algorithm>SHA-512</algorithm>
- </algorithms>
- <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor -->
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>apache-log4j-${project.version}-src.zip</include>
- <include>apache-log4j-${project.version}-src.tar.gz</include>
- <include>apache-log4j-${project.version}-bin.zip</include>
- <include>apache-log4j-${project.version}-bin.tar.gz</include>
- </includes>
- </fileSet>
- </fileSets>
- <csvSummary>false</csvSummary>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>post-integration-test</phase>
- <configuration>
- <target>
- <property name="spaces" value=" " />
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.zip.sha256" append="yes">${spaces}apache-log4j-${project.version}-src.zip</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.zip.sha512" append="yes">${spaces}apache-log4j-${project.version}-src.zip</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.tar.gz.sha256" append="yes">${spaces}apache-log4j-${project.version}-src.tar.gz</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.tar.gz.sha512" append="yes">${spaces}apache-log4j-${project.version}-src.tar.gz</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.zip.sha256" append="yes">${spaces}apache-log4j-${project.version}-bin.zip</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.zip.sha512" append="yes">${spaces}apache-log4j-${project.version}-bin.zip</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.tar.gz.sha256" append="yes">${spaces}apache-log4j-${project.version}-bin.tar.gz</concat>
- <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.tar.gz.sha512" append="yes">${spaces}apache-log4j-${project.version}-bin.tar.gz</concat>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>log4j2-source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>apache-log4j-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>binary</id>
- <configuration>
- <finalName>apache-log4j-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- <!-- <execution>
- <id>osgi-binary</id>
- <configuration>
- <finalName>apache-log4j-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/osgi-bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution> -->
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-release-artifacts</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <keyname>${log4jSigningUserName}</keyname>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index 9f5f86e466..1fc0d595ff 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -30,8 +30,6 @@
<description>Apache Log4j Docker Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j Docker Library Documentation</docLabel>
- <projectDir>/docker</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 835a22011c..6541bf104c 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j Flume Appender</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Flume Documentation</docLabel>
- <projectDir>/flume-ng</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml
index 2272c50a03..a461b5fff7 100644
--- a/log4j-gctests/pom.xml
+++ b/log4j-gctests/pom.xml
@@ -30,8 +30,6 @@
<description>Apache Log4j Implementation GC Tests</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Core Documentation</docLabel>
- <projectDir>/core</projectDir>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
</properties>
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 5d61d3ca9e..f2a90a3823 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j streams to log event converters</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Streaming Documentation</docLabel>
- <projectDir>/log4j-iostreams</projectDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 34f8dc8624..75f4225347 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j Commons Logging Adapter</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>JCL Bridge Documentation</docLabel>
- <projectDir>/jcl-bridge</projectDir>
<bnd-extra-module-options>
<!-- Use module name returned by `jar -d` -->
commons.logging;substitute="commons-logging"
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index 07e05e5ff6..302ea20ac5 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -29,8 +29,6 @@
<description>Connection source for the JDBC Appender using Apache Commons DBCP2.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j JDBC DBCP 2 Documentation</docLabel>
- <projectDir>/log4j-jdbc-dbcp2</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-jdbc/pom.xml b/log4j-jdbc/pom.xml
index 7335aa8e16..5b247493e1 100644
--- a/log4j-jdbc/pom.xml
+++ b/log4j-jdbc/pom.xml
@@ -29,8 +29,6 @@
<description>Apache Log4j Java Database Connectivity (JDBC).</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j JDBC Documentation</docLabel>
- <projectDir>/log4j-jdbc</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-jndi-test/pom.xml b/log4j-jndi-test/pom.xml
index eaaa4d0f09..a8a610db70 100644
--- a/log4j-jndi-test/pom.xml
+++ b/log4j-jndi-test/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j JNDI Test Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>JNDI Documentation</docLabel>
- <projectDir>/log4j-jndi-test</projectDir>
<module.name>org.apache.logging.log4j.jndi.test</module.name>
</properties>
<dependencies>
diff --git a/log4j-jndi/pom.xml b/log4j-jndi/pom.xml
index 815d909ad0..fe20c57a27 100644
--- a/log4j-jndi/pom.xml
+++ b/log4j-jndi/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j JNDI Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>JNDI Documentation</docLabel>
- <projectDir>/log4j-jndi</projectDir>
<module.name>org.apache.logging.log4j.jndi</module.name>
</properties>
<dependencies>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index f7f7151799..0f0730f2f0 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -30,8 +30,6 @@
<description>Apache Log4j Kubernetes Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j Kubernetes Library Documentation</docLabel>
- <projectDir>/kubernetes</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-layout-jackson-xml/pom.xml b/log4j-layout-jackson-xml/pom.xml
index 241bc93034..fc6be11c8a 100644
--- a/log4j-layout-jackson-xml/pom.xml
+++ b/log4j-layout-jackson-xml/pom.xml
@@ -29,8 +29,6 @@
<description>Apache Log4j Layout for Jackson XML.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j Layout for Jackson XML Documentation</docLabel>
- <projectDir>/log4j-layout-xml</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-layout-jackson/pom.xml b/log4j-layout-jackson/pom.xml
index 058baab4de..20decf368a 100644
--- a/log4j-layout-jackson/pom.xml
+++ b/log4j-layout-jackson/pom.xml
@@ -29,8 +29,6 @@
<description>Apache Log4j Layout for Jackson.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j Layout for Jackson Documentation</docLabel>
- <projectDir>/log4j-layout-jackson</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index c4084624ee..7a24826ad0 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -29,8 +29,6 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Tests for the JSON Template Layout of Apache Log4j</docLabel>
- <projectDir>/log4j-layout-template-json-test</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 310c7632f0..651512771e 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -31,8 +31,6 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j Layout for JSON Template Documentation</docLabel>
- <projectDir>/log4j-layout-template-json</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index 250217357e..7aae766411 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -29,8 +29,6 @@
<description>MongoDB appender for Log4j using the MongoDB 4 driver API.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>MongoDB 4 Documentation</docLabel>
- <projectDir>/log4j-mongodb4</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index f9fbeabfeb..fb2472fbdb 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j OSGi tests</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>OSGi Documentation</docLabel>
- <projectDir>/osgi</projectDir>
<module.name>org.apache.logging.log4j.osgi</module.name>
<skipTests>true</skipTests>
<bnd.baseline.skip>true</bnd.baseline.skip>
diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml
index 2cb732ead2..4c20538441 100644
--- a/log4j-plugin-processor/pom.xml
+++ b/log4j-plugin-processor/pom.xml
@@ -30,8 +30,6 @@
<description>Log4j Plugin Annotation Processor</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Plugin Documentation</docLabel>
- <projectDir>/plugins</projectDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml
index 65ee6226db..6fce895866 100644
--- a/log4j-plugins-test/pom.xml
+++ b/log4j-plugins-test/pom.xml
@@ -30,8 +30,6 @@
<description>Log4j Plugin Test Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Plugin Documentation</docLabel>
- <projectDir>/plugins</projectDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 86566fe740..ac1f8d3012 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -30,8 +30,6 @@
<description>Log4j Plugin Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Plugin Documentation</docLabel>
- <projectDir>/plugins</projectDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index c2f883b300..b62388ad3e 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j SLF4J API binding to Log4j 2 Core</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>SLF4J Documentation</docLabel>
- <projectDir>/slf4j-impl</projectDir>
<slf4j.version>1.7.25</slf4j.version>
<!--
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 8001c8980e..cba8d4610f 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j SLF4J 2.0 API binding to Log4j 2 Core</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>SLF4J Documentation</docLabel>
- <projectDir>/slf4j2-impl</projectDir>
<!-- Override parent's default -->
<slf4j.version>2.0.6</slf4j.version>
diff --git a/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config-client/pom.xml
index 0650fde9ab..94ccedbe9e 100644
--- a/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config-client/pom.xml
@@ -30,8 +30,6 @@
<description>Apache Log4j Spring Cloud Config Client Support</description>
<properties>
<log4jParentDir>${basedir}/../..</log4jParentDir>
- <docLabel>Log4j Spring Cloud Config Client Documentation</docLabel>
- <projectDir>/log4j-spring-cloud-config-client</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml
index 5946652fbd..576366f795 100644
--- a/log4j-to-jul/pom.xml
+++ b/log4j-to-jul/pom.xml
@@ -31,8 +31,6 @@
<inceptionYear>2022</inceptionYear>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Log4j to JUL Documentation</docLabel>
- <projectDir>/log4j-to-jul</projectDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 4062d11abb..c0334118ae 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -30,8 +30,6 @@
<description>The Apache Log4j binding between Log4j 2 API and SLF4J.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>SLF4J Documentation</docLabel>
- <projectDir>/log4j-to-slf4j</projectDir>
<!--
~ OSGi and JPMS options
diff --git a/pom.xml b/pom.xml
index bdd7b04d1c..431abc6bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,9 +312,15 @@
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
<!-- JDK version of the main Maven process (used in ASF parent POM) -->
<minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
- <docLabel>Site Documentation</docLabel>
- <projectDir />
<module.name />
+
+ <!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
+ We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
+ Though inheriting this property has two undesired consequences:
+ 1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50)
+ 2. This value is employed in various places while creating the distribution
+ To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
+ Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
<project.build.outputTimestamp>2023-10-23T19:03:40Z</project.build.outputTimestamp>
<!-- ========================
@@ -329,6 +335,7 @@
It is manually enabled only for this root module below. -->
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
+
</properties>
<dependencyManagement>
@@ -412,12 +419,12 @@
<version>${project.version}</version>
</dependency>
- <!-- JNDI -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jndi</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jndi-test</artifactId>
@@ -533,6 +540,26 @@
<plugins>
+ <!-- `cyclonedx-maven-plugin` doesn't exclude not installed/deployed modules: https://github.com/CycloneDX/cyclonedx-maven-plugin/issues/409
+ This `generate-sbom` execution override configures such exclusions. -->
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sbom</id>
+ <configuration combine.self="append">
+ <excludeArtifactId>log4j-core-its</excludeArtifactId>
+ <excludeArtifactId>log4j-jndi-test</excludeArtifactId>
+ <excludeArtifactId>log4j-layout-template-json-test</excludeArtifactId>
+ <excludeArtifactId>log4j-osgi-test</excludeArtifactId>
+ <excludeArtifactId>log4j-perf-test</excludeArtifactId>
+ <excludeArtifactId>log4j-plugins-test</excludeArtifactId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Enable BOM flattening -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -595,6 +622,19 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1C</forkCount>
+ <reuseForks>false</reuseForks>
+ <runOrder>alphabetical</runOrder>
+ <systemPropertyVariables>
+ <java.awt.headless>true</java.awt.headless>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
<!-- ███████ ████████ █████ ██████ ████████ ███████ ██ ████████ ███████
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███████ ██ ███████ ██████ ██ ███████ ██ ██ █████
@@ -638,7 +678,10 @@
<!-- This execution must be inherited and enabled by modules publishing javadocs: `-api` and `-core`.
Such modules enable this execution via `maven.javadoc.skip` property.
Hence, don't insert a `<inherited>false</inherited>`, please! -->
- <configuration>
+ <configuration combine.self="override">
+ <!-- `notimestamp` avoids `diff` noise and is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+ <notimestamp>true</notimestamp>
+ <skip>${maven.javadoc.skip}</skip>
<bottom><![CDATA[<p align="center">
Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved.<br/>
@@ -805,6 +848,7 @@
███████ ██ ████ ██████ ███████ ██ ██ ███████ -->
</plugins>
+
</build>
<profiles>
@@ -845,4 +889,5 @@
</build>
</profile>
</profiles>
+
</project>
(logging-log4j2) 07/08: Rename `.yml` to `.yaml`, the official extension
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ec75825f57e5682625b26a5b22a83d29d81c3b35
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 22:07:22 2023 +0100
Rename `.yml` to `.yaml`, the official extension
---
.github/{dependabot.yml => dependabot.yaml} | 0
.github/workflows/{build.yml => build.yaml} | 0
.github/workflows/{codeql-analysis.yml => codeql-analysis.yaml} | 0
.../java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java | 2 +-
.../logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java | 2 +-
.../core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java | 2 +-
...PatternConverterTest.yml => SequenceNumberPatternConverterTest.yaml} | 0
...PaddedTest.yml => SequenceNumberPatternConverterZeroPaddedTest.yaml} | 0
.../src/test/resources/{log4j2-2134.yml => log4j2-2134.yaml} | 0
9 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yaml
similarity index 100%
rename from .github/dependabot.yml
rename to .github/dependabot.yaml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yaml
similarity index 100%
rename from .github/workflows/build.yml
rename to .github/workflows/build.yaml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yaml
similarity index 100%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql-analysis.yaml
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
index f7a8086b96..641326d564 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@Tag("yaml")
-@LoggerContextSource("log4j2-2134.yml")
+@LoggerContextSource("log4j2-2134.yaml")
public class JiraLog4j2_2134Test {
@Test
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
index 69e3b315b4..60ff42bc98 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.core.test.junit.Named;
import org.junit.jupiter.api.Test;
-@LoggerContextSource("SequenceNumberPatternConverterTest.yml")
+@LoggerContextSource("SequenceNumberPatternConverterTest.yaml")
public class SequenceNumberPatternConverterTest {
@Test
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
index feb2a2b4d8..049fe51c72 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.core.test.junit.Named;
import org.junit.jupiter.api.Test;
-@LoggerContextSource("SequenceNumberPatternConverterZeroPaddedTest.yml")
+@LoggerContextSource("SequenceNumberPatternConverterZeroPaddedTest.yaml")
public class SequenceNumberPatternConverterZeroPaddedTest {
@Test
diff --git a/log4j-core-test/src/test/resources/SequenceNumberPatternConverterTest.yml b/log4j-core-test/src/test/resources/SequenceNumberPatternConverterTest.yaml
similarity index 100%
rename from log4j-core-test/src/test/resources/SequenceNumberPatternConverterTest.yml
rename to log4j-core-test/src/test/resources/SequenceNumberPatternConverterTest.yaml
diff --git a/log4j-core-test/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yml b/log4j-core-test/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yaml
similarity index 100%
rename from log4j-core-test/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yml
rename to log4j-core-test/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yaml
diff --git a/log4j-core-test/src/test/resources/log4j2-2134.yml b/log4j-core-test/src/test/resources/log4j2-2134.yaml
similarity index 100%
rename from log4j-core-test/src/test/resources/log4j2-2134.yml
rename to log4j-core-test/src/test/resources/log4j2-2134.yaml
(logging-log4j2) 06/08: Revamp README
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8fa369a6df76ea1bb8fe5d30148a7ee320908591
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 22:04:50 2023 +0100
Revamp README
---
README.adoc | 23 ++++++++++++
README.md | 117 ------------------------------------------------------------
2 files changed, 23 insertions(+), 117 deletions(-)
diff --git a/README.adoc b/README.adoc
new file mode 100644
index 0000000000..8c85d68c66
--- /dev/null
+++ b/README.adoc
@@ -0,0 +1,23 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+https://github.com/apache/logging-log4j2/actions/workflows/build.yaml[image:https://img.shields.io/github/actions/workflow/status/apache/logging-log4j2/build.yaml?branch=main&label=build%20%283.x%29[Build (3.x)]]
+https://search.maven.org/artifact/org.apache.logging.log4j/log4j-api[image:https://img.shields.io/maven-central/v/org.apache.logging.log4j/log4j-api?versionPrefix=3.[Maven Central (3.x)]]
+https://github.com/apache/logging-log4j2/security/code-scanning[image:https://github.com/apache/logging-log4j2/actions/workflows/codeql-analysis.yaml/badge.svg?branch=main[CodeQL (3.x)]]
+
+Apache Log4j is a versatile, industrial-grade Java logging framework composed of an API, its implementation, and components to assist the deployment for various use cases.
+For further information (support, download, etc.) see https://logging.apache.org/log4j[the project website].
diff --git a/README.md b/README.md
deleted file mode 100644
index 83534e3430..0000000000
--- a/README.md
+++ /dev/null
@@ -1,117 +0,0 @@
-<!---
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-# [Apache Log4j 3.x](https://logging.apache.org/log4j/2.x/)
-
-Apache Log4j 3.x is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x,
-and provides many of the improvements available in Logback while fixing some inherent problems in Logback's architecture.
-
-[](https://search.maven.org/artifact/org.apache.logging.log4j/log4j-api)
-[](https://github.com/apache/logging-log4j2/actions/workflows/build.yml)
-[](https://github.com/apache/logging-log4j2/actions/workflows/build.yml)
-
-
-## Pull Requests on Github
-
-By sending a pull request you grant the Apache Software Foundation sufficient rights to use and release the submitted
-work under the Apache license. You grant the same rights (copyright license, patent license, etc.) to the
-Apache Software Foundation as if you have signed a Contributor License Agreement. For contributions that are
-judged to be non-trivial, you will be asked to actually sign a [Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
-
-## Usage
-
-Users should refer to [Maven, Ivy, Gradle, and SBT Artifacts](http://logging.apache.org/log4j/2.x/maven-artifacts.html)
-on the Log4j web site for instructions on how to include Log4j into their project using their chosen build tool.
-
-Basic usage of the `Logger` API:
-
-```java
-package com.example;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
-public class Example {
- private static final Logger LOGGER = LogManager.getLogger();
-
- public static void main(String... args) {
- String thing = args.length > 0 ? args[0] : "world";
- LOGGER.info("Hello, {}!", thing);
- LOGGER.debug("Got calculated value only if debug enabled: {}", () -> doSomeCalculation());
- }
-
- private static Object doSomeCalculation() {
- // do some complicated calculation
- }
-}
-```
-
-And an example `log4j2.xml` configuration file:
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="com.example" level="INFO"/>
- <Root level="error">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
-```
-
-## Documentation
-
-The Log4j 3.x User's Guide is available [here](https://logging.apache.org/log4j/2.x/manual/index.html) or as a downloadable
-[PDF](https://logging.apache.org/log4j/2.x/log4j-users-guide.pdf).
-
-## Requirements
-
-Log4j 3.0 and greater requires Java 11.
-Some features require optional dependencies; the documentation for these features specifies the dependencies.
-
-## License
-
-Apache Log4j 3.x is distributed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
-
-## Download
-
-[How to download Log4j](http://logging.apache.org/log4j/2.x/download.html),
-and [how to use it from Maven, Ivy and Gradle](http://logging.apache.org/log4j/2.x/maven-artifacts.html).
-You can access the latest development snapshot by using the Maven repository `https://repository.apache.org/snapshots`,
-see [Snapshot builds](https://logging.apache.org/log4j/2.x/maven-artifacts.html#Snapshot_builds).
-
-## Issue Tracking
-
-Issues, bugs, and feature requests should be submitted to the
-[the issue tracking system for this project](https://github.com/apache/logging-log4j2/issues).
-
-Pull requests on GitHub are welcome, but please open a ticket in the issue tracker first, and mention the issue in the pull request.
-
-## Building From Source
-
-See [the detailed build instructions](BUILDING.md) on how to build to the project and website from sources.
-
-## Contributing
-
-We love contributions!
-Take a look at [our contributing page](CONTRIBUTING.md).
(logging-log4j2) 03/08: Rename `log4j-osgi` to `log4j-osgi-test`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cc7797d4f84f4e41cc824eab0ba0fca42a48ac03
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 15:48:12 2023 +0100
Rename `log4j-osgi` to `log4j-osgi-test`
---
{log4j-osgi => log4j-osgi-test}/pom.xml | 2 +-
.../org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java | 0
.../java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java | 0
.../test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java | 0
.../java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java | 0
.../apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java | 0
.../java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java | 0
.../java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java | 0
.../logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java | 0
.../apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java | 0
.../java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java | 0
{log4j-osgi => log4j-osgi-test}/src/test/resources/log4j2.custom | 0
pom.xml | 2 +-
src/site/asciidoc/runtime-dependencies.adoc | 4 ----
14 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/log4j-osgi/pom.xml b/log4j-osgi-test/pom.xml
similarity index 99%
rename from log4j-osgi/pom.xml
rename to log4j-osgi-test/pom.xml
index fb2472fbdb..34bb227181 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi-test/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../log4j-parent</relativePath>
</parent>
- <artifactId>log4j-osgi</artifactId>
+ <artifactId>log4j-osgi-test</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j OSGi</name>
<description>The Apache Log4j OSGi tests</description>
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractOsgiTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfiguration.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CustomConfigurationFactory.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/equinox/EquinoxLoadApiBundleTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/felix/FelixLoadApiBundleTest.java
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
similarity index 100%
rename from log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
rename to log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
diff --git a/log4j-osgi/src/test/resources/log4j2.custom b/log4j-osgi-test/src/test/resources/log4j2.custom
similarity index 100%
rename from log4j-osgi/src/test/resources/log4j2.custom
rename to log4j-osgi-test/src/test/resources/log4j2.custom
diff --git a/pom.xml b/pom.xml
index 431abc6bbf..43df147a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,7 +257,7 @@
<module>log4j-layout-template-json</module>
<module>log4j-layout-template-json-test</module>
<module>log4j-mongodb4</module>
- <module>log4j-osgi</module>
+ <module>log4j-osgi-test</module>
<module>log4j-perf</module>
<module>log4j-plugin-processor</module>
<module>log4j-plugins</module>
diff --git a/src/site/asciidoc/runtime-dependencies.adoc b/src/site/asciidoc/runtime-dependencies.adoc
index d2d01d7b0d..e46761edc7 100644
--- a/src/site/asciidoc/runtime-dependencies.adoc
+++ b/src/site/asciidoc/runtime-dependencies.adoc
@@ -316,10 +316,6 @@ The module info definition may be modified in the future to export these only to
!
!===
-|log4j-osgi
-|org.apache.logging.log4j.osgi
-|Automatic Module. Unclear how OSGi will support Java modules.
-
|log4j-plugin-processor
|org.apache.logging.log4j.plugin.processor
|
(logging-log4j2) 05/08: Rename `log4j-perf` to `log4j-perf-test`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit af6cc67e655beda0072c3db5315c67c01ed12462
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 15:53:01 2023 +0100
Rename `log4j-perf` to `log4j-perf-test`
---
.../log4j/core/time/internal/format/FixedDateFormat.java | 4 ++--
{log4j-perf => log4j-perf-test}/pom.xml | 2 +-
.../org/apache/logging/log4j/ThreadContextBenchmarkAccess.java | 0
.../layout/template/json/BlackHoleByteBufferDestination.java | 0
.../layout/template/json/JsonTemplateLayoutBenchmark.java | 0
.../template/json/JsonTemplateLayoutBenchmarkReport.java | 0
.../layout/template/json/JsonTemplateLayoutBenchmarkState.java | 0
.../logging/log4j/message/ParameterFormatterBenchmark.java | 0
.../perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java | 0
.../logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java | 0
.../logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java | 0
.../log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java | 0
.../logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java | 0
.../log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java | 0
.../logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java | 0
.../log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java | 0
.../logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/CollectionsBenchmark.java | 0
.../log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java | 0
.../log4j/perf/jmh/ConfiguratorInitializeBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java | 0
.../logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java | 0
.../logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java | 0
.../log4j/perf/jmh/FileAppenderWithLocationBenchmark.java | 0
.../logging/log4j/perf/jmh/FormatterLoggerBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java | 0
.../log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java | 0
.../log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java | 0
.../logging/log4j/perf/jmh/LoggingDisabledBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java | 0
.../logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java | 0
.../log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java | 0
.../logging/log4j/perf/jmh/NamePatternConverterBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/OutputBenchmark.java | 0
.../logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java | 0
.../log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java | 0
.../log4j/perf/jmh/PatternLayoutComparisonBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java | 0
.../logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java | 0
.../logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java | 0
.../logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java | 0
.../perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java | 0
.../logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 0
.../logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java | 0
.../java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java | 0
.../apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java | 0
.../org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java | 0
.../java/org/apache/logging/log4j/perf/jmh/package-info.java | 0
.../org/apache/logging/log4j/perf/nogc/AbstractLogger.java | 0
.../java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java | 0
.../java/org/apache/logging/log4j/perf/nogc/DemoAppender.java | 0
.../java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java | 0
.../java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java | 0
.../java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java | 0
.../logging/log4j/perf/nogc/NoGcMessagePatternConverter.java | 0
.../org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java | 0
.../apache/logging/log4j/perf/nogc/ParameterizedMessage.java | 0
.../src/main/java/org/apache/logging/log4j/perf/nogc/Test.java | 0
.../apache/logging/log4j/perf/util/BenchmarkMessageParams.java | 0
.../java/org/apache/logging/log4j/perf/util/DemoAppender.java | 0
.../org/apache/logging/log4j/perf/util/NoOpJULHandler.java | 0
.../org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java | 0
.../apache/logging/log4j/perf/util/NoOpLogbackAppender.java | 0
.../java/org/apache/logging/log4j/perf/util/StackDriver.java | 0
.../log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java | 0
.../log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java | 0
.../ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml | 0
.../main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml | 0
.../src/main/resources/log4j12-perf-file-throwable.xml | 0
.../src/main/resources/log4j12-perf.xml | 0
.../src/main/resources/log4j12-perf2.xml | 0
.../src/main/resources/log4j12-perfloc.xml | 0
.../src/main/resources/log4j2-appenderComparison.xml | 0
.../src/main/resources/log4j2-jdbc-appender.xml | 0
.../src/main/resources/log4j2-markerFilter-perf.xml | 0
.../src/main/resources/log4j2-markerFilter-perf2.xml | 0
.../src/main/resources/log4j2-noFilter-perf.xml | 0
.../src/main/resources/log4j2-perf-file-throwable.xml | 0
.../src/main/resources/log4j2-perf.xml | 0
.../src/main/resources/log4j2-perf2.xml | 0
.../src/main/resources/log4j2-perf3.xml | 0
.../src/main/resources/log4j2-perfloc.xml | 0
.../src/main/resources/log4j2-threadContextFilter-perf.xml | 0
.../src/main/resources/logback-markerFilter-perf.xml | 0
.../src/main/resources/logback-mdcFilter-perf.xml | 0
.../src/main/resources/logback-perf-file-throwable.xml | 0
.../src/main/resources/logback-perf.xml | 0
.../src/main/resources/logback-perf2.xml | 0
.../src/main/resources/logback-perfloc.xml | 0
.../src/main/resources/perf-WithoutAnyAppender-location.xml | 0
.../src/main/resources/perf-WithoutAnyAppender.xml | 0
.../resources/perf-log4j12-async-location-noOpAppender.xml | 0
.../src/main/resources/perf-log4j12-async-noOpAppender.xml | 0
.../src/main/resources/perf-log4j12-async.xml | 0
.../resources/perf-logback-async-location-noOpAppender.xml | 0
.../src/main/resources/perf-logback-async-noOpAppender.xml | 0
.../src/main/resources/perf-logback-async.xml | 0
.../src/main/resources/perf3PlainNoLoc.xml | 0
.../main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml | 0
.../resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml | 0
.../main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml | 0
.../main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml | 0
.../src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml | 0
.../src/main/resources/perf5AsyncApndNoLoc.xml | 0
.../src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml | 0
.../main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml | 0
.../main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml | 0
pom.xml | 2 +-
src/site/asciidoc/manual/garbagefree.adoc | 2 +-
src/site/asciidoc/manual/logbuilder.adoc | 2 +-
src/site/asciidoc/performance.adoc | 10 +++++-----
src/site/markdown/manual/cloud.md | 2 +-
126 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
index 44f8d3607b..b2986151b7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
@@ -30,8 +30,8 @@ import org.osgi.annotation.versioning.ProviderType;
* Custom time formatter that trades flexibility for performance. This formatter only supports the date patterns defined
* in {@link FixedFormat}. For any other date patterns use {@link FastDateFormat}.
* <p>
- * Related benchmarks: /log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java and
- * /log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
+ * Related benchmarks: /log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java and
+ * /log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
* </p>
*/
@ProviderType
diff --git a/log4j-perf/pom.xml b/log4j-perf-test/pom.xml
similarity index 99%
rename from log4j-perf/pom.xml
rename to log4j-perf-test/pom.xml
index 99041932cd..bdb1f9f19c 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf-test/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../log4j-parent</relativePath>
</parent>
- <artifactId>log4j-perf</artifactId>
+ <artifactId>log4j-perf-test</artifactId>
<packaging>jar</packaging>
<name>Apache Log4J Performance Tests</name>
<description>The Apache Log4j development-time performance tests</description>
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AnnotationVsMarkerInterface.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1Benchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2Benchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ClocksBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ConcurrentAsyncLoggerToFileBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ConfiguratorInitializeBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ConfiguratorInitializeBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ConfiguratorInitializeBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ConfiguratorInitializeBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/DateTimeFormatBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/DebugDisabledBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderWithLocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderWithLocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderWithLocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderWithLocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FormatterLoggerBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FormatterLoggerBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FormatterLoggerBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/FormatterLoggerBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LogBuilderMarkerFilterBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggingDisabledBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LoggingDisabledBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggingDisabledBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/LoggingDisabledBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/NanotimeBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ReflectionBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StackWalkBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/UnboxBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/UuidGeneratorBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/package-info.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/package-info.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/package-info.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/package-info.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/StackDriver.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/StackDriver.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/StackDriver.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/util/StackDriver.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
similarity index 100%
rename from log4j-perf/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
rename to log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
diff --git a/log4j-perf/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml b/log4j-perf-test/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml
similarity index 100%
rename from log4j-perf/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml
rename to log4j-perf-test/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark-asyncConfig.xml
diff --git a/log4j-perf/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml b/log4j-perf-test/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml
similarity index 100%
rename from log4j-perf/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml
rename to log4j-perf-test/src/main/resources/ConcurrentAsyncLoggerToFileBenchmark.xml
diff --git a/log4j-perf/src/main/resources/log4j12-perf-file-throwable.xml b/log4j-perf-test/src/main/resources/log4j12-perf-file-throwable.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j12-perf-file-throwable.xml
rename to log4j-perf-test/src/main/resources/log4j12-perf-file-throwable.xml
diff --git a/log4j-perf/src/main/resources/log4j12-perf.xml b/log4j-perf-test/src/main/resources/log4j12-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j12-perf.xml
rename to log4j-perf-test/src/main/resources/log4j12-perf.xml
diff --git a/log4j-perf/src/main/resources/log4j12-perf2.xml b/log4j-perf-test/src/main/resources/log4j12-perf2.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j12-perf2.xml
rename to log4j-perf-test/src/main/resources/log4j12-perf2.xml
diff --git a/log4j-perf/src/main/resources/log4j12-perfloc.xml b/log4j-perf-test/src/main/resources/log4j12-perfloc.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j12-perfloc.xml
rename to log4j-perf-test/src/main/resources/log4j12-perfloc.xml
diff --git a/log4j-perf/src/main/resources/log4j2-appenderComparison.xml b/log4j-perf-test/src/main/resources/log4j2-appenderComparison.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-appenderComparison.xml
rename to log4j-perf-test/src/main/resources/log4j2-appenderComparison.xml
diff --git a/log4j-perf/src/main/resources/log4j2-jdbc-appender.xml b/log4j-perf-test/src/main/resources/log4j2-jdbc-appender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-jdbc-appender.xml
rename to log4j-perf-test/src/main/resources/log4j2-jdbc-appender.xml
diff --git a/log4j-perf/src/main/resources/log4j2-markerFilter-perf.xml b/log4j-perf-test/src/main/resources/log4j2-markerFilter-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-markerFilter-perf.xml
rename to log4j-perf-test/src/main/resources/log4j2-markerFilter-perf.xml
diff --git a/log4j-perf/src/main/resources/log4j2-markerFilter-perf2.xml b/log4j-perf-test/src/main/resources/log4j2-markerFilter-perf2.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-markerFilter-perf2.xml
rename to log4j-perf-test/src/main/resources/log4j2-markerFilter-perf2.xml
diff --git a/log4j-perf/src/main/resources/log4j2-noFilter-perf.xml b/log4j-perf-test/src/main/resources/log4j2-noFilter-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-noFilter-perf.xml
rename to log4j-perf-test/src/main/resources/log4j2-noFilter-perf.xml
diff --git a/log4j-perf/src/main/resources/log4j2-perf-file-throwable.xml b/log4j-perf-test/src/main/resources/log4j2-perf-file-throwable.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-perf-file-throwable.xml
rename to log4j-perf-test/src/main/resources/log4j2-perf-file-throwable.xml
diff --git a/log4j-perf/src/main/resources/log4j2-perf.xml b/log4j-perf-test/src/main/resources/log4j2-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-perf.xml
rename to log4j-perf-test/src/main/resources/log4j2-perf.xml
diff --git a/log4j-perf/src/main/resources/log4j2-perf2.xml b/log4j-perf-test/src/main/resources/log4j2-perf2.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-perf2.xml
rename to log4j-perf-test/src/main/resources/log4j2-perf2.xml
diff --git a/log4j-perf/src/main/resources/log4j2-perf3.xml b/log4j-perf-test/src/main/resources/log4j2-perf3.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-perf3.xml
rename to log4j-perf-test/src/main/resources/log4j2-perf3.xml
diff --git a/log4j-perf/src/main/resources/log4j2-perfloc.xml b/log4j-perf-test/src/main/resources/log4j2-perfloc.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-perfloc.xml
rename to log4j-perf-test/src/main/resources/log4j2-perfloc.xml
diff --git a/log4j-perf/src/main/resources/log4j2-threadContextFilter-perf.xml b/log4j-perf-test/src/main/resources/log4j2-threadContextFilter-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/log4j2-threadContextFilter-perf.xml
rename to log4j-perf-test/src/main/resources/log4j2-threadContextFilter-perf.xml
diff --git a/log4j-perf/src/main/resources/logback-markerFilter-perf.xml b/log4j-perf-test/src/main/resources/logback-markerFilter-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-markerFilter-perf.xml
rename to log4j-perf-test/src/main/resources/logback-markerFilter-perf.xml
diff --git a/log4j-perf/src/main/resources/logback-mdcFilter-perf.xml b/log4j-perf-test/src/main/resources/logback-mdcFilter-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-mdcFilter-perf.xml
rename to log4j-perf-test/src/main/resources/logback-mdcFilter-perf.xml
diff --git a/log4j-perf/src/main/resources/logback-perf-file-throwable.xml b/log4j-perf-test/src/main/resources/logback-perf-file-throwable.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-perf-file-throwable.xml
rename to log4j-perf-test/src/main/resources/logback-perf-file-throwable.xml
diff --git a/log4j-perf/src/main/resources/logback-perf.xml b/log4j-perf-test/src/main/resources/logback-perf.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-perf.xml
rename to log4j-perf-test/src/main/resources/logback-perf.xml
diff --git a/log4j-perf/src/main/resources/logback-perf2.xml b/log4j-perf-test/src/main/resources/logback-perf2.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-perf2.xml
rename to log4j-perf-test/src/main/resources/logback-perf2.xml
diff --git a/log4j-perf/src/main/resources/logback-perfloc.xml b/log4j-perf-test/src/main/resources/logback-perfloc.xml
similarity index 100%
rename from log4j-perf/src/main/resources/logback-perfloc.xml
rename to log4j-perf-test/src/main/resources/logback-perfloc.xml
diff --git a/log4j-perf/src/main/resources/perf-WithoutAnyAppender-location.xml b/log4j-perf-test/src/main/resources/perf-WithoutAnyAppender-location.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-WithoutAnyAppender-location.xml
rename to log4j-perf-test/src/main/resources/perf-WithoutAnyAppender-location.xml
diff --git a/log4j-perf/src/main/resources/perf-WithoutAnyAppender.xml b/log4j-perf-test/src/main/resources/perf-WithoutAnyAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-WithoutAnyAppender.xml
rename to log4j-perf-test/src/main/resources/perf-WithoutAnyAppender.xml
diff --git a/log4j-perf/src/main/resources/perf-log4j12-async-location-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf-log4j12-async-location-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-log4j12-async-location-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf-log4j12-async-location-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf-log4j12-async-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf-log4j12-async-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-log4j12-async-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf-log4j12-async-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf-log4j12-async.xml b/log4j-perf-test/src/main/resources/perf-log4j12-async.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-log4j12-async.xml
rename to log4j-perf-test/src/main/resources/perf-log4j12-async.xml
diff --git a/log4j-perf/src/main/resources/perf-logback-async-location-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf-logback-async-location-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-logback-async-location-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf-logback-async-location-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf-logback-async-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf-logback-async-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-logback-async-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf-logback-async-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf-logback-async.xml b/log4j-perf-test/src/main/resources/perf-logback-async.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf-logback-async.xml
rename to log4j-perf-test/src/main/resources/perf-logback-async.xml
diff --git a/log4j-perf/src/main/resources/perf3PlainNoLoc.xml b/log4j-perf-test/src/main/resources/perf3PlainNoLoc.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf3PlainNoLoc.xml
rename to log4j-perf-test/src/main/resources/perf3PlainNoLoc.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndDsrptrNoLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndDsrptrWithLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndMpscQNoLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndMpscQWithLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndNoLoc.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndNoLoc.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndXferQNoLoc-noOpAppender.xml
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml b/log4j-perf-test/src/main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml
similarity index 100%
rename from log4j-perf/src/main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml
rename to log4j-perf-test/src/main/resources/perf5AsyncApndXferQWithLoc-noOpAppender.xml
diff --git a/pom.xml b/pom.xml
index 43df147a77..74c90e2c1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,7 +258,7 @@
<module>log4j-layout-template-json-test</module>
<module>log4j-mongodb4</module>
<module>log4j-osgi-test</module>
- <module>log4j-perf</module>
+ <module>log4j-perf-test</module>
<module>log4j-plugin-processor</module>
<module>log4j-plugins</module>
<module>log4j-plugins-test</module>
diff --git a/src/site/asciidoc/manual/garbagefree.adoc b/src/site/asciidoc/manual/garbagefree.adoc
index b83c91386e..1d5e0f9ddc 100644
--- a/src/site/asciidoc/manual/garbagefree.adoc
+++ b/src/site/asciidoc/manual/garbagefree.adoc
@@ -547,7 +547,7 @@ but on par with 2.5 and much better than alternatives logging libraries]
The results above are obtained with the
http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
-harness. See the FileAppenderBenchmark source code in the log4j-perf
+harness. See the FileAppenderBenchmark source code in the log4j-perf-test
module.
[#UnderTheHood]
diff --git a/src/site/asciidoc/manual/logbuilder.adoc b/src/site/asciidoc/manual/logbuilder.adoc
index ebb5d2b55e..427a024301 100644
--- a/src/site/asciidoc/manual/logbuilder.adoc
+++ b/src/site/asciidoc/manual/logbuilder.adoc
@@ -60,7 +60,7 @@ this will result in slower performance.</li>
=== Location Performance
The table below shows some of the results from the FileAppenderBenchmark and FileAppenderWithLocationBenchmark
-classes in the log4j-perf project when configured to use 4 threads. The results show that lazily including
+classes in the log4j-perf-test project when configured to use 4 threads. The results show that lazily including
the location information is about 8 times slower than not including location information. While using the
withLocation method of LogBuilder is about 3 times faster than lazily calculating the location information
it is still about 2.5 times slower than not including location information.
diff --git a/src/site/asciidoc/performance.adoc b/src/site/asciidoc/performance.adoc
index 621a5703c1..d7b1332c59 100644
--- a/src/site/asciidoc/performance.adoc
+++ b/src/site/asciidoc/performance.adoc
@@ -243,7 +243,7 @@ http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
harness. See the AsyncAppenderLog4j1Benchmark,
AsyncAppenderLog4j2Benchmark, AsyncAppenderLogbackBenchmark,
AsyncLoggersBenchmark and the MemoryHandlerJULBenchmark source code in
-the log4j-perf module.
+the log4j-perf-test module.
[#asyncLoggingWithLocation]
=== Asynchronous Logging with Caller Location Information
@@ -274,7 +274,7 @@ http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
harness. See the AsyncAppenderLog4j1LocationBenchmark,
AsyncAppenderLog4j2LocationBenchmark,
AsyncAppenderLogbackLocationBenchmark, AsyncLoggersLocationBenchmark and
-the MemoryHandlerJULLocationBenchmark source code in the log4j-perf
+the MemoryHandlerJULLocationBenchmark source code in the log4j-perf-test
module.
[#fileLoggingComparison]
@@ -306,7 +306,7 @@ image:images/SyncThroughputLoggerComparisonLinux.png[image]
The synchronous logging throughput results above are obtained with the
http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
-harness. See the FileAppenderBenchmark source code in the log4j-perf
+harness. See the FileAppenderBenchmark source code in the log4j-perf-test
module.
=== Synchronous File Logging - Response Time Comparison
@@ -375,7 +375,7 @@ image:images/ThreadContextFilterCostComparison.png[image]
The Filter comparison results above are obtained with the
http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
harness. See the MarkerFilterBenchmark and MDCFilterBenchmark in the
-log4j-perf module for details on these benchmarks.
+log4j-perf-test module for details on these benchmarks.
[#tradeoffs]
== Trade-offs
@@ -437,7 +437,7 @@ image:images/Log4j2AppenderThroughputComparison-windows.png[image]
The Log4j 2 appender comparison results above are obtained with the
http://openjdk.java.net/projects/code-tools/jmh/[JMH] Java benchmark
harness. See the Log4j2AppenderComparisonBenchmark source code in the
-log4j-perf module.
+log4j-perf-test module.
////
The user should be aware of the following performance issues.
diff --git a/src/site/markdown/manual/cloud.md b/src/site/markdown/manual/cloud.md
index 75702d7129..dad550ded8 100644
--- a/src/site/markdown/manual/cloud.md
+++ b/src/site/markdown/manual/cloud.md
@@ -35,7 +35,7 @@ Solutions for this are to:
to the operating system so that the output can be piped into a file. The overhead of all this is measurably slower
than just writing directly to a file as can be seen in these benchmark results where logging
to stdout is 16-20 times slower over repeated runs than logging directly to the file. The results below were obtained by
-running the [Output Benchmark](https://github.com/apache/logging-log4j2/blob/release-2.x/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java)
+running the [Output Benchmark](https://github.com/apache/logging-log4j2/blob/release-2.x/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/OutputBenchmark.java)
on a 2018 MacBook Pro with a 2.9GHz Intel Core i9 processor and a 1TB SSD. However, these results alone would not be
enough to argue against writing to the standard output stream as they only amount to about 14-25 microseconds
per logging call vs 1.5 microseconds when writing to the file.
(logging-log4j2) 01/08: Remove deprecated `log4j-distribution` et al.
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1be544d128ea5df25c180e08f28b6390cd185e77
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 15:39:46 2023 +0100
Remove deprecated `log4j-distribution` et al.
---
log4j-distribution/src/assembly/bin.xml | 56 -----------------------
log4j-distribution/src/assembly/src.xml | 80 ---------------------------------
src/assembly/site.xml | 31 -------------
3 files changed, 167 deletions(-)
diff --git a/log4j-distribution/src/assembly/bin.xml b/log4j-distribution/src/assembly/bin.xml
deleted file mode 100644
index 2c691abed4..0000000000
--- a/log4j-distribution/src/assembly/bin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <baseDirectory>apache-log4j-${project.version}-bin</baseDirectory>
- <includeSiteDirectory>false</includeSiteDirectory>
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
- </moduleSet>
- </moduleSets>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.logging.log4j:log4j-*</include>
- </includes>
- <outputDirectory></outputDirectory>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>..</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>../RELEASE-NOTES.adoc</source>
- <outputDirectory>.</outputDirectory>
- <destName>RELEASE-NOTES.adoc</destName>
- </file>
- </files>
-</assembly>
diff --git a/log4j-distribution/src/assembly/src.xml b/log4j-distribution/src/assembly/src.xml
deleted file mode 100644
index 058ed56820..0000000000
--- a/log4j-distribution/src/assembly/src.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <baseDirectory>apache-log4j-${project.version}-src</baseDirectory>
- <fileSets>
- <!-- main project directory structure -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/flume-og/**</exclude>
- <!-- build output -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-
- <!-- NOTE: Most of the following excludes should not be required
- if the standard release process is followed. This is because the
- release plugin checks out project sources into a location like
- target/checkout, then runs the build from there. The result is
- a source-release archive that comes from a pretty clean directory
- structure.
-
- HOWEVER, if the release plugin is configured to run extra goals
- or generate a project website, it's definitely possible that some
- of these files will be present. So, it's safer to exclude them.
- -->
-
- <!-- IDEs -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?Vagrantfile(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?Dockerfile(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-
- <!-- misc -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-
- <!-- release-plugin temp files -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
- </fileSet>
- <!-- license, readme, etc. calculated at build time
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet> -->
- </fileSets>
-</assembly>
diff --git a/src/assembly/site.xml b/src/assembly/site.xml
deleted file mode 100644
index 88292eb292..0000000000
--- a/src/assembly/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>site</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${stagingSiteURL}</directory>
- <outputDirectory>${stagingSiteURL}</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
(logging-log4j2) 04/08: Remove unused `benchmark.yml` workflow
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c56514a0f65ce5b4b5e2ff296c6dcfcab3569163
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 27 15:51:49 2023 +0100
Remove unused `benchmark.yml` workflow
---
.github/workflows/benchmark.yml | 236 ----------------------------------------
1 file changed, 236 deletions(-)
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
deleted file mode 100644
index 40dc664e77..0000000000
--- a/.github/workflows/benchmark.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: benchmark
-
-on: [ workflow_dispatch ]
-
-jobs:
-
- build:
-
- if: github.repository == 'apache/logging-log4j2'
-
- runs-on: ubuntu-latest
-
- steps:
-
- - name: Checkout repository
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
-
- - name: Set up JDK 11
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # 3.13.0
- with:
- distribution: temurin
- java-version: 11
- java-package: jdk
- architecture: x64
- cache: maven
-
- - name: Build with Maven
- shell: bash
- run: |
- ./mvnw \
- --show-version --batch-mode --errors --no-transfer-progress \
- -DskipTests=true \
- --projects log4j-perf \
- --also-make \
- package
-
- - name: Upload built sources
- uses: actions/upload-artifact@v3
- with:
- name: benchmarks.jar
- path: log4j-perf/target/benchmarks.jar
-
- run:
-
- needs: build
-
- runs-on: ${{ matrix.os }}
-
- strategy:
- matrix:
- os: [ macos-latest, ubuntu-latest, windows-latest ]
- jdk: [ 11, 17 ]
- concurrency: [ 1, 8 ]
- jmhCommand:
- - "-t $CONCURRENCY -f 3 -wi 3 -w 10s -i 4 -r 20s -prof gc -prof perfnorm -rf json -rff results-layout-jtl.json '.*JsonTemplateLayoutBenchmark.*Jtl4EcsLayout'"
- - "-t $CONCURRENCY -f 3 -wi 3 -w 10s -i 4 -r 20s -prof gc -prof perfnorm -rf json -rff results-util-instant-format.json '.*InstantFormatBenchmark.*'"
-
- steps:
-
- - name: Checkout repository
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
-
- - name: Download built sources
- uses: actions/download-artifact@v3
- with:
- name: benchmarks.jar
- path: log4j-perf/target
-
- - name: Set up JDK ${{ matrix.jdk }}
- if: matrix.jdk != 11
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # 3.13.0
- with:
- distribution: temurin
- java-version: ${{ matrix.jdk }}
- java-package: jdk
- architecture: x64
- cache: maven
-
- - name: Run benchmarks
- timeout-minutes: 120
- shell: bash
- run: |
- export CONCURRENCY=${{ matrix.concurrency }}
- java \
- -jar log4j-perf/target/benchmarks.jar \
- ${{ matrix.jmhCommand }}
-
- - name: Stage benchmark results for commit
- shell: bash
- run: |
-
- # Determine the artifact version.
- set -x
- ./mvnw \
- --batch-mode --quiet \
- -DforceStdout=true \
- -Dexpression=project.version \
- help:evaluate \
- | tee mvnw-project-version.out
- echo
-
- # Determine certain file path properties.
- export REVISION=$(<mvnw-project-version.out)
- export BRANCH_NAME=$(echo "$GITHUB_REF" | sed 's/refs\/heads\///g')
- export INSTANT=$(date -u +%Y%m%d)
- export OS_NAME=$(echo "${{ matrix.os }}" | sed 's/-latest//g')
- export RUN_ID=$(printf "%020d" "$GITHUB_RUN_ID")
-
- # Move and stage the result files.
- for SRC_FILEPATH in results-*.json; do
- export BENCHMARK_NAME=$(basename "$SRC_FILEPATH" | sed 's/^results-//g' | sed 's/\.json$//g')
- export DST_FILEPATH="benchmark/results/$REVISION/$BRANCH_NAME-$INSTANT-$RUN_ID/$BENCHMARK_NAME-O$OS_NAME-J${{ matrix.jdk }}-C${{ matrix.concurrency }}.json"
- mkdir -v -p $(dirname "$DST_FILEPATH")
- mv -v "$SRC_FILEPATH" "$DST_FILEPATH"
- git add "$DST_FILEPATH"
- done
-
- # Stash changes for commit.
- git stash save
- git clean -f
-
- - name: Commit benchmark results
- timeout-minutes: 1
- shell: bash
- run: |
-
- # Checkout the results branch.
- set -x
- git fetch origin gh-pages
- git checkout -B gh-pages origin/gh-pages
-
- # Stage the stashed changes.
- # (`show + apply` is preferred over `pop`, since the latter fails if file already exists.)
- git stash show -p | git apply
- git add benchmark/results
- git status --porcelain
- test $(git status --porcelain | wc -l) -gt 0 || exit 0
-
- # Commit changes.
- git config user.name github-actions
- git config user.email github-actions@github.com
- git commit -a -m "Add benchmark results for ${{ runner.os }}, JDK ${{ matrix.jdk }}, and concurrency ${{ matrix.concurrency }}."
-
- # Push changes in a loop to allow concurrent repository modifications.
- export RETRY=0
- while [ 1 ]; do
- set +e
- git push origin gh-pages 2>&1 | tee git-push.out
- if [ $? -eq 0 ]; then
- exit 0
- else
- set -e
- let RETRY+=1
- echo "retry #$RETRY"
- git pull -r origin gh-pages
- fi
- done
-
- index:
-
- runs-on: ubuntu-latest
- needs: run
-
- steps:
-
- - name: Checkout repository
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
- with:
- ref: gh-pages
-
- - name: Setup Python 3
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # 4.7.1
- with:
- python-version: 3.x
-
- - name: Index benchmark results
- timeout-minutes: 1
- shell: bash
- run: |
-
- # Configure the git user.
- git config user.name github-actions
- git config user.email github-actions@github.com
-
- # Push changes in a loop to allow concurrent repository modifications.
- export RETRY=0
- export INDEX_FILEPATH=benchmark/results/index.json
- while [ 1 ]; do
-
- # Generate the index file.
- python -c '\
- import json, os, re;\
- filepaths=[re.sub("^benchmark/results/", "", os.path.join(root,filename)) \
- for (root, dirs, filenames) in os.walk("benchmark/results") \
- for filename in filenames]; \
- filepaths.remove("index.json"); \
- print(json.dumps(filepaths))' \
- >"$INDEX_FILEPATH"
-
- # Exit if there are no changes, that is, a concurrent job has indexed all results.
- git diff --exit-code "$INDEX_FILEPATH" && exit 0
-
- # Commit the index file.
- git add "$INDEX_FILEPATH"
- git commit "$INDEX_FILEPATH" -m "Update benchmark results index."
-
- # Push the index file.
- set +e
- git push origin gh-pages 2>&1 | tee git-push.out
- if [ $? -eq 0 ]; then
- exit 0
- else
- set -e
- let RETRY+=1
- echo "retry #$RETRY"
- git pull -r origin gh-pages
- fi
-
- done