You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2022/05/29 11:24:54 UTC

[logging-log4j2] branch dependabot/maven/org.lightcouch-lightcouch-0.2.0 updated (04da8af3e7 -> eb9ca41644)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/maven/org.lightcouch-lightcouch-0.2.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


 discard 04da8af3e7 Bump lightcouch from 0.0.6 to 0.2.0
     add af5d3b589b [LOG4J-3413] Fixes resolution of non-Log4j properties
     add 35f9db7088 Merge pull request #774 from ppkarwasz/jira3413
     add ee93748657 Add changelog entry for LOG4J2-3413
     add 9f75dea390 Javadoc.
     add 7673943d7f Javadoc.
     add e652dc36b6 [LOG4J2-3423] JAR file containing Log4j configuration isn't closed.
     add 980d550de7 Fix spelling.
     add cb51ea0377 Better docs.
     add d9e2c8fad9 Format tweaks.
     add ba48b1daf4 [LOG4J2-3423] JAR file containing Log4j configuration isn't closed.
     add d1d52e5c0d Match POM version.
     add dc1742c0ff [LOG4J2-3425] Syslog appender lacks the SocketOptions setting.
     add 1305bada0f Add the missing space
     add ab2a9bf153 LOG4J2-3423 - Get lastModified of the file
     add b03d760893 Provide a uniform Log4j 1.x message factory
     add 613eea5e37 Remove the revapi plugin
     add 12977a9101 Merge pull request #785 from carterkozak/ckozak/no-revapi
     add 3ae603db33 Improves behavior of failing Log4j 1.x builders
     add cc2c896846 Improves validation of Log4j 2.x components
     add 4492c26f72 LOG4J2-3424: Correctly handle property attribute values
     add 31697cf222 Update change list
     add 922a150783 Add disabled but failing tests from Log4j 1 as TODOs.
     add 2e49ade618 Update test fixture for JPA and H2 to follow the only IDENTUTY syntax that will be allowed in H2 2.x. Actually updating to H2 2.x fails and might require an update the Eclipse JPA provider.
     add 11c6e65e5b [LOG4J2-3428] Update 3rd party dependencies for 2.17.3
     add f8f11e2ff5 Add comment.
     add ba16485b93 [LOG4J2-3426] Refactors wrapping code
     add e5c7457666 [LOG4J-3426] Update changelog
     add 7594b07cb7 [LOG4J2-3427] Add a ServiceLoader tool
     add a536df6d5b Adds OSGI support through 'osgi-resource-locator'
     add 04ee8fb73e [LOG4J2-3427] Updates changes
     add 48ab5e97e5 [LOG4J2-3418] Fix Log4j2CloudConfigLoggingSystem registration
     add 54565f0808 Update changes
     add de4e5dd1a9 [LOG4J2-3423] Refactoring of URLConnection code
     add 50b00d8c1c [LOG4J2-3428] Update 3rd party dependencies for 2.17.3
     add a73f10328a Tests that configuring and reconfiguring STOCK and CUSTOM appenders properly pick up different settings.
     add 8d8a954a20 Delete inadvertent file previously committed.
     add 67ba1fe059 [LOG4J2-3040] Avoid ClassCastException in JeroMqManager with custom LoggerContextFactory (#791)
     add 9d3f836416 [LOG4J2-3040] Avoid ClassCastException in JeroMqManager with custom LoggerContextFactory #791
     add 2aa831e0fa [LOG4J2-3428] Update 3rd party dependencies for 2.17.3.
     add e291887d07 Fix minor typo (#792)
     add 168b5c1735 Fix minor typo #792.
     add 1a364ccfcc [LOG4J2-3419] Adds support for custom Log4j 1.x levels (#789)
     add 1f17804c61 Update changelog
     add a4edd2fed2 Bump slf4jVersion from 1.7.35 to 1.7.36 (#776)
     add 7b9c413b25 Fix code typo in customconfig.xml (#781)
     add 3a146ee07a Catch all FileAppenderTest asynchronous errors
     add 4e571f3606 FileAppenderTest: increase thread pool termination timeout
     add 10460ec520 Switches Cassandra to random port
     add 28b1ae6077 Bump logbackVersion from 1.2.3 to 1.2.11 (#793)
     add c73c8042af Changes Cassandra's port to an ephemeral one
     add e9b6bd0e1d Bump maven-pdf-plugin from 1.2 to 1.5.1 (#796)
     add bad6726238 Bump maven-pmd-plugin from 3.10.0 to 3.16.0 (#795)
     add 65496a565e Bump maven-scm-plugin from 1.9.5 to 1.12.2 (#778)
     add 291e03611a [LOG4J2-3419] Add a Log4j 1.x level name pattern converter
     add 8f1fc1bf46 [LOG4J2-3019] HtmlLayoutTest.testLayoutWithDatePatternFixedFormat test fails on windows
     add 643e93699d [LOG4J2-3428] Update 3rd party dependencies for 2.17.3
     add 5e9f6942bc [LOG4J2-3428] Update 3rd party dependencies for 2.17.3
     add 2ce1346611 LOG4J2-3393 Improve JsonTemplateLayout performance. (#797)
     add 6767eb118a Fix broken link in MDC manual.
     add 6f282e6b0d Fix code typo in ThrowableInformation of log4j-1.2-api.
     add 4ef6933458 Add missing package for binary compatibility
     add 456f71b61e [LOG4J2-3439] Corrects default SSL configuration
     add bf969f8b9b Changelog entry for LOG4J2-3429
     add 9d054c4067 Adds missing reporter credit
     add 798f3026c2 [LOG4J2-3419] Allows %pid in Log4j 1.x patterns
     add 211f33bbea [LOG4J2-3447] Fixes native Log4j1 appenders concurrency problems
     add c21ffb4d0a Changelog for LOG4J2-3447
     add a392a16688 fixed checkstyle issues
     add 396ec807aa LOG4J2-3452: Fix race condition in FileUtils.mkdir() (#809)
     add c4936b20ac More tests for LocalizedMessageFactory.
     add 6586c5b15d Move comment.
     add 5eaeb95760 LOG4J2-3458 LocalizedMessage logs misleading errors on the console.
     add 02128be233 [LOG4J2-3359] Adds Log4j 1.x specific syslog layout (#807)
     add 209dc1362e Adds changelog entry for LOG4J2-3359
     add d262274585 Fix OSGI support on Java 11
     add 69898dc632 LOG4J2-3462 Duplicate dependency in pom.xml (#812)
     add 4e593a41fc Fix markdown in 1-to-2 migration guide. (#814)
     add 9f45ac2f71 Adjust references to Apache Commons CSV.
     add 5fc1e4957d [LOG4J2-3471] log4j-1.2-api-2.17.2 throws exception while removing appender with name as null.
     add cfb118e404 [LOG4J2-3471] log4j-1.2-api-2.17.2 throws exception while removing appender with name as null.
     add 7f0e350fe8 [LOG4J2-2872] Normalizes level names
     add dfc215713a [LOG4J2-3440] Synchronize Log4j 1.x and Log4j 2.x appenders
     add 9fb2f4b033 Changelog entries for LOG4J2-2872 and LOG4J-3340
     add fb83682941 Bump GitHub setup-java action to v3. (#816)
     add 5be42b2cfe [LOG4J2-3475] Add missing message parameterization in RegexFilter
     add ebfc8945a5 Add changelog entry for LOG4J2-3475
     add 041648a6a3 LOG4J2-3477 Add the missing context stack to JsonLayout template. (#819)
     add e865c9ad7b LOG4J2-3476 ignore JUL ApiLogger.setLevel without error
     add 060b09f7cd LOG4J2-3476 ignore JUL ApiLogger.setLevel without error
     add bfed0a38df Merge pull request #821 from remkop/LOG4J2-3476-JUL-ApiLogger-setLevel
     add 27fd2f8050 LOG4J2-3476 update changes.xml
     add 15166c8827 Fix `log4j-api` Java 9 tests
     add bfc8004c42 Fix `log4j-jul` ApiLoggerTest
     add 262828b193 [LOG4J2-3427] Replace ServiceLoader calls with ServiceLoaderUtil
     add a2f0faefa1 Add OSGI support to `ServiceLoaderUtil`
     add a3c3431cfc Add developer info in POM
     add 30e9563fdb [LOG4J2-3362] Adds a SmtpManager compatible with Jakarta EE 9
     add 7e7b1d7ef5 Fix `log4j-jakarta-smtp` POM file
     add e5576ed339 LOG4J2-3360 Add OSSF Scorecards GitHub Action.
     add 8f3f3af3e4 LOG4J2-3360 Replace GitHub Action versions with commit checksums.
     add 32e0df1ba2 LOG4J2-3369 Make build and CodeQL workflows read-only.
     add 618e6ca56d LOG4J2-3472 make disruptor WaitStrategy configurable in Log4j configuration
     add 8dd38f13c4 LOG4J2-3472 custom WaitStrategy additional tests
     add a3f054f45a LOG4J2-3472 custom WaitStrategy documentation
     add 29fdca6a1a LOG4J2-3472 files should end with newline
     add a68d3c4e67 LOG4J2-3472 make internals available with package-protected getters for testing
     add a89e33deef LOG4J2-3472 clear all modified system properties after test is done
     add 1b989b9604 LOG4J2-3472 (DOC) clarify specification
     add 86fe5452f0 LOG4J2-3472 package-protected getter
     add 425389c04a LOG4J2-3472 fix package-protected getters
     add 91222178b3 LOG4J2-3472 check that user-specified class implements AsyncWaitStrategyFactory
     add 52713b8ac3 LOG4J2-3472 code cleanup
     add b45e49c395 LOG4J2-3472 add missing license text
     add 786c011e29 Merge pull request #824 from remkop/LOG4J2-3472-WaitStrategyFactory
     add aa1cab96fd LOG4J2-3472 update changes.xml
     add b5592b7594 LOG4J2-3362 changelog
     add 6edf507ce8 Fix flaky ServiceLoaderUtilTest
     add 06b75ef230 LOG4J2-3473 add garbage-free version of TimeoutBlockingWaitStrategy and make this the default Async Loggers WaitStrategy
     add d7d60c6ed7 LOG4J2-3473 update for changes made with LOG4J2-3472
     add 97b8c1dc4f LOG4J2-3473 DOC update manual for garbage-free logging
     add e4e46f0667 LOG4J2-3473 update change log
     add 1341f1ddb0 Bump org.apache.felix.framework from 5.6.12 to 7.0.3
     add 448b057cf0 LOG4J2-3473 (DOC) fix version number
     add ad414c1ac0 LOG4J2-3495, LOG4J2-3481, LOG4J2-3482 Add MutableThreadContextMapFilter. Pass Auth provider when creating a connection.
     add 73b0513e4e Change the variable name
     add 03a0069cbc Update doc
     add 6bc69ab44f LOG4J2-2956 - Prevent ContextDataFactory error during startup
     add 455dca15dd Change config element name
     add 3277edc568 Update doc
     add a710c55b26 INFRA-23225 Publish snapshots using GitHub Actions.
     add 725bfef28f INFRA-23225 Deploy snapshots (once) if all platforms build successfully.
     add 88ce392cde INFRA-23225 Fix Maven deploy goal.
     add d86c9f6972 INFRA-23225 Add toolchains support.
     add 8f4267ba41 INFRA-23225 Fix Maven deploy goal, hopefully.
     add 07444c0d4a INFRA-23225 Try without deployAtEnd
     add e4a05ea642 INFRA-23225 Exclude failing log4j-bom from deployment
     add 7a40e60c30 INFRA-23225 Replaces - by !
     add 1a2a5946f3 INFRA-23225 Try to deploy log4j-bom, one more time.
     add 796f83150b INFRA-23225 Exclude log4j-bom, one more time.
     add cd29455a1e Improve JTL test parallelization.
     add 01465ca269 INFRA-23225 Provide deployment repository for log4j-bom.
     add 9f5cfdf780 Revert "Improve JTL test parallelization."
     add aaf13561e7 [LOG4J2-3366] Fixes order of property sources
     add 166968f266 Bump activemq-broker from 5.16.4 to 5.17.1
     add 73609fe4ff Bump de.flapdoodle.embed.mongo from 3.4.3 to 3.4.5
     add f976574cff Bump jmh.version from 1.34 to 1.35
     add 9ea52e7892 Bump elasticsearch-rest-high-level-client from 7.17.0 to 7.17.3
     add 550f60e5c4 Bump mongodb3.version from 3.12.10 to 3.12.11
     add d807c7adbe Defer fetching of the filter configuration until the first poll to prevent application startup from being blocked
     add 26efbc801b LOG4J2-3493 - ClassArbiter mistakenly used SystemPropertyArbiter.Builder
     add 25fff83746 LOG4J2-3506 - Support Spring 2.6.x
     add 918bb8472d LOG4J2-3506 - Support Spring 2.6.x
     add 1f227cd394 [LOG4J2-1376] Define eid as String instead of int to allow for Oid according to RFC5424 (#836)
     add 05a714c4b0 LOG4J2-3509 Fix minor doc typos.
     add a4d562b036 LOG4J2-3509 Of course I forgot the comma.
     add 26c7c42e83 LOG4J2-3491 - Correctly default to not include location info for AsyncLoggers
     add 22382a42bb Update mongodb dependencies in docs (#827)
     add ecd2d77830 Increase to 50 dependabot proposals
     add 460706b3c8 Dependabot support only a single Maven configuration
     add 30a5f51acc Bump jackson2Version from 2.13.2 to 2.13.3
     add 06511c6e46 Bump maven-clean-plugin from 3.1.0 to 3.2.0
     add 0b2ad4b71f Bump docker-maven-plugin from 0.39.0 to 0.39.1
     add c7dbe45be3 Bump maven-resources-plugin from 3.0.2 to 3.2.0
     add fb5ee513fb Bump de.flapdoodle.embed.mongo from 3.4.5 to 3.4.6
     add 022802aa3c Bump kubernetes-client from 5.12.1 to 5.12.2
     add 5673c2ffa0 Bump jacoco-maven-plugin from 0.8.7 to 0.8.8
     add 498bba4490 Bump log4j2-ecs-layout from 1.3.2 to 1.4.0 (#857)
     add a3ce1413aa Bump jctools-core from 1.2.1 to 3.3.0 (#862)
     add bd1ad8ae21 LOG4J2-3432 - SizeBasedTriggeringPolicy would fail to rename files properly when integer pattern contained a leading zero.
     add 272a614b7f LOG4J2-3516 - Move perf tests to log4j-core-its
     add fab90e06cf LOG4J2-3516 - Add changes.xml entry
     add 8bb477ada5 Bump elasticsearch-rest-high-level-client from 7.17.3 to 7.17.4 (#892)
     add 8e0ae5d66b Bump h2 from 1.4.200 to 2.1.212
     add 803c3e2384 Switch to PostgreSQL compatibility mode
     add 4c98fc20ef Bump org.apache.felix.framework from 7.0.3 to 7.0.4
     add 1e90f9aeb1 [LOG4J2-3483] Adds support for Apache Extras RollingFileAppender
     add 68097f8e29 LOG4J2-3520 Update outdated Maven Toolchains instructions. (#894)
     add 7348b6c892 LOG4J2-3520 More build instructions clean up.
     add ee30b5cdfb INFRA-23225 Remove redundant warning.
     add e71bb01cbf LOG4J2-3512, LOG4J2-3522 - Disable flaky tests
     add e4982c8be1 Bump plexus-utils from 3.4.1 to 3.4.2
     add 03c859cdfe Merge pull request #869 from apache/dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.2
     add f7ff37b35e Bump spotbugs-maven-plugin from 4.0.4 to 4.7.0.0
     add c37a49c775 Bump maven-antrun-plugin from 3.0.0 to 3.1.0
     add 387340bff5 Merge pull request #871 from apache/dependabot/maven/org.apache.maven.plugins-maven-antrun-plugin-3.1.0
     add 6860f94214 Bump maven-compiler-plugin from 3.9.0 to 3.10.1
     add f1a0ce26bf Merge pull request #858 from apache/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.1
     add 8d310f7978 Bump springVersion from 5.3.19 to 5.3.20
     add 1007cf0964 Merge pull request #852 from apache/dependabot/maven/springVersion-5.3.20
     add e234784dc2 Use correct annotation to disable flaky test
     add 04ea25b986 Update CodeQL workflow to init@v2 and update permissions
     add 843dec10ea Bump findsecbugs-plugin from 1.10.1 to 1.12.0
     add 47d334d425 Merge pull request #888 from apache/dependabot/maven/com.h3xstream.findsecbugs-findsecbugs-plugin-1.12.0
     add ad9d25898d Narrow test disabling to Windows
     add 06c33a131b Bump maven-failsafe-plugin from 3.0.0-M5 to 3.0.0-M6
     add 6d15e411f2 Merge pull request #863 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.0.0-M6
     add affcbde0f0 Bump jeromq from 0.4.3 to 0.5.2
     add cecaaa4562 Merge pull request #843 from apache/dependabot/maven/org.zeromq-jeromq-0.5.2
     add 80b894fb26 Bump spring-ws-core from 3.1.2 to 3.1.3
     add fd4429d3e3 Merge pull request #876 from apache/dependabot/maven/org.springframework.ws-spring-ws-core-3.1.3
     add 3ef4e3e024 Update CI link in pom
     add 501f07ce23 Enable github action dependabot nagging
     add dfabcfa34b Bump cassandra-driver-core from 3.1.4 to 3.11.2
     add 623360f5a9 Merge pull request #856 from apache/dependabot/maven/com.datastax.cassandra-cassandra-driver-core-3.11.2
     add d26d48da3e Bump org.osgi.core from 4.3.1 to 6.0.0
     add 69c8944dcc Merge pull request #859 from apache/dependabot/maven/org.osgi-org.osgi.core-6.0.0
     add c4cce1ea82 Bump maven-jxr-plugin from 3.1.1 to 3.2.0
     add e532daeb9a Merge pull request #877 from apache/dependabot/maven/org.apache.maven.plugins-maven-jxr-plugin-3.2.0
     add 50a9ce8e76 Bump tomcat-juli from 10.0.16 to 10.0.21
     add 352cda1c7c Merge pull request #861 from apache/dependabot/maven/org.apache.tomcat-tomcat-juli-10.0.21
     add c979eba9a5 Bump maven-dependency-plugin from 3.2.0 to 3.3.0
     add 31c60200fd Merge pull request #875 from apache/dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.3.0
     add 3709750696 Bump icu4j from 4.6.1 to 71.1
     add 9b62fd2f8a Merge pull request #874 from apache/dependabot/maven/com.ibm.icu-icu4j-71.1
     add eba0fb2d7e Narrow permissions required for codeql
     add 464940d81a Bump ossf/scorecard-action from 1.0.4 to 1.1.0
     add 02d99c3e3f Merge pull request #897 from apache/dependabot/github_actions/ossf/scorecard-action-1.1.0
     add 7e58c0b298 Bump actions/setup-java from 3.1.1 to 3.3.0
     add 859ace8952 Merge pull request #898 from apache/dependabot/github_actions/actions/setup-java-3.3.0
     add dc67a20772 Bump actions/checkout from 3.0.1 to 3.0.2
     add 7ba5d0435b Merge pull request #899 from apache/dependabot/github_actions/actions/checkout-3.0.2
     add 78b3fa4f37 Bump actions/upload-artifact from 3.0.0 to 3.1.0
     add b34f8ca6ca Merge pull request #900 from apache/dependabot/github_actions/actions/upload-artifact-3.1.0
     add 02274f11dd Move permissions required for codeql
     add decd2cf837 Bump jetty-util from 8.2.0.v20160908 to 11.0.9
     add 6d50df8731 Change the version to 9.4
     add ed8185da9b Remove managed dependency
     add f53da962a8 Bump surefire.plugin.version from 3.0.0-M5 to 3.0.0-M6
     add cde5b4a5a3 Keep `log4j-jpl` at Surefire version 2.13
     add eb9ca41644 Bump lightcouch from 0.0.6 to 0.2.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (04da8af3e7)
            \
             N -- N -- N   refs/heads/dependabot/maven/org.lightcouch-lightcouch-0.2.0 (eb9ca41644)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/dependabot.yml                             |    8 +-
 .github/workflows/benchmark.yml                    |   22 +-
 .github/workflows/build.yml                        |   62 +-
 .github/workflows/codeql-analysis.yml              |   84 +-
 .../workflows/maven-settings.xml                   |   46 +-
 .github/workflows/scorecards-analysis.yml          |   67 +
 BUILDING.md                                        |   52 +-
 NOTICE.txt                                         |    3 +
 log4j-1.2-api/pom.xml                              |   14 +
 .../java/org/apache/log4j/AppenderSkeleton.java    |    2 +-
 .../src/main/java/org/apache/log4j/Category.java   |  110 +-
 .../src/main/java/org/apache/log4j/Hierarchy.java  |    3 +-
 .../src/main/java/org/apache/log4j/Level.java      |   26 +-
 .../src/main/java/org/apache/log4j/Priority.java   |    9 +
 .../org/apache/log4j/PropertyConfigurator.java     |    7 +-
 .../org/apache/log4j/bridge/AppenderAdapter.java   |   33 +-
 .../org/apache/log4j/bridge/AppenderWrapper.java   |   28 +-
 .../org/apache/log4j/bridge/FilterAdapter.java     |   25 +-
 .../org/apache/log4j/bridge/FilterWrapper.java     |   21 +
 .../org/apache/log4j/bridge/LayoutAdapter.java     |   24 +-
 .../org/apache/log4j/bridge/LayoutWrapper.java     |   18 +
 .../org/apache/log4j/bridge/LogEventAdapter.java   |   21 +-
 .../org/apache/log4j/builders/AbstractBuilder.java |   29 +-
 .../org/apache/log4j/builders/BuilderManager.java  |   55 +-
 .../builders/appender/AsyncAppenderBuilder.java    |   12 +-
 .../builders/appender/ConsoleAppenderBuilder.java  |    9 +-
 .../appender/DailyRollingFileAppenderBuilder.java  |   11 +-
 .../EnhancedRollingFileAppenderBuilder.java        |  241 +++
 .../builders/appender/FileAppenderBuilder.java     |   11 +-
 .../builders/appender/NullAppenderBuilder.java     |    4 +-
 .../builders/appender/RewriteAppenderBuilder.java  |   14 +-
 .../appender/RollingFileAppenderBuilder.java       |   11 +-
 .../builders/appender/SocketAppenderBuilder.java   |    9 +-
 .../builders/appender/SyslogAppenderBuilder.java   |   59 +-
 .../builders/filter/LevelMatchFilterBuilder.java   |    5 +-
 .../builders/filter/LevelRangeFilterBuilder.java   |    7 +-
 .../builders/filter/StringMatchFilterBuilder.java  |   13 +-
 .../log4j/builders/layout/HtmlLayoutBuilder.java   |    2 +-
 .../builders/layout/PatternLayoutBuilder.java      |   10 +-
 .../log4j/builders/layout/SimpleLayoutBuilder.java |    4 +-
 .../log4j/builders/layout/TTCCLayoutBuilder.java   |    2 +-
 .../log4j/builders/layout/XmlLayoutBuilder.java    |    2 +-
 .../rolling/CompositeTriggeringPolicyBuilder.java  |   74 +
 .../rolling/SizeBasedTriggeringPolicyBuilder.java  |   75 +
 .../TimeBasedRollingPolicyBuilder.java}            |   39 +-
 .../builders/rolling/TriggeringPolicyBuilder.java  |   13 +-
 .../apache/log4j/config/Log4j1Configuration.java   |    7 +
 .../log4j/config/Log4j1ConfigurationParser.java    |   30 +-
 .../log4j/config/PropertiesConfiguration.java      |   26 +-
 .../org/apache/log4j/config/PropertySetter.java    |    2 +-
 .../log4j/helpers/AppenderAttachableImpl.java      |   19 +-
 .../org/apache/log4j/helpers/OptionConverter.java  |  244 ++-
 .../org/apache/log4j/helpers/UtilLoggingLevel.java |    2 +-
 .../org/apache/log4j/jmx/AbstractDynamicMBean.java |  177 +++
 .../src/main/java/org/apache/log4j/jmx/Agent.java  |  131 ++
 .../org/apache/log4j/jmx/AppenderDynamicMBean.java |  280 ++++
 .../apache/log4j/jmx/HierarchyDynamicMBean.java    |  252 ++++
 .../org/apache/log4j/jmx/LayoutDynamicMBean.java   |  216 +++
 .../org/apache/log4j/jmx/LoggerDynamicMBean.java   |  227 +++
 .../java/org/apache/log4j/jmx/MethodUnion.java}    |   29 +-
 .../java/org/apache/log4j/jmx/package-info.java    |   10 +-
 .../apache/log4j/layout/Log4j1SyslogLayout.java    |  226 +++
 .../org/apache/log4j/legacy/core/CategoryUtil.java |   45 +-
 .../log4j/pattern/Log4j1LevelPatternConverter.java |   48 +
 .../org/apache/log4j/spi/ThrowableInformation.java |    2 +-
 .../java/org/apache/log4j/xml/DOMConfigurator.java |    4 +-
 .../org/apache/log4j/xml/XmlConfiguration.java     |   32 +-
 .../test/java/org/apache/log4j/CategoryTest.java   |  129 +-
 ...omNoopAppender.java => CustomFileAppender.java} |   33 +-
 .../java/org/apache/log4j/CustomNoopAppender.java  |   34 +-
 .../test/java/org/apache/log4j/ListAppender.java   |    4 +
 .../apache/log4j/builders/BuilderManagerTest.java  |   53 +
 .../log4j/builders/Log4j2ListAppenderBuilder.java  |    9 +-
 .../builders/layout/PatternLayoutBuilderTest.java  |   57 +
 .../config/AbstractLog4j1ConfigurationTest.java    |   83 +-
 .../config/Log4j1ConfigurationFactoryTest.java     |    2 +-
 .../config/PropertiesConfigurationFactoryTest.java |    2 +-
 .../log4j/config/PropertiesConfigurationTest.java  |   15 +-
 .../config/PropertiesReconfigurationTest.java      |  205 ++-
 .../apache/log4j/config/XmlConfigurationTest.java  |   26 +-
 .../TestCase1.java}                                |   56 +-
 .../org/apache/log4j/defaultInit/TestCase2.java    |   59 +
 .../org/apache/log4j/defaultInit/TestCase3.java    |   53 +
 .../org/apache/log4j/defaultInit/TestCase4.java    |   60 +
 .../log4j/helpers/OptionConverterLevelTest.java    |  123 ++
 .../apache/log4j/helpers/UtilLoggingLevelTest.java |   39 +-
 .../log4j/layout/Log4j1SyslogLayoutTest.java       |   90 ++
 .../pattern/Log4j1LevelPatternConverterTest.java   |   46 +
 .../log4j-EnhancedRollingFileAppender.properties   |   66 +
 .../log4j-EnhancedRollingFileAppender.xml          |   94 ++
 ...erties => log4j1-appenders-custom-1.properties} |   17 +-
 ...erties => log4j1-appenders-custom-2.properties} |   17 +-
 ...j1-file.properties => log4j1-file-1.properties} |    3 +
 ...j1-file.properties => log4j1-file-2.properties} |    8 +-
 log4j-api-java9/pom.xml                            |   65 +-
 log4j-api-java9/src/assembly/java9.xml             |    4 +
 log4j-api-java9/src/main/java/module-info.java     |    8 +
 .../StatusLogger.java}                             |   22 +-
 .../EnvironmentPropertySource.java}                |    2 +-
 .../PropertySource.java => util/LoaderUtil.java}   |    6 +-
 .../log4j/{log4j => }/util/PropertySource.java     |   12 +-
 .../logging/log4j/util/ServiceLoaderUtil.java      |  111 ++
 .../SystemPropertiesPropertySource.java}           |    2 +-
 .../logging/log4j/util/java9/ModuleTest.java       |   23 +-
 .../log4j/util/java9/ProcessIdUtilTest.java        |    4 +-
 .../log4j/util/java9/ServiceLoaderUtilTest.java    |   53 +
 .../logging/log4j/util/java9/StackLocatorTest.java |   11 +-
 .../log4j/util/java9/test/BetterService.java       |   12 +-
 .../logging/log4j/util/java9/test/Service.java     |   12 +-
 .../logging/log4j/util/java9/test/Service1.java    |   12 +-
 .../logging/log4j/util/java9/test/Service2.java    |   12 +-
 .../src/test/{java => java9}/module-info.java      |   13 +
 .../logging/log4j/util/java9/ModuleUtil.java       |   16 +-
 log4j-api/pom.xml                                  |   65 +-
 .../logging/log4j/CloseableThreadContext.java      |   21 +-
 .../main/java/org/apache/logging/log4j/Level.java  |   18 +-
 .../java/org/apache/logging/log4j/LogBuilder.java  |    4 +-
 .../java/org/apache/logging/log4j/LogManager.java  |    6 +-
 .../log4j/message/StringFormattedMessage.java      |    4 +
 .../logging/log4j/message/StructuredDataId.java    |   69 +-
 .../logging/log4j/message/ThreadDumpMessage.java   |   26 +-
 .../log4j/util/EnvironmentPropertySource.java      |   45 +-
 .../org/apache/logging/log4j/util/LoaderUtil.java  |   37 +-
 .../logging/log4j/util/OsgiServiceLocator.java     |   67 +
 .../log4j/util/PropertiesPropertySource.java       |   27 +-
 .../apache/logging/log4j/util/PropertiesUtil.java  |  123 +-
 .../log4j/util/PropertyFilePropertySource.java     |   15 +-
 .../apache/logging/log4j/util/PropertySource.java  |   40 +-
 .../apache/logging/log4j/util/ProviderUtil.java    |   35 +-
 .../logging/log4j/util/ServiceLoaderUtil.java      |  161 ++
 .../log4j/util/SystemPropertiesPropertySource.java |   26 +-
 .../java/org/apache/logging/log4j/LevelTest.java   |   19 +-
 .../log4j/message/LocalizedMessageFactoryTest.java |   59 +-
 .../log4j/message/StringFormattedMessageTest.java  |   22 +
 .../log4j/message/StructuredDataMessageTest.java   |    8 +
 .../logging/log4j/util/OsgiServiceLocatorTest.java |   25 +-
 .../log4j/util/PropertiesUtilOrderTest.java        |  204 +++
 .../logging/log4j/util/PropertiesUtilTest.java     |   28 +
 .../log4j/util/PropertySourceTokenizerTest.java    |    4 +
 .../logging/log4j/util/ServiceLoaderUtilTest.java  |   91 ++
 .../logging/log4j/util/test/BetterService.java     |   12 +-
 .../apache/logging/log4j/util/test/Service.java    |   12 +-
 .../apache/logging/log4j/util/test/Service1.java   |   12 +-
 .../apache/logging/log4j/util/test/Service2.java   |   12 +-
 .../src/test/resources/Jira3413Test.properties     |   19 +-
 ...rg.apache.logging.log4j.util.test.BetterService |    5 +-
 .../org.apache.logging.log4j.util.test.Service     |   15 +-
 .../resources/PropertiesUtilOrderTest.properties   |   28 +-
 log4j-appserver/pom.xml                            |    3 +-
 log4j-bom/pom.xml                                  |   11 +
 .../logging/log4j/cassandra/CassandraRule.java     |   49 +-
 .../src/test/resources/CassandraAppenderTest.xml   |    2 +-
 log4j-core-its/pom.xml                             |    6 +
 .../core/async/perftest/AbstractRunQueue.java      |    0
 .../log4j/core/async/perftest/Histogram.java       |    0
 .../log4j/core/async/perftest/IPerfTestRunner.java |    0
 .../log4j/core/async/perftest/IdleStrategy.java    |    0
 .../core/async/perftest/MultiThreadPerfTest.java   |    0
 .../core/async/perftest/NoOpIdleStrategy.java      |    0
 .../log4j/core/async/perftest/PerfTest.java        |    0
 .../log4j/core/async/perftest/PerfTestDriver.java  |    0
 .../async/perftest/PerfTestResultFormatter.java    |    0
 .../core/async/perftest/ResponseTimeTest.java      |    0
 .../log4j/core/async/perftest/RunConversant.java   |    0
 .../log4j/core/async/perftest/RunJCTools.java      |    0
 .../log4j/core/async/perftest/RunLog4j1.java       |    0
 .../log4j/core/async/perftest/RunLog4j2.java       |    0
 .../log4j/core/async/perftest/RunLogback.java      |    0
 .../log4j/core/async/perftest/SimplePerfTest.java  |    0
 .../core/async/perftest/YieldIdleStrategy.java     |    0
 log4j-core-java9/pom.xml                           |    9 +-
 log4j-core/pom.xml                                 |   24 +-
 .../log4j/core/appender/AbstractAppender.java      |   10 +
 .../log4j/core/appender/ConsoleAppender.java       |   19 +-
 .../logging/log4j/core/appender/FileAppender.java  |    3 +
 .../logging/log4j/core/appender/FileManager.java   |    2 +
 .../core/appender/HttpURLConnectionManager.java    |   10 +-
 .../log4j/core/appender/RollingFileAppender.java   |   17 +-
 .../logging/log4j/core/appender/SmtpAppender.java  |   68 +-
 .../log4j/core/appender/SyslogAppender.java        |   40 +-
 .../core/appender/mom/jeromq/JeroMqManager.java    |    2 +-
 .../appender/rolling/AbstractRolloverStrategy.java |    2 +-
 .../appender/rolling/DefaultRolloverStrategy.java  |    3 +-
 .../core/appender/rolling/PatternProcessor.java    |    8 +
 .../logging/log4j/core/async/AsyncLogger.java      |    5 +
 .../log4j/core/async/AsyncLoggerConfig.java        |   10 +-
 .../core/async/AsyncLoggerConfigDisruptor.java     |   13 +-
 .../log4j/core/async/AsyncLoggerContext.java       |    8 +-
 .../log4j/core/async/AsyncLoggerDisruptor.java     |   15 +-
 .../core/async/AsyncWaitStrategyFactory.java}      |   27 +-
 .../core/async/AsyncWaitStrategyFactoryConfig.java |  106 ++
 .../async/DefaultAsyncWaitStrategyFactory.java     |   94 ++
 .../logging/log4j/core/async/DisruptorUtil.java    |   59 +-
 .../core/async/TimeoutBlockingWaitStrategy.java    |  135 ++
 .../log4j/core/config/AbstractConfiguration.java   |   15 +-
 .../logging/log4j/core/config/Configuration.java   |   11 +
 .../log4j/core/config/ConfigurationFactory.java    |   54 +-
 .../log4j/core/config/ConfigurationSource.java     |   30 +-
 .../logging/log4j/core/config/HttpWatcher.java     |  102 +-
 .../logging/log4j/core/config/LoggerConfig.java    |    2 -
 .../apache/logging/log4j/core/config/Property.java |   34 +-
 .../log4j/core/config/arbiters/ClassArbiter.java   |    4 +-
 .../core/config/plugins/util/PluginBuilder.java    |   40 +-
 .../core/config/plugins/util/ResolverUtil.java     |    2 +
 .../constraints/{Required.java => NotBlank.java}   |   19 +-
 .../plugins/validation/constraints/Required.java   |    5 +-
 ...quiredValidator.java => NotBlankValidator.java} |   29 +-
 .../validation/validators/RequiredValidator.java   |    2 +-
 .../log4j/core/filter/DynamicThresholdFilter.java  |    7 +
 .../core/filter/MutableThreadContextMapFilter.java |  407 +++++
 .../logging/log4j/core/filter/RegexFilter.java     |    6 +-
 .../log4j/core/filter/ThreadContextMapFilter.java  |    9 +-
 .../core/filter/mutable/KeyValuePairConfig.java}   |   33 +-
 .../log4j/core/impl/ThreadContextDataInjector.java |   17 +-
 .../logging/log4j/core/layout/LoggerFields.java    |    4 +-
 .../logging/log4j/core/layout/Rfc5424Layout.java   |  163 +-
 .../log4j/core/layout/StringBuilderEncoder.java    |    9 +-
 .../log4j/core/layout/TextEncoderHelper.java       |    6 +-
 .../apache/logging/log4j/core/net/MailManager.java |  211 +++
 .../log4j/core/net/MailManagerFactory.java}        |   18 +-
 .../log4j/core/net/Rfc1349TrafficClass.java        |   32 +-
 .../apache/logging/log4j/core/net/SmtpManager.java |  165 +-
 .../logging/log4j/core/net/SocketOptions.java      |  146 +-
 .../log4j/core/net/UrlConnectionFactory.java       |  104 +-
 .../net/ssl/AbstractKeyStoreConfiguration.java     |    4 +-
 .../log4j/core/net/ssl/KeyStoreConfiguration.java  |    2 +-
 .../core/net/ssl/SslConfigurationDefaults.java     |    7 +-
 .../core/net/ssl/SslConfigurationFactory.java      |    8 +-
 .../log4j/core/pattern/DatePatternConverter.java   |    8 +-
 .../logging/log4j/core/util/AbstractWatcher.java   |    2 +-
 .../apache/logging/log4j/core/util/Builder.java    |   15 +
 .../apache/logging/log4j/core/util/FileUtils.java  |   22 +-
 .../logging/log4j/core/util/WatchManager.java      |   25 +-
 .../core/util/internal/HttpInputStreamUtil.java    |  135 ++
 .../internal/LastModifiedSource.java}              |   46 +-
 .../internal/Status.java}                          |   12 +-
 .../core/appender/FileAppenderBuilderTest.java     |   60 +-
 .../log4j/core/appender/FileAppenderTest.java      |   29 +-
 .../log4j/core/appender/SmtpAppenderTest.java      |   15 +-
 .../core/appender/mom/kafka/KafkaAppenderTest.java |    8 +-
 .../appender/rolling/RollingAppenderCountTest.java |    2 +
 .../rolling/RollingAppenderSizeMaxWidthTest.java   |  159 ++
 .../core/async/AsyncLoggerDefaultLocationTest.java |   71 +
 ...WaitStrategyFactoryConfigGlobalLoggersTest.java |   69 +
 .../async/AsyncWaitStrategyFactoryConfigTest.java  |   82 +
 ...egyFactoryIncorrectConfigGlobalLoggersTest.java |   65 +
 .../log4j/core/config/ConfigurationSourceTest.java |   49 +-
 .../logging/log4j/core/config/PropertyTest.java    |   54 +
 .../core/config/arbiters/BasicArbiterTest.java     |   11 +
 .../HttpThreadContextMapFilterTest.java}           |  141 +-
 .../filter/MutableThreadContextMapFilterTest.java  |   98 ++
 .../logging/log4j/core/filter/RegexFilterTest.java |   20 +
 .../logging/log4j/core/layout/HtmlLayoutTest.java  |   10 +-
 .../log4j/core/layout/Rfc5424LayoutTest.java       |   64 +-
 .../logging/log4j/core/net/SmtpManagerTest.java    |   33 +-
 .../log4j/core/net/UrlConnectionFactoryTest.java   |  111 +-
 .../core/net/ssl/SslConfigurationFactoryTest.java  |   72 +
 .../log4j/core/selector/TestClassLoader.java       |    8 +-
 .../logging/log4j/core/util/FileUtilsTest.java     |   55 +
 .../logging/log4j/core/util/NetUtilsTest.java      |   28 +-
 .../resources/AsyncLoggerDefaultLocationTest.xml   |   20 +
 ...ncWaitStrategyFactoryConfigGlobalLoggerTest.xml |   17 +
 .../AsyncWaitStrategyFactoryConfigTest.xml         |   17 +
 ...ategyIncorrectFactoryConfigGlobalLoggerTest.xml |   16 +
 ...AsyncWaitStrategyIncorrectFactoryConfigTest.xml |   16 +
 .../src/test/resources/configPropertyTest.xml      |    9 +
 log4j-core/src/test/resources/emptyConfig.json     |    4 +
 log4j-core/src/test/resources/filterConfig.json    |    6 +
 log4j-core/src/test/resources/jarfile.jar          |  Bin 0 -> 1122 bytes
 .../src/test/resources/jarfile/config/console.xml  |   28 +
 ...ters.xml => log4j-rolling-size-max-width-1.xml} |   38 +-
 ...ters.xml => log4j-rolling-size-max-width-2.xml} |   38 +-
 ...ters.xml => log4j-rolling-size-max-width-3.xml} |   38 +-
 .../resources/log4j-rolling-size-max-width-4.xml   |   53 +
 log4j-core/src/test/resources/log4j2-arbiters.xml  |    8 +
 ...og4j2-arbiters.xml => log4j2-mutableFilter.xml} |   26 +-
 log4j-distribution/pom.xml                         |    4 +-
 .../log4j/flume/appender/FlumeAppender.java        |   18 +-
 {log4j-appserver => log4j-jakarta-smtp}/pom.xml    |  110 +-
 .../logging/log4j/smtp/MimeMessageBuilder.java     |   93 ++
 .../apache/logging/log4j/smtp}/SmtpManager.java    |  202 +--
 ...pache.logging.log4j.core.net.MailManagerFactory |    1 +
 .../logging/log4j/smtp/SmtpAppenderAsyncTest.java  |   98 ++
 .../logging/log4j/smtp}/SmtpAppenderTest.java      |   24 +-
 .../logging/log4j/smtp}/SmtpManagerTest.java       |   44 +-
 .../src/test/resources/SmtpAppenderAsyncTest.xml   |    0
 .../core/appender/db/jpa/JpaH2AppenderTest.java    |    4 +-
 .../src/test/resources/META-INF/persistence.xml    |    7 +-
 log4j-jpl/pom.xml                                  |    2 +-
 .../org/apache/logging/log4j/jul/ApiLogger.java    |    4 +-
 .../apache/logging/log4j/jul/ApiLoggerTest.java    |   11 +-
 log4j-layout-template-json/revapi.json             | 1596 +++++++++++---------
 .../layout/template/json/JsonTemplateLayout.java   |  102 +-
 .../template/json/resolver/MessageResolver.java    |    8 +-
 .../template/json/resolver/PatternResolver.java    |    2 +-
 .../template/json/resolver/TemplateResolvers.java  |  390 +++--
 .../layout/template/json/util/JsonWriter.java      |   28 +-
 .../src/main/resources/JsonLayout.json             |    4 +
 .../json/BlackHoleByteBufferDestination.java       |   12 +-
 .../log4j/layout/template/json/JsonLayoutTest.java |   12 +-
 .../layout/template/json/util/JsonWriterTest.java  |    2 +-
 log4j-mongodb3/src/site/markdown/index.md.vm       |    2 +-
 log4j-mongodb4/src/site/markdown/index.md.vm       |    2 +-
 .../log4j/osgi/tests/AbstractLoadBundleTest.java   |   46 +-
 log4j-perf/pom.xml                                 |    2 +-
 .../template/json/JsonTemplateLayoutBenchmark.java |  110 +-
 .../json/JsonTemplateLayoutBenchmarkState.java     |   64 +-
 log4j-samples/pom.xml                              |    2 +-
 .../boot/Log4j2CloudConfigLoggingSystem.java       |  107 +-
 .../log4j/spring/boot/SpringPropertySource.java    |    4 +-
 .../spring.factories}                              |    2 +-
 .../boot/Log4j2CloudConfigLoggingSystemTest.java   |   28 +-
 .../pom.xml                                        |    2 +-
 .../pom.xml                                        |    4 +-
 .../log4j-spring-cloud-config-samples/pom.xml      |    2 +-
 pom.xml                                            |  260 ++--
 src/changes/changes.xml                            |  125 +-
 src/site/markdown/manual/migration.md              |    9 +-
 src/site/site.xml                                  |    1 +
 src/site/xdoc/manual/appenders.xml                 |    6 +-
 src/site/xdoc/manual/async.xml                     |   56 +
 src/site/xdoc/manual/configuration.xml.vm          |   59 +-
 src/site/xdoc/manual/customconfig.xml              |    2 +-
 src/site/xdoc/manual/filters.xml                   |   82 +
 src/site/xdoc/manual/garbagefree.xml               |   11 +-
 src/site/xdoc/manual/layouts.xml.vm                |    4 +-
 src/site/xdoc/manual/thread-context.xml            |    2 +-
 toolchains-sample-linux.xml                        |   52 -
 toolchains-sample-mac.xml                          |   52 -
 329 files changed, 11471 insertions(+), 3337 deletions(-)
 rename toolchains-sample-win.xml => .github/workflows/maven-settings.xml (52%)
 create mode 100644 .github/workflows/scorecards-analysis.yml
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/EnhancedRollingFileAppenderBuilder.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/rolling/CompositeTriggeringPolicyBuilder.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/rolling/SizeBasedTriggeringPolicyBuilder.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/builders/{appender/NullAppenderBuilder.java => rolling/TimeBasedRollingPolicyBuilder.java} (52%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-1.2-api/src/main/java/org/apache/log4j/builders/rolling/TriggeringPolicyBuilder.java (76%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/AbstractDynamicMBean.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/Agent.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/AppenderDynamicMBean.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/HierarchyDynamicMBean.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/LayoutDynamicMBean.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/LoggerDynamicMBean.java
 copy log4j-1.2-api/src/{test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java => main/java/org/apache/log4j/jmx/MethodUnion.java} (61%)
 copy log4j-api-java9/src/test/java/module-info.java => log4j-1.2-api/src/main/java/org/apache/log4j/jmx/package-info.java (77%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1LevelPatternConverter.java
 copy log4j-1.2-api/src/test/java/org/apache/log4j/{CustomNoopAppender.java => CustomFileAppender.java} (60%)
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/builders/BuilderManagerTest.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/builders/layout/PatternLayoutBuilderTest.java
 copy log4j-1.2-api/src/test/java/org/apache/log4j/{helpers/UtilLoggingLevelTest.java => defaultInit/TestCase1.java} (54%)
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase2.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase3.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase4.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/helpers/OptionConverterLevelTest.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1SyslogLayoutTest.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1LevelPatternConverterTest.java
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-EnhancedRollingFileAppender.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-EnhancedRollingFileAppender.xml
 copy log4j-1.2-api/src/test/resources/{log4j1-file.properties => log4j1-appenders-custom-1.properties} (81%)
 copy log4j-1.2-api/src/test/resources/{log4j1-file.properties => log4j1-appenders-custom-2.properties} (81%)
 copy log4j-1.2-api/src/test/resources/{log4j1-file.properties => log4j1-file-1.properties} (99%)
 rename log4j-1.2-api/src/test/resources/{log4j1-file.properties => log4j1-file-2.properties} (89%)
 copy log4j-api-java9/src/main/java/org/apache/logging/log4j/{log4j/util/PropertySource.java => status/StatusLogger.java} (64%)
 copy log4j-api-java9/src/main/java/org/apache/logging/log4j/{log4j/util/PropertySource.java => util/EnvironmentPropertySource.java} (93%)
 copy log4j-api-java9/src/main/java/org/apache/logging/log4j/{log4j/util/PropertySource.java => util/LoaderUtil.java} (86%)
 copy log4j-api-java9/src/main/java/org/apache/logging/log4j/{log4j => }/util/PropertySource.java (72%)
 create mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java
 copy log4j-api-java9/src/main/java/org/apache/logging/log4j/{log4j/util/PropertySource.java => util/SystemPropertiesPropertySource.java} (93%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderBuilderTest.java => log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/ModuleTest.java (61%)
 create mode 100644 log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/ServiceLoaderUtilTest.java
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/test/BetterService.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/test/Service.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/test/Service1.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/test/Service2.java (79%)
 rename log4j-api-java9/src/test/{java => java9}/module-info.java (71%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api-java9/src/test/java9/org/apache/logging/log4j/util/java9/ModuleUtil.java (76%)
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/OsgiServiceLocator.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java
 rename log4j-api-java9/src/main/java/org/apache/logging/log4j/log4j/util/PropertySource.java => log4j-api/src/test/java/org/apache/logging/log4j/util/OsgiServiceLocatorTest.java (58%)
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api/src/test/java/org/apache/logging/log4j/util/test/BetterService.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api/src/test/java/org/apache/logging/log4j/util/test/Service.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api/src/test/java/org/apache/logging/log4j/util/test/Service1.java (79%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java => log4j-api/src/test/java/org/apache/logging/log4j/util/test/Service2.java (79%)
 copy log4j-spring-boot/src/main/resources/log4j2.system.properties => log4j-api/src/test/resources/Jira3413Test.properties (64%)
 copy log4j-spring-boot/src/main/resources/log4j2.system.properties => log4j-api/src/test/resources/META-INF/services/org.apache.logging.log4j.util.test.BetterService (86%)
 copy log4j-spring-boot/src/main/resources/log4j2.system.properties => log4j-api/src/test/resources/META-INF/services/org.apache.logging.log4j.util.test.Service (73%)
 copy log4j-spring-boot/src/main/resources/log4j2.system.properties => log4j-api/src/test/resources/PropertiesUtilOrderTest.properties (51%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java (100%)
 copy {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j1.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLogback.java (100%)
 rename {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java (100%)
 copy {log4j-core => log4j-core-its}/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java (100%)
 copy log4j-core/src/{test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java => main/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactory.java} (58%)
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfig.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/TimeoutBlockingWaitStrategy.java
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/constraints/{Required.java => NotBlank.java} (76%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/{RequiredValidator.java => NotBlankValidator.java} (66%)
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
 rename log4j-core/src/{test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java => main/java/org/apache/logging/log4j/core/filter/mutable/KeyValuePairConfig.java} (56%)
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/net/MailManager.java
 rename log4j-core/src/{test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java => main/java/org/apache/logging/log4j/core/net/MailManagerFactory.java} (71%)
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/HttpInputStreamUtil.java
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/{net/Rfc1349TrafficClass.java => util/internal/LastModifiedSource.java} (52%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/{net/ssl/SslConfigurationDefaults.java => util/internal/Status.java} (77%)
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeMaxWidthTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultLocationTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigGlobalLoggersTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java
 copy log4j-core/src/test/java/org/apache/logging/log4j/core/{net/UrlConnectionFactoryTest.java => filter/HttpThreadContextMapFilterTest.java} (53%)
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationFactoryTest.java
 create mode 100644 log4j-core/src/test/resources/AsyncLoggerDefaultLocationTest.xml
 create mode 100644 log4j-core/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml
 create mode 100644 log4j-core/src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml
 create mode 100644 log4j-core/src/test/resources/AsyncWaitStrategyIncorrectFactoryConfigGlobalLoggerTest.xml
 create mode 100644 log4j-core/src/test/resources/AsyncWaitStrategyIncorrectFactoryConfigTest.xml
 create mode 100644 log4j-core/src/test/resources/emptyConfig.json
 create mode 100644 log4j-core/src/test/resources/filterConfig.json
 create mode 100644 log4j-core/src/test/resources/jarfile.jar
 create mode 100644 log4j-core/src/test/resources/jarfile/config/console.xml
 copy log4j-core/src/test/resources/{log4j2-arbiters.xml => log4j-rolling-size-max-width-1.xml} (53%)
 copy log4j-core/src/test/resources/{log4j2-arbiters.xml => log4j-rolling-size-max-width-2.xml} (53%)
 copy log4j-core/src/test/resources/{log4j2-arbiters.xml => log4j-rolling-size-max-width-3.xml} (53%)
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-size-max-width-4.xml
 copy log4j-core/src/test/resources/{log4j2-arbiters.xml => log4j2-mutableFilter.xml} (63%)
 copy {log4j-appserver => log4j-jakarta-smtp}/pom.xml (65%)
 create mode 100644 log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java
 copy {log4j-core/src/main/java/org/apache/logging/log4j/core/net => log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp}/SmtpManager.java (58%)
 create mode 100644 log4j-jakarta-smtp/src/main/resources/META-INF/services/org.apache.logging.log4j.core.net.MailManagerFactory
 create mode 100644 log4j-jakarta-smtp/src/test/java/org/apache/logging/log4j/smtp/SmtpAppenderAsyncTest.java
 copy {log4j-core/src/test/java/org/apache/logging/log4j/core/appender => log4j-jakarta-smtp/src/test/java/org/apache/logging/log4j/smtp}/SmtpAppenderTest.java (91%)
 copy {log4j-core/src/test/java/org/apache/logging/log4j/core/net => log4j-jakarta-smtp/src/test/java/org/apache/logging/log4j/smtp}/SmtpManagerTest.java (70%)
 copy {log4j-core => log4j-jakarta-smtp}/src/test/resources/SmtpAppenderAsyncTest.xml (100%)
 rename log4j-spring-boot/src/main/resources/{log4j2.system.properties => META-INF/spring.factories} (85%)
 delete mode 100644 toolchains-sample-linux.xml
 delete mode 100644 toolchains-sample-mac.xml