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 2021/04/03 05:14:49 UTC
[logging-log4j2] branch
dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0 updated
(415457a -> 214bc2c)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
discard 415457a Bump build-helper-maven-plugin from 1.12 to 3.2.0
add d0fe63a Add MacOS to GitHub Actions.
add 94051b9 Update Spring versions
add 445fcb5 Remove Travis config
add fcb5b5e Update sample toolchains configs to match expected
add 01eda1f Use appropriate Jira component in changes report
add 5471d9a LOG4J2-2906 - Fix UnsupportedOperationException
add cd30a5c LOG4J2-2906 - document changes
add fd02df6 LOG4J2-2892 - Add support for newline delimited messages in GelfLayout
add 295940c Better tests for newline and null delimiters in GelfLayoutTest
add dcad4a8 Merge branch 'LOG4J2-2892' of https://github.com/jakluk/logging-log4j2 into jakluk-LOG4J2-2892
add e2ec23e LOG4J2-2892 - Allow GelfLayout to produce newline delimited events
add 7e97246 Merge branch 'jakluk-LOG4J2-2892'
add de29b31 added two articles recently published (#402)
add 22c1f39 LOG4J2-2847 Extend Log4j-config.xsd (#360)
add 21df99b #335 Fix code typo in EnhancedGelf.json.
add 86f3653 #335 Small fixes in the manual.
add 21746ab Mark TODO test as @Ignore
add 8ed2aca Use static inner class
add 00598f2 [LOG4J2-2653] Migrate part of log4j-core to JUnit 5
add e97f94c Update logging-parent to 3
add 5062912 Bump plexus-compiler-javac-errorprone from 2.8.5 to 2.8.7
add 356263d Merge pull request #403 from apache/dependabot/maven/org.codehaus.plexus-plexus-compiler-javac-errorprone-2.8.7
add 6c490d6 Bump maven-resources-plugin from 3.0.2 to 3.2.0
add 6e3668f Merge pull request #398 from apache/dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.2.0
add c5c3234 Bump maven-checkstyle-plugin from 3.0.0 to 3.1.1
add 03fbccb Merge pull request #377 from apache/dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.1.1
add b8c13af Update log4j-bom parent pom to 3
add 5550f68 Revert errorprone plexus upgrade
add 4d14fe7 Update build badges
add ffa6d94 [LOG4J2-2653] Migrate test to JUnit 5
add f4461e0 Create SECURITY.md
add a45b16d mockito 3.5.5
add b6344de Merge pull request #400 from sullis/mockito-3.5.0
add 20d6902 run CI build for pull requests
add 6802f82 Merge pull request #401 from sullis/ci-gha-pull-request
add 334448c [LOG4J2-2653] Migrate pattern tests to JUnit 5
add 05288f4 #335 Add Velocity support to JsonTemplateLayout manual.
add 96956a2 #335 Rename JsonTemplateLayout artifact and package.
add 58d9b49 Try improving RollingAppenderRestartTest to alleviate test report failures.
add fcedbb2 Try improving RollingDirectSizeTimeNewDirectoryTest to alleviate test report failures.
add 916b13f Bump jackson2Version from 2.11.1 to 2.11.2
add 3751f85 Bump commons-compress from 1.18 to 1.20
add 1071514 Bump jctools-core from 1.2.1 to 3.1.0
add 2c7d137 Bump maven-pmd-plugin from 3.10.0 to 3.13.0
add 4b9e3c2 Bump org.apache.felix.framework from 5.6.10 to 6.0.3
add 058024f Bump jetty-util from 8.2.0.v20160908 to 9.4.31.v20200723
add cdc6185 Update changes.xml.
add 2e48bef [LOG4J2-2653] Migrate lookup and net tests to JUnit 5
add 23347b7 [LOG4J2-2653] Migrate layout tests to JUnit 5
add 08b35a2 [LOG4J2-2653] Migrate filter and impl tests to JUnit 5
add bccf597 Simplify concurrent test and improve Windows resiliency
add e32cdde [LOG4J2-2653] Migrate more tests to JUnit 5
add 5da8b9c Bump assertj-core from 3.14.0 to 3.17.1
add 508ec22 Bump jeromq from 0.4.3 to 0.5.2
add fdc596c Remove extraneous copy of the source tree
add 771dc35 Introduce annotation for JUnit 5 LCF tests
add 4054886 Migrate some parameterized tests to JUnit 5
add 018f72a Fix Windows file removal errors
add 1fb8aae Support shutdown timeout in JUnit 5 extension
add d017766 Migrate more tests to JUnit 5
add cc996ca LOG4J2-2919 Call ReliabilityStrategy's beforeStopAppenders() method before stopping AsyncAppenders to avoid errors caused by logging with AsyncAppender while system is reconfiguring Submitted by: gengyuanzhe <ge...@gmail.com>
add 0e2ad68 Add tests for LOG4J2-1121 and LOG4J2-2919
add c5fad55 Merge pull request #416 from gengyuanzhe/master
add 424754e Add changelog entry for LOG4J2-2919
add 916c684 Revert "Introduce annotation for JUnit 5 LCF tests"
add a1d7bea Fix typos in config file
add 8e28716 Revert "Bump org.apache.felix.framework from 5.6.10 to 6.0.3"
add 6c3e3d8 Revert changes addition
add 7c630ac Migrate more config tests to JUnit 5
add bcdc5e2 Migrate MemoryMappedFileAppender tests to JUnit 5
add ce9d49f Migrate more appender tests to JUnit 5
add 1ca973b Migrate rewrite tests to JUnit 5
add 7be7b0f Introduce StatusLoggerLevel test annotation
add 521d4a3 Support clean up annotations on methods
add ec76b14 Migrate rolling action tests to JUnit 5
add 19ed193 Migrate some rolling tests to JUnit 5
add eb9a794 Use ResourceLock for locale-related tests
add ebe2071 [LOG4J2-2921] Enable parallel tests in log4j-api
add 0a509bf Update JUnit to 5.7.0
add de4e43e Enable forkCount of 1C in log4j-api tests
add ac9643c Specify resource lock for status logger extension
add 9462a2f (doc) Fix typos in manual
add d6ae3ec Merge pull request #420 from Marcono1234/marcono1234/site-typo-fixes
add 16838a7 Migrate more tests to JUnit 5
add efd4e65 Simplify spotbugs config
add bf16de8 Revert "Migrate more tests to JUnit 5"
add e382adb Update spotbugs from 3.0.x to 4.0.x
add 6bdc516 Disable spotbugs in log4j-perf
add 8e697e3 Add changelog entry for LOG4J2-2889
add e7af0e3 [LOG4J2-2889] HtmlLayout support datePattern and timezone
add 8587d5b [LOG4J2-2889] add doc for datePattern and timezone of HtmlLayout
add d8a0d71 Fix DatePatternConverterTest bug, PDT is not a available timezone id.
add 3421385 remove deprecated factory method of HtmlLayout
add a0f4152 [LOG4J2-2889] Perfect the doc of HtmlLayout
add 913e87d Merge pull request #419 from gengyuanzhe/LOG4J2-2889
add 7aef4f0 LOG4J2-2939: Fix NPE in MDCContextMap (#430)
add d368e29 LOG4J2-2939 changelog
add 8e4eb7a LOG4J2-2911 - Log4j2EventListener in spring.cloud.config.client listens for wrong event.
add 1ef19da LOG4J2-2954 Retain strong reference to shutdown callbacks
add a889a95 Only generate doap file in parent project. Revert Checkstyle plugin version change so site will build
add a8d6e69 Try improving RollingDirectTimeNewDirectoryTest to alleviate test report failures.
add f5d8780 Upload test reports in GitHub Actions.
add 8682e35 Workarounds for Windows-specific "file being used by another process" failures.
add 80f62c4 LOG4J2-620 ReconfigurationDeadlockTest rewrite to prevent spurious failures.
add 5c938e1 Delete unused BasicLayout.
add 17e074c Catch all type of exceptions in AppenderControl.
add 5127846 LOG4J2-2936 Add message parameter resolver to JSON template layout.
add 0892fc6 Bump junit from 4.13 to 4.13.1
add 5b0a153 LOG4J2-2936 Make JSON template layout message parameter resolver garbage-free.
add 38df09d Close RAFMs in RandomAccessFileManagerTest to avoid test failures on Windows.
add c94d5d0 OG4J2-2850
add b6eac5f LOG4J2-2850 : LocalizedMessageFactory creates new message with baseName as messagePattern
add 766ab74 LOG4j2-2850
add a42def9 LOG4J2-2850 Fix indentation in LocalizedMessageFactoryTest.
add 749ef13 Improve JTL TemplateResolver docs.
add d71e0cf Remove constants in JsonTemplateLayoutDefaults to allow updates at runtime.
add 97db574 LOG4J2-2916 Avoid redundant Kafka producer instantiation causing thread leaks.
add 2ab61df LOG4J2-2961 Fix reading of JsonTemplateLayout event additional fields from config.
add 7f5c24c Try suppressing revapi errors regarding JSON Template Layout.
add 581d543 Align JTL module with the one in release-2.x.
add cd4aa20 Escape XML characters in JTL POM.
add cf01a51 Replace enum singletons with final classes, as requested by Gary Gregory.
add ee1328a LOG4J2-2962 Enrich "map" resolver by unifying its backend with "mdc" resolver.
add adf3758 Migrate JTL tests to JUnit 5.
add 6db78fb LOG4J2-2966 Replace String.valueOf() usages with ParameterizedMessage.deepToString().
add d728835 LOG4J2-2967 Fix JTL parameter resolution for messages with too few parameters. (#443)
add ab8753f LOG4J2-2966 Revert the usage of ParameterizedMessage.deepToString().
add 719de57 Update AbstractLoggerTest uncommenting java8 tests
add 2dd4ebf Log4j would fail to initialize in Java 8 with log4j-spring-boot
add 86353b0 Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9
add c72fe4f revapi.plugin.version 0.10.5 -> 0.12.2.
add 9ce8a89 revapi-java 0.18.2 -> 0.22.1.
add d9e01a9 Add --no-transfer-progress Maven flag to GitHub Actions build.
add c24f482 LOG4J2-2985 Add eventTemplateRootObjectKey parameter to JsonTemplateLayout. (#454)
add be8d827 Collapse multiple identical catch clauses into one.
add 58e823c Fix formatting in log4j-spring-cloud-config-sample-application README (#461)
add 6bf68b7 LOG4J2-2972 Refactor AsyncAppender and AppenderControl for handling of Throwables. (#452)
add f96cf24 LOG4J2-2998 Fix truncation of excessive strings ending with a high surrogate in JsonWriter. (#457)
add 2846aae LOG4J2-2993 Support stack trace truncation in JsonTemplateLayout. (#458)
add 2ad1498 LOG4J2-2999 Replace JsonTemplateLayout resolver configurations table in docs with sections.
add 7ed3816 LOG4J2-2999 Add new entries to feature comparison matrix.
add 9ca9230 Use Objects.hashCode() when there is only one item to hash.
add 57b6298 LOG4J2-2972 Fix AsyncAppender builder annotation.
add 9a28db3 LOG4J2-2973 Rename EventTemplateAdditionalField#type (conflicting with properties file parser) to #format. (#462)
add 99269ba LOG4J2-2973 Minor tweaks to previous work.
add 59780eb LOG4J2-2973 Add tests for JSON-formatted configuration.
add 78c6699 [LOG4J2-3014] Log4j1ConfigurationConverter on Windows produces "
" at end of every line.
add fb16ef3 LOG4J2-2977 Replace outdated PatternLayout.createLayout() calls in docs with createDefaultLayout(). (#453)
add 988a1bd LOG4J2-2977 Update changelog.
add adfd2b7 Merge branch 'master' of https://gitbox.apache.org/repos/asf/logging-log4j2.git
add 45c8674 LOG4J2-1606 LOG4J2-2624 Add flag to disable automatic log4j shutdown in log4j-web. (#463)
add f9073f6 Upgrade log4j2-ecs-layout to 0.5.2.
add febfa10 Fix compiler warnings in JsonTemplateLayout.
add 402acee Continue on error in GitHub Actions workflow build step.
add b8f8b5a Speed-up JsonWriterTest by using random increments.
add 1dea59c Document how to disable message pattern lookups (#450)
add b7cae74 (doc) Fix Logger documentation formatting error (#424)
add 3482450 LOG4J2-3006 - Directly create a thread instead of using the common ForkJoin pool when initializing ThreadContextDataInjector
add 79b1568 test files must only be created in the target directory. Copied FileRenameActionTest from release-2.x
add 11b8c17 LOG4J2-2990 - Reduce garbage by using putAll when copying the ThreadContext for SLF4J
add 7d4aab6 Fixing typos in docs. (#465)
add ff50835 Cut down test time by moving recycler-specific test schemes from Surefire executions to JUnit parameters.
add 963db9f Test RecyclerFactory read from XML config.
add 7c73b15 Improve readability.
add 943ded3 Sort methods.
add 7847b82 [LOG4J2-3026] WatchManager does not stop its ConfigurationScheduler thereby leaking a thread.
add 545816e Revert "[LOG4J2-3026] WatchManager does not stop its ConfigurationScheduler thereby leaking a thread."
add 8abfd92 Validate input in ctor.
add 7c30c09 LOG4J2-2983 - Add unit test to validate reported scenario
add 6454ff6 LOG4J2-2893 - Allow reconfiguration when Log4j 1 configuration files are updated.
add b137f44 LOG4J2-2981 - OnStartupTriggeringPolicy would fail to cause the file to roll over with DirectWriteTriggeringPolicy unless minSize was set to 0
add 74a8389 LOG4J2-3028: Always clear the OutputStreamManager buffer on flush
add e300180 Shutdown log4j before deleting files
add 52f07f2 LOG4J2-2923 - Add Rollover Listener to aid in unit test validation.
add ce84841 I hate windows
add e917bac LOG4J2-2948 Replace HashSet with IdentityHashMap in ParameterFormatter to detect cycles. (#471)
add 7dcdf0d Fix unit test on Windows - I hope
add e4cdfd2 LOG4J2-2947 - Mention default methods do nothing. Add log method with no parameters.
add f52c6c6 Add LOG4J2-2947 to changes.xml
add 57ab8e0 Clean up changes.xml.
add da0f81f LOG4J2-3033 - Add changes.xml entry
add b345fbc Log4j 2.14.1 was released
add 5dcdd5d LOG4J2-3041 - Allow GelfLayout to use PatternSelectors
add 5ee62d9 LOG4J2-3044 - Add RepeatPatternConverter
add 870b3e4 Note Java 6 & 7 are no longer supported
add 84a9772 LOG4J2-3048 - Add improved MapMessge support to GelfLayout.
add 62804d5 LOG4J2-3049 - Allow MapMessage and ThreadContext attributes to be prefixed
add 0eecfd0 LOG4J2-3050 - Allow AdditionalFields to be ignored if their value is null or a zero-length String.
add 6703c50 Make adding a prefix garbage free
add 20f9a97 LOG4J2-3054: BasicContextSelector takes the default context into account
add 79c187a LOG4J2-2940: Context selectors are aware of ClassLoader dependency
add d819f0a LOG4J2-2940: Reduce StackWalker interactions accessing an slf4j logger instance
add 702787e LOG4J2-2940: Implement BasicAsyncLoggerContextSelector
add 6027bae BasicAsyncLoggerContextSelector documentation
add 720e78d Move to Java 11
add d02f446 LOG4J2-3054: BasicContextSelector takes the default context into account
add 459d7ad LOG4J2-2940: Context selectors are aware of ClassLoader dependency
add 07b0fad LOG4J2-2940: Reduce StackWalker interactions accessing an slf4j logger instance
add f42f81c LOG4J2-2940: Implement BasicAsyncLoggerContextSelector
add 2e0e3bc BasicAsyncLoggerContextSelector documentation
add e5cb987 Update github actions
add e1b0d83 Upgrade Maven Bundle Plugin version
add 8ffe5b7 Use a property to control the precision of the SystemClock
add 60ae1e1 Add back annotations
add 210dce1 Increase step timeout values
add 9811f0a Merge pull request #480 from apache/master-java11
add 214bc2c Bump build-helper-maven-plugin from 1.12 to 3.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 (415457a)
\
N -- N -- N refs/heads/dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0 (214bc2c)
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/workflows/main.yml | 74 +
.github/workflows/maven.yml | 71 -
.travis-toolchains.xml | 42 -
.travis.yml | 34 -
README.md | 5 +-
SECURITY.md | 13 +
log4j-1.2-api/pom.xml | 13 +-
.../org/apache/log4j/bridge/LogEventAdapter.java | 2 +-
.../log4j/config/Log4j1ConfigurationConverter.java | 26 +-
.../log4j/config/PropertiesConfiguration.java | 19 +
.../java/org/apache/log4j/spi/ErrorHandler.java | 2 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 18 +
.../src/main/java/org/apache/log4j/Appender.java | 143 --
.../java/org/apache/log4j/AppenderSkeleton.java | 177 --
.../java/org/apache/log4j/BasicConfigurator.java | 45 -
.../src/main/java/org/apache/log4j/Category.java | 571 -----
.../java/org/apache/log4j/ConsoleAppender.java | 52 -
.../src/src/main/java/org/apache/log4j/Layout.java | 89 -
.../src/src/main/java/org/apache/log4j/Level.java | 252 ---
.../src/main/java/org/apache/log4j/LogManager.java | 251 ---
.../src/src/main/java/org/apache/log4j/Logger.java | 66 -
.../src/src/main/java/org/apache/log4j/MDC.java | 77 -
.../src/src/main/java/org/apache/log4j/NDC.java | 207 --
.../main/java/org/apache/log4j/PatternLayout.java | 40 -
.../src/main/java/org/apache/log4j/Priority.java | 239 --
.../org/apache/log4j/PropertyConfigurator.java | 126 --
.../java/org/apache/log4j/RenderedMessage.java | 60 -
.../main/java/org/apache/log4j/SimpleLayout.java | 46 -
.../main/java/org/apache/log4j/WriterAppender.java | 378 ----
.../org/apache/log4j/bridge/AppenderAdapter.java | 86 -
.../org/apache/log4j/bridge/AppenderWrapper.java | 101 -
.../apache/log4j/bridge/ErrorHandlerAdapter.java | 59 -
.../org/apache/log4j/bridge/FilterAdapter.java | 56 -
.../org/apache/log4j/bridge/FilterWrapper.java | 47 -
.../org/apache/log4j/bridge/LayoutAdapter.java | 73 -
.../org/apache/log4j/bridge/LayoutWrapper.java | 48 -
.../org/apache/log4j/bridge/LogEventAdapter.java | 217 --
.../org/apache/log4j/builders/BooleanHolder.java | 33 -
.../org/apache/log4j/builders/BuilderManager.java | 94 -
.../java/org/apache/log4j/builders/Holder.java | 39 -
.../log4j/builders/appender/AppenderBuilder.java | 33 -
.../builders/appender/ConsoleAppenderBuilder.java | 111 -
.../appender/DailyRollingFileAppenderBuilder.java | 146 --
.../builders/appender/FileAppenderBuilder.java | 135 --
.../builders/appender/NullAppenderBuilder.java | 43 -
.../appender/RollingFileAppenderBuilder.java | 170 --
.../builders/filter/DenyAllFilterBuilder.java | 46 -
.../log4j/builders/filter/FilterBuilder.java | 30 -
.../builders/filter/LevelMatchFilterBuilder.java | 74 -
.../builders/filter/LevelRangeFilterBuilder.java | 81 -
.../builders/filter/StringMatchFilterBuilder.java | 75 -
.../log4j/builders/layout/HtmlLayoutBuilder.java | 60 -
.../log4j/builders/layout/LayoutBuilder.java | 30 -
.../builders/layout/PatternLayoutBuilder.java | 77 -
.../log4j/builders/layout/SimpleLayoutBuilder.java | 46 -
.../log4j/builders/layout/TTCCLayoutBuilder.java | 103 -
.../log4j/builders/layout/XmlLayoutBuilder.java | 59 -
.../apache/log4j/config/InputStreamWrapper.java | 92 -
.../apache/log4j/config/Log4j1Configuration.java | 57 -
.../log4j/config/Log4j1ConfigurationConverter.java | 220 --
.../log4j/config/Log4j1ConfigurationFactory.java | 58 -
.../log4j/config/Log4j1ConfigurationParser.java | 446 ----
.../org/apache/log4j/config/PropertySetter.java | 287 ---
.../log4j/config/PropertySetterException.java | 65 -
.../java/org/apache/log4j/config/package-info.java | 20 -
.../org/apache/log4j/helpers/NullEnumeration.java | 47 -
.../org/apache/log4j/helpers/OptionConverter.java | 345 ---
.../java/org/apache/log4j/helpers/QuietWriter.java | 69 -
.../org/apache/log4j/helpers/package-info.java | 20 -
.../org/apache/log4j/layout/Log4j1XmlLayout.java | 159 --
.../org/apache/log4j/legacy/core/CategoryUtil.java | 65 -
.../org/apache/log4j/legacy/core/ContextUtil.java | 34 -
.../java/org/apache/log4j/or/ObjectRenderer.java | 27 -
.../java/org/apache/log4j/or/RendererSupport.java | 26 -
.../org/apache/log4j/or/ThreadGroupRenderer.java | 57 -
.../org/apache/log4j/or/jms/MessageRenderer.java | 87 -
.../main/java/org/apache/log4j/package-info.java | 20 -
.../log4j/pattern/Log4j1MdcPatternConverter.java | 88 -
.../log4j/pattern/Log4j1NdcPatternConverter.java | 63 -
.../org/apache/log4j/spi/AppenderAttachable.java | 70 -
.../java/org/apache/log4j/spi/Configurator.java | 55 -
.../main/java/org/apache/log4j/spi/ErrorCode.java | 33 -
.../java/org/apache/log4j/spi/ErrorHandler.java | 98 -
.../src/main/java/org/apache/log4j/spi/Filter.java | 100 -
.../apache/log4j/spi/HierarchyEventListener.java | 33 -
.../java/org/apache/log4j/spi/LocationInfo.java | 75 -
.../java/org/apache/log4j/spi/LoggerFactory.java | 33 -
.../org/apache/log4j/spi/LoggerRepository.java | 109 -
.../java/org/apache/log4j/spi/LoggingEvent.java | 131 --
.../java/org/apache/log4j/spi/OptionHandler.java | 26 -
.../org/apache/log4j/spi/RepositorySelector.java | 43 -
.../org/apache/log4j/spi/ThrowableInformation.java | 69 -
.../java/org/apache/log4j/spi/package-info.java | 20 -
.../java/org/apache/log4j/xml/DOMConfigurator.java | 80 -
.../org/apache/log4j/xml/Log4jEntityResolver.java | 51 -
.../log4j/xml/UnrecognizedElementHandler.java | 42 -
.../apache/log4j/xml/XmlConfigurationFactory.java | 926 --------
.../java/org/apache/log4j/xml/package-info.java | 20 -
.../main/resources/org/apache/log4j/xml/log4j.dtd | 237 --
log4j-1.2-api/src/src/site/markdown/index.md | 48 -
log4j-1.2-api/src/src/site/site.xml | 52 -
.../apache/log4j/BasicConfigurationFactory.java | 70 -
.../org/apache/log4j/CallerInformationTest.java | 65 -
.../test/java/org/apache/log4j/CategoryTest.java | 209 --
.../src/test/java/org/apache/log4j/LevelTest.java | 284 ---
.../test/java/org/apache/log4j/ListAppender.java | 83 -
.../test/java/org/apache/log4j/LogWithMDCTest.java | 57 -
.../java/org/apache/log4j/LogWithRouteTest.java | 58 -
.../src/test/java/org/apache/log4j/LoggerTest.java | 525 -----
.../test/java/org/apache/log4j/LoggingTest.java | 43 -
.../test/java/org/apache/log4j/MDCTestCase.java | 49 -
.../src/test/java/org/apache/log4j/NDCTest.java | 36 -
.../test/java/org/apache/log4j/PriorityTest.java | 226 --
.../test/java/org/apache/log4j/VelocityTest.java | 61 -
.../AbstractLog4j1ConfigurationConverterTest.java | 68 -
.../org/apache/log4j/config/AutoConfigTest.java | 66 -
.../Log4j1ConfigurationConverterHadoopTest.java | 39 -
.../Log4j1ConfigurationConverterSparkTest.java | 39 -
.../config/Log4j1ConfigurationFactoryTest.java | 249 ---
.../log4j/config/XmlConfigurationFactoryTest.java | 82 -
.../apache/log4j/layout/Log4j1XmlLayoutTest.java | 88 -
.../pattern/Log4j1MdcPatternConverterTest.java | 78 -
.../pattern/Log4j1NdcPatternConverterTest.java | 74 -
.../apache/log4j/util/SerializationTestHelper.java | 148 --
.../src/src/test/resources/L7D_en_US.properties | 17 -
.../src/src/test/resources/L7D_fr.properties | 17 -
.../src/src/test/resources/L7D_fr_CH.properties | 16 -
.../src/main/resources/log4j.properties | 19 -
.../hadoop-common/src/main/conf/log4j.properties | 323 ---
.../src/test/resources/log4j.properties | 18 -
.../hadoop-kms/src/test/resources/log4j.properties | 31 -
.../src/main/resources/log4j.properties | 31 -
.../hadoop-nfs/src/test/resources/log4j.properties | 18 -
.../src/test/resources/log4j.properties | 49 -
.../bkjournal/src/test/resources/log4j.properties | 55 -
.../src/test/resources/log4j.properties | 49 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../hadoop-aws/src/test/resources/log4j.properties | 23 -
.../src/test/resources/log4j.properties | 25 -
.../src/test/resources/log4j.properties | 42 -
.../src/main/sample-conf/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 37 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 63 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../src/test/resources/log4j.properties | 19 -
.../log4j-DailyRollingFileAppender.properties | 26 -
.../config-1.2/log4j-NullAppender.properties | 9 -
...log4j-RollingFileAppender-with-props.properties | 27 -
.../log4j-RollingFileAppender.properties | 22 -
.../log4j-console-EnhancedPatternLayout.properties | 18 -
.../config-1.2/log4j-console-HtmlLayout.properties | 19 -
.../log4j-console-PatternLayout.properties | 18 -
.../log4j-console-SimpleLayout.properties | 17 -
.../config-1.2/log4j-console-TTCCLayout.properties | 19 -
.../config-1.2/log4j-console-XmlLayout.properties | 19 -
.../config-1.2/log4j-file-SimpleLayout.properties | 17 -
.../log4j-system-properties-1.properties | 14 -
.../log4j-system-properties-2.properties | 15 -
.../resources/config-1.2/spark/R/log4j.properties | 28 -
.../src/test/resources/log4j.properties | 27 -
.../src/test/resources/log4j.properties | 24 -
.../spark/core/src/test/resources/log4j.properties | 36 -
.../flume-sink/src/test/resources/log4j.properties | 28 -
.../flume/src/test/resources/log4j.properties | 28 -
.../src/test/resources/log4j.properties | 27 -
.../kafka-0-10/src/test/resources/log4j.properties | 28 -
.../kafka-0-8/src/test/resources/log4j.properties | 28 -
.../src/main/resources/log4j.properties | 37 -
.../src/test/resources/log4j.properties | 27 -
.../graphx/src/test/resources/log4j.properties | 27 -
.../launcher/src/test/resources/log4j.properties | 33 -
.../mllib/src/test/resources/log4j.properties | 28 -
.../spark/repl/src/test/resources/log4j.properties | 27 -
.../catalyst/src/test/resources/log4j.properties | 27 -
.../sql/core/src/test/resources/log4j.properties | 57 -
.../sql/hive/src/test/resources/log4j.properties | 61 -
.../streaming/src/test/resources/log4j.properties | 28 -
.../spark/yarn/src/test/resources/log4j.properties | 31 -
log4j-1.2-api/src/src/test/resources/hello.vm | 6 -
.../src/src/test/resources/log-RouteWithMDC.xml | 47 -
log4j-1.2-api/src/src/test/resources/log4j.xml | 36 -
.../src/src/test/resources/log4j1-file.xml | 57 -
.../src/src/test/resources/log4j1-list.xml | 36 -
.../src/src/test/resources/log4j2-config.xml | 39 -
.../src/src/test/resources/logWithMDC.xml | 40 -
.../test/resources/witness/serialization/info.bin | Bin 60 -> 0 bytes
.../org/apache/log4j/CallerInformationTest.java | 2 +-
.../test/java/org/apache/log4j/LogWithMDCTest.java | 2 +-
.../java/org/apache/log4j/LogWithRouteTest.java | 2 +-
.../test/java/org/apache/log4j/LoggingTest.java | 2 +-
.../AbstractLog4j1ConfigurationConverterTest.java | 21 +-
.../config/PropertiesReconfigurationTest.java | 95 +
.../log4j/config/XmlReconfigurationTest.java | 96 +
.../apache/log4j/layout/Log4j1XmlLayoutTest.java | 2 +-
.../pattern/Log4j1NdcPatternConverterTest.java | 2 +-
.../apache/log4j/util/SerializationTestHelper.java | 2 +
log4j-api-java9/pom.xml | 152 --
log4j-api-java9/src/assembly/java9.xml | 44 -
log4j-api-java9/src/main/java/module-info.java | 28 -
.../main/java/org/apache/logging/log4j/Dummy.java | 24 -
.../logging/log4j/log4j/util/PropertySource.java | 24 -
.../org/apache/logging/log4j/message/Dummy.java | 24 -
.../logging/log4j/message/ThreadDumpMessage.java | 27 -
.../org/apache/logging/log4j/simple/Dummy.java | 24 -
.../org/apache/logging/log4j/spi/Provider.java | 24 -
.../org/apache/logging/log4j/status/Dummy.java | 24 -
.../util/PrivateSecurityManagerStackTraceUtil.java | 34 -
.../apache/logging/log4j/util/StackLocator.java | 86 -
.../util/internal/DefaultObjectInputFilter.java | 100 -
log4j-api-java9/src/test/java/module-info.java | 6 -
.../log4j/util/java9/ProcessIdUtilTest.java | 31 -
.../logging/log4j/util/java9/StackLocatorTest.java | 150 --
log4j-api-test/pom.xml | 124 ++
.../test/junit/AbstractExternalFileCleaner.java | 185 ++
.../log4j/test/junit/AbstractFileCleaner.java | 90 +
.../logging/log4j/test/junit/CleanFiles.java | 70 +
.../logging/log4j/test/junit/CleanFolders.java | 112 +
.../log4j/test/junit/CleanUpDirectories.java | 46 +
.../logging/log4j/test/junit/CleanUpFiles.java | 46 +
.../logging/log4j/test/junit/DirectoryCleaner.java | 70 +
.../logging/log4j/test/junit/FileCleaner.java | 52 +
.../apache/logging/log4j/test/junit/Mutable.java | 35 +
.../log4j/test/junit/SecurityManagerTestRule.java | 94 +
.../logging/log4j/test/junit/SerialUtil.java | 65 +
.../test/junit/URLStreamHandlerFactoryRule.java | 97 +
log4j-api/pom.xml | 179 +-
.../java/org/apache/logging/log4j/LogBuilder.java | 73 +-
.../java/org/apache/logging/log4j/LogManager.java | 11 +-
.../main/java/org/apache/logging/log4j/Logger.java | 2 +-
.../logging/log4j/internal/DefaultLogBuilder.java | 9 +
.../log4j/internal/DefaultObjectInputFilter.java | 100 +
.../logging/log4j/internal/LogManagerStatus.java | 33 +
.../log4j/message/LocalizedMessageFactory.java | 2 +-
.../apache/logging/log4j/message/MapMessage.java | 10 +-
.../logging/log4j/message/ParameterFormatter.java | 158 +-
.../message/ReusableParameterizedMessage.java | 22 +-
.../log4j/message/StructuredDataMessage.java | 2 +-
.../log4j/simple/SimpleLoggerContextFactory.java | 5 +
.../apache/logging/log4j/spi/LoggerContext.java | 24 +
.../logging/log4j/spi/LoggerContextFactory.java | 13 +
.../apache/logging/log4j/spi/ThreadContextMap.java | 2 +-
.../log4j/util/FilteredObjectInputStream.java | 1 +
.../org/apache/logging/log4j/util/LoaderUtil.java | 44 +-
.../apache/logging/log4j/util/ProcessIdUtil.java | 0
.../apache/logging/log4j/util/ReflectionUtil.java | 2 +-
.../logging/log4j/util/SortedArrayStringMap.java | 3 +-
.../apache/logging/log4j/util/StackLocator.java | 223 +-
.../logging/log4j/util/StackLocatorUtil.java | 21 +-
.../org/apache/logging/log4j/util/Strings.java | 34 +-
.../java/org/apache/logging/log4j/util/Timer.java | 2 +-
log4j-api/src/main/java9/module-info.java | 30 +
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../log4j/test/AbstractSerializationTest.java | 50 +
.../logging/log4j/test/SerializableMatchers.java | 58 +
.../org/apache/logging/log4j/test/TestLogger.java | 202 ++
.../logging/log4j/test/TestLoggerContext.java | 69 +
.../log4j/test/TestLoggerContextFactory.java | 51 +
.../logging/log4j/test/ThreadContextHolder.java | 80 +
.../logging/log4j/test/ThreadContextTest.java | 194 ++
.../log4j/test/ThreadContextUtilityClass.java | 115 +
.../test/junit/AbstractExternalFileCleaner.java | 185 ++
.../log4j/test/junit/AbstractFileCleaner.java | 90 +
.../logging/log4j/test/junit/ClassMatchers.java | 37 +
.../logging/log4j/test/junit/CleanFiles.java | 68 +
.../logging/log4j/test/junit/CleanFolders.java | 110 +
.../log4j/test/junit/CleanUpDirectories.java | 46 +
.../logging/log4j/test/junit/CleanUpFiles.java | 46 +
.../logging/log4j/test/junit/DirectoryCleaner.java | 70 +
.../logging/log4j/test/junit/FileCleaner.java | 52 +
.../junit/LogManagerLoggerContextFactoryRule.java | 52 +
.../test/junit/LoggerContextFactoryExtension.java | 54 +
.../apache/logging/log4j/test/junit/Mutable.java | 35 +
.../log4j/test/junit/SecurityManagerTestRule.java | 94 +
.../logging/log4j/test/junit/SerialUtil.java | 65 +
.../log4j/test/junit/StatusLoggerLevel.java | 44 +
.../test/junit/StatusLoggerLevelExtension.java | 50 +
.../logging/log4j/test/junit/StatusLoggerRule.java | 51 +
.../log4j/test/junit/ThreadContextExtension.java | 57 +
.../log4j/test/junit/ThreadContextMapRule.java | 40 +
.../log4j/test/junit/ThreadContextRule.java | 81 +
.../log4j/test/junit/ThreadContextStackRule.java | 39 +
.../test/junit/URLStreamHandlerFactoryRule.java | 97 +
.../log4j/test/junit/UsingAnyThreadContext.java | 45 +
.../log4j/test/junit/UsingThreadContextMap.java | 45 +
.../log4j/test/junit/UsingThreadContextStack.java | 45 +
log4j-api/src/test/java/module-info.java | 18 +
.../apache/logging/log4j/AbstractLoggerTest.java | 19 +-
.../logging/log4j/AbstractSerializationTest.java | 50 -
.../logging/log4j/CloseableThreadContextTest.java | 13 +-
.../org/apache/logging/log4j/EventLoggerTest.java | 3 +
.../org/apache/logging/log4j/LogManagerTest.java | 4 +
.../apache/logging/log4j/LoggerSupplierTest.java | 368 ++--
.../java/org/apache/logging/log4j/LoggerTest.java | 1257 +++++------
.../java/org/apache/logging/log4j/MarkerTest.java | 2 +
.../logging/log4j/NoopThreadContextTest.java | 3 +
.../apache/logging/log4j/SerializableMatchers.java | 58 -
.../java/org/apache/logging/log4j/TestLogger.java | 199 --
.../apache/logging/log4j/TestLoggerContext.java | 68 -
.../logging/log4j/TestLoggerContextFactory.java | 46 -
.../org/apache/logging/log4j/TestProvider.java | 1 +
.../apache/logging/log4j/ThreadContextHolder.java | 79 -
.../log4j/ThreadContextInheritanceTest.java | 21 +-
.../apache/logging/log4j/ThreadContextTest.java | 197 --
.../logging/log4j/ThreadContextUtilityClass.java | 114 -
.../log4j/junit/AbstractExternalFileCleaner.java | 185 --
.../apache/logging/log4j/junit/ClassMatchers.java | 37 -
.../org/apache/logging/log4j/junit/CleanFiles.java | 68 -
.../apache/logging/log4j/junit/CleanFolders.java | 110 -
.../junit/LogManagerLoggerContextFactoryRule.java | 52 -
.../log4j/junit/LoggerContextFactoryExtension.java | 54 -
.../org/apache/logging/log4j/junit/Mutable.java | 35 -
.../log4j/junit/SecurityManagerTestRule.java | 94 -
.../org/apache/logging/log4j/junit/SerialUtil.java | 65 -
.../log4j/junit/StatusLoggerLevelExtension.java | 56 -
.../logging/log4j/junit/StatusLoggerRule.java | 51 -
.../logging/log4j/junit/ThreadContextMapRule.java | 37 -
.../logging/log4j/junit/ThreadContextRule.java | 78 -
.../log4j/junit/ThreadContextStackRule.java | 37 -
.../log4j/junit/URLStreamHandlerFactoryRule.java | 97 -
.../log4j/message/FormattedMessageTest.java | 10 +-
.../log4j/message/LocalizedMessageFactoryTest.java | 8 +
.../log4j/message/LocalizedMessageTest.java | 13 +-
.../logging/log4j/message/MapMessageTest.java | 2 +-
.../MessageFormatMessageSerializationTest.java | 6 +-
.../log4j/message/MessageFormatMessageTest.java | 9 +-
.../log4j/message/MessageFormatsPerfTest.java | 4 +
.../log4j/message/ObjectArrayMessageTest.java | 84 +-
.../logging/log4j/message/ObjectMessageTest.java | 4 +-
.../log4j/message/ParameterFormatterTest.java | 28 +-
.../log4j/message/ParameterizedMessageTest.java | 2 +-
.../message/ReusableParameterizedMessageTest.java | 2 +-
.../log4j/message/StringFormattedMessageTest.java | 10 +-
.../log4j/message/ThreadDumpMessageTest.java | 13 +-
.../logging/log4j/simple/SimpleLoggerTest.java | 5 +-
.../log4j/spi/DefaultThreadContextMapTest.java | 6 +
.../log4j/spi/DefaultThreadContextStackTest.java | 4 +-
.../logging/log4j/spi/LoggerAdapterTest.java | 6 +-
.../status/StatusLoggerSerializationTest.java | 2 +-
.../logging/log4j/util/DeserializerHelper.java | 1 +
...EnvironmentPropertySourceSecurityManagerIT.java | 6 +-
.../apache/logging/log4j/util/LoaderUtilTest.java | 3 +
.../logging/log4j/util/PropertiesUtilTest.java | 7 +
...ropertyFilePropertySourceSecurityManagerIT.java | 14 +-
.../logging/log4j/util/ProviderUtilTest.java | 2 +-
.../log4j/util/SortedArrayStringMapTest.java | 1 +
.../logging/log4j/util/StackLocatorUtilTest.java | 12 +-
.../org/apache/logging/log4j/util/StringsTest.java | 9 +
...mPropertiesPropertySourceSecurityManagerIT.java | 11 +-
.../util/SystemPropertiesPropertySourceTest.java | 3 +
.../org/apache/logging/log4j/util/Unbox1Test.java | 3 +
.../logging/log4j/util/Unbox2ConfigurableTest.java | 4 +
.../resources/Log4j-charsets.properties | 0
log4j-appserver/pom.xml | 10 +-
log4j-bom/pom.xml | 12 +-
log4j-cassandra/pom.xml | 13 +-
.../log4j/cassandra/CassandraAppenderIT.java | 4 +-
log4j-core-its/pom.xml | 20 +-
.../logging/log4j/FilterPerformanceComparison.java | 2 +-
.../logging/log4j/PerformanceComparison.java | 2 +-
.../org/apache/logging/log4j/PerformanceRun.java | 4 +-
.../apache/logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../apache/logging/log4j/core/ThreadedTest.java | 4 +-
.../log4j/core/appender/HttpAppenderTest.java | 2 +-
.../appender/JsonCompleteFileAppenderTest.java | 6 +-
.../SecureSocketAppenderSocketOptionsTest.java | 2 +-
.../appender/SocketAppenderBufferSizeTest.java | 2 +-
.../appender/SocketAppenderSocketOptionsTest.java | 2 +-
.../core/appender/XmlCompactFileAppenderTest.java | 2 +-
.../XmlCompactFileAppenderValidationTest.java | 2 +-
.../XmlCompactFileAsyncAppenderValidationTest.java | 2 +-
.../core/appender/XmlCompleteFileAppenderTest.java | 6 +-
.../log4j/core/appender/XmlFileAppenderTest.java | 2 +-
.../appender/XmlRandomAccessFileAppenderTest.java | 2 +-
log4j-core-java9/pom.xml | 150 --
log4j-core-java9/src/assembly/java9.xml | 51 -
.../org/apache/logging/log4j/core/util/Clock.java | 32 -
.../apache/logging/log4j/core/util/Instant.java | 75 -
.../logging/log4j/core/util/MutableInstant.java | 155 --
.../logging/log4j/core/util/PreciseClock.java | 36 -
.../logging/log4j/core/util/SystemClock.java | 44 -
.../org/apache/logging/log4j/core/util/Dummy.java | 24 -
log4j-core/pom.xml | 80 +-
.../apache/logging/log4j/core/LoggerContext.java | 17 +-
.../log4j/core/appender/AbstractManager.java | 2 +-
.../logging/log4j/core/appender/AsyncAppender.java | 139 +-
.../appender/AsyncAppenderEventDispatcher.java | 174 ++
.../core/appender/MemoryMappedFileManager.java | 12 +-
.../log4j/core/appender/OutputStreamManager.java | 11 +-
.../core/appender/rolling/RollingFileManager.java | 56 +-
.../core/appender/rolling/RolloverListener.java | 37 +
.../rolling/action/AbstractPathAction.java | 2 +-
.../async/BasicAsyncLoggerContextSelector.java | 84 +
.../log4j/core/config/AbstractConfiguration.java | 12 +-
.../logging/log4j/core/config/AppenderControl.java | 8 +-
.../builder/impl/DefaultConfigurationBuilder.java | 66 +-
.../log4j/core/impl/ExtendedStackTraceElement.java | 29 +
.../log4j/core/impl/Log4jContextFactory.java | 5 +
.../logging/log4j/core/layout/GelfLayout.java | 224 +-
.../logging/log4j/core/layout/HtmlLayout.java | 59 +-
.../logging/log4j/core/lookup/Interpolator.java | 4 +-
.../core/pattern/AbstractStyleNameConverter.java | 13 +-
.../log4j/core/pattern/RepeatPatternConverter.java | 103 +
.../log4j/core/selector/BasicContextSelector.java | 13 +-
.../core/selector/ClassLoaderContextSelector.java | 6 +
.../log4j/core/selector/ContextSelector.java | 12 +
.../log4j/core/selector/CoreContextSelectors.java | 8 +-
.../log4j/core/selector/JndiContextSelector.java | 5 +
.../log4j/core/time/internal/SystemClock.java | 23 +-
.../core/util/DefaultShutdownCallbackRegistry.java | 52 +-
.../org/apache/logging/log4j/core/util/Loader.java | 4 +-
.../log4j/core/util/ShutdownCallbackRegistry.java | 4 +
.../logging/log4j/core/util/WatchManager.java | 351 +--
log4j-core/src/main/resources/Log4j-config.xsd | 1469 +++++++++++--
.../logging/log4j/ThreadContextTestAccess.java | 15 +-
.../log4j/core/AppenderRefLevelJsonTest.java | 42 +-
.../logging/log4j/core/AppenderRefLevelTest.java | 49 +-
.../log4j/core/BasicConfigurationFactory.java | 2 +-
.../logging/log4j/core/BasicLoggingTest.java | 7 +-
.../logging/log4j/core/CollectionLoggingTest.java | 45 +-
.../log4j/core/CustomLevelsOverrideTest.java | 35 +-
.../logging/log4j/core/CustomLevelsTest.java | 34 +-
.../log4j/core/CustomLevelsWithFiltersTest.java | 31 +-
.../apache/logging/log4j/core/DeadlockTest.java | 20 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 17 +-
.../logging/log4j/core/ExtendedLevelTest.java | 43 +-
.../log4j/core/GcFreeAsynchronousLoggingTest.java | 8 +-
.../logging/log4j/core/GcFreeLoggingTestUtil.java | 21 +-
.../log4j/core/GcFreeMixedSyncAyncLoggingTest.java | 5 +-
.../log4j/core/GcFreeSynchronousLoggingTest.java | 5 +-
.../apache/logging/log4j/core/HostNameTest.java | 43 +-
.../apache/logging/log4j/core/LateConfigTest.java | 32 +-
.../org/apache/logging/log4j/core/LevelTest.java | 60 +-
.../apache/logging/log4j/core/Log4j1222Test.java | 6 +-
.../logging/log4j/core/LogEventFactoryTest.java | 39 +-
.../apache/logging/log4j/core/LogEventTest.java | 27 +-
.../apache/logging/log4j/core/LoggerDateTest.java | 26 +-
.../log4j/core/LoggerSerializationTest.java | 2 +-
.../org/apache/logging/log4j/core/LoggerTest.java | 126 +-
.../logging/log4j/core/LoggerUpdateTest.java | 54 +-
.../org/apache/logging/log4j/core/LoggingTest.java | 69 -
.../org/apache/logging/log4j/core/LookupTest.java | 31 +-
.../logging/log4j/core/PatternSelectorTest.java | 56 +-
.../log4j/core/PropertiesFileConfigTest.java | 38 +-
...ReusableParameterizedMessageMemoryLeakTest.java | 7 +-
.../logging/log4j/core/ShutdownDisabledTest.java | 22 +-
.../core/ShutdownTimeoutConfigurationTest.java | 20 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 56 +-
.../logging/log4j/core/TimestampMessageTest.java | 35 +-
.../org/apache/logging/log4j/core/XmlEvents.java | 20 +-
.../core/appender/AsyncAppenderNoLocationTest.java | 85 -
.../appender/AsyncAppenderQueueFullPolicyTest.java | 44 +-
.../appender/AsyncAppenderShutdownTimeoutTest.java | 42 -
.../log4j/core/appender/AsyncAppenderTest.java | 167 +-
.../core/appender/ConfigurationTestUtils.java | 74 +-
.../core/appender/ConsoleAppenderBuilderTest.java | 13 +-
.../appender/ConsoleAppenderJAnsiMessageMain.java | 5 +-
.../ConsoleAppenderJAnsiXExceptionMain.java | 2 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 40 +-
.../log4j/core/appender/FailoverAppenderTest.java | 62 +-
.../core/appender/FileAppenderBuilderTest.java | 7 +-
.../core/appender/FileAppenderPermissionsTest.java | 136 +-
.../FileAppenderPermissionsXmlConfigTest.java | 66 -
.../log4j/core/appender/FileAppenderTest.java | 159 +-
.../log4j/core/appender/InMemoryAppenderTest.java | 15 +-
.../MemoryMappedFileAppenderLocationTest.java | 95 -
.../MemoryMappedFileAppenderRemapTest.java | 95 -
.../MemoryMappedFileAppenderSimpleTest.java | 86 -
.../appender/MemoryMappedFileAppenderTest.java | 120 +
.../core/appender/MemoryMappedFileManagerTest.java | 28 +-
.../core/appender/OutputStreamAppenderTest.java | 246 +--
.../core/appender/OutputStreamManagerTest.java | 44 +-
.../appender/RandomAccessFileAppenderTest.java | 4 +-
.../core/appender/RandomAccessFileManagerTest.java | 115 +-
.../core/appender/ReconfigureAppenderTest.java | 8 +-
.../core/appender/ScriptAppenderSelectorTest.java | 87 +-
.../core/appender/SocketAppenderBuilderTest.java | 9 +-
.../log4j/core/appender/TlsSyslogFrameTest.java | 16 +-
.../log4j/core/appender/WriterAppenderTest.java | 25 +-
.../appender/nosql/NoSqlDatabaseManagerTest.java | 2 +-
.../rewrite/LoggerNameLevelRewritePolicyTest.java | 13 +-
.../appender/rewrite/MapRewritePolicyTest.java | 58 +-
.../core/appender/rewrite/RewriteAppenderTest.java | 80 +-
.../appender/rolling/CronTriggeringPolicyTest.java | 11 +-
.../core/appender/rolling/EligibleFilesTest.java | 10 +-
.../log4j/core/appender/rolling/FileSizeTest.java | 11 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 64 +-
.../appender/rolling/PatternProcessorTest.java | 45 +-
.../RandomRollingAppenderOnStartupTest.java | 2 +-
.../appender/rolling/RollingAppenderCountTest.java | 2 +-
.../rolling/RollingAppenderCronAndSizeTest.java | 6 +-
.../RollingAppenderCronEvery2DirectTest.java | 6 +-
.../rolling/RollingAppenderCronEvery2Test.java | 6 +-
.../rolling/RollingAppenderCronOnStartupTest.java | 107 +
.../rolling/RollingAppenderCronOnceADayTest.java | 6 +-
.../appender/rolling/RollingAppenderCronTest.java | 6 +-
.../RollingAppenderCustomDeleteActionTest.java | 2 +-
...RollingAppenderDeleteAccumulatedCount1Test.java | 2 +-
...RollingAppenderDeleteAccumulatedCount2Test.java | 2 +-
.../RollingAppenderDeleteAccumulatedSizeTest.java | 2 +-
.../rolling/RollingAppenderDeleteMaxDepthTest.java | 2 +-
.../rolling/RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 2 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 2 +-
.../RollingAppenderDirectWrite1906Test.java | 6 +-
.../RollingAppenderDirectWriteStartupSizeTest.java | 4 +-
...erDirectWriteTempCompressedFilePatternTest.java | 6 +-
.../rolling/RollingAppenderDirectWriteTest.java | 6 +-
...RollingAppenderDirectWriteWithFilenameTest.java | 2 +-
...llingAppenderDirectWriteWithHtmlLayoutTest.java | 10 +-
...lingAppenderDirectWriteWithReconfigureTest.java | 2 +-
.../RollingAppenderNoUnconditionalDeleteTest.java | 2 +-
.../RollingAppenderOnStartupDirectTest.java | 109 +
.../rolling/RollingAppenderOnStartupTest.java | 68 +-
.../rolling/RollingAppenderReconfigureTest.java | 6 +-
.../rolling/RollingAppenderRestartTest.java | 54 +-
...RollingAppenderSizeCompressPermissionsTest.java | 2 +-
.../rolling/RollingAppenderSizeNoCompressTest.java | 2 +-
.../appender/rolling/RollingAppenderSizeTest.java | 6 +-
.../rolling/RollingAppenderSizeWithTimeTest.java | 2 +-
...llingAppenderTempCompressedFilePatternTest.java | 2 +-
.../RollingAppenderTimeAndSizeDirectTest.java | 6 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 6 +-
.../appender/rolling/RollingAppenderTimeTest.java | 6 +-
.../rolling/RollingAppenderUncompressedTest.java | 2 +-
.../RollingDirectSizeTimeNewDirectoryTest.java | 80 +-
.../rolling/RollingDirectTimeNewDirectoryTest.java | 73 +-
.../RollingFileAppenderReconfigureTest.java | 2 +-
...nderReconfigureUndefinedSystemPropertyTest.java | 2 +-
.../appender/rolling/RollingNewDirectoryTest.java | 2 +-
...ingRandomAccessFileManagerHeaderFooterTest.java | 2 +-
.../RollingRandomAccessFileManagerTest.java | 8 +-
.../RollingRandomAppenderDirectWriteTest.java | 6 +-
...gRandomAppenderDirectWriteWithFilenameTest.java | 2 +-
.../rolling/RolloverWithDeletedOldFileTest.java | 2 +-
.../appender/rolling/RolloverWithPaddingTest.java | 2 +-
.../rolling/action/AbstractActionTest.java | 27 +-
.../rolling/action/Bzip2CompressActionTest.java | 39 +-
.../appender/rolling/action/DeleteActionTest.java | 20 +-
.../rolling/action/DeletingVisitorTest.java | 10 +-
.../rolling/action/DummyFileAttributes.java | 172 +-
.../core/appender/rolling/action/DurationTest.java | 21 +-
.../rolling/action/FileRenameActionTest.java | 107 +-
.../core/appender/rolling/action/FileSizeTest.java | 14 +-
.../rolling/action/IfAccumulatedFileCountTest.java | 6 +-
.../rolling/action/IfAccumulatedFileSizeTest.java | 4 +-
.../core/appender/rolling/action/IfAllTest.java | 106 +-
.../core/appender/rolling/action/IfAnyTest.java | 104 +-
.../appender/rolling/action/IfFileNameTest.java | 262 +--
.../rolling/action/IfLastModifiedTest.java | 4 +-
.../core/appender/rolling/action/IfNotTest.java | 104 +-
.../action/PathSortByModificationTimeTest.java | 40 +-
.../rolling/action/ScriptConditionTest.java | 31 +-
.../rolling/action/SortingVisitorTest.java | 61 +-
.../routing/DefaultRouteScriptAppenderTest.java | 2 +-
.../appender/routing/JsonRoutingAppender2Test.java | 2 +-
.../appender/routing/JsonRoutingAppenderTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutesScriptAppenderTest.java | 4 +-
.../appender/routing/RoutingAppender2767Test.java | 4 +-
.../core/appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithJndiTest.java | 4 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 2 +-
.../async/AsyncAppenderExceptionHandlingTest.java | 98 +
.../async/AsyncLoggerClassLoadDeadlockTest.java | 2 +-
.../core/async/AsyncLoggerConfigAutoFlushTest.java | 2 +-
.../core/async/AsyncLoggerConfigErrorOnFormat.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest2.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest3.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest4.java | 2 +-
...ncLoggerConfigThreadContextCopyOnWriteTest.java | 2 +-
.../AsyncLoggerConfigThreadContextDefaultTest.java | 2 +-
...ncLoggerConfigThreadContextGarbageFreeTest.java | 2 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 2 +-
...AsyncLoggerContextSelectorInitialStateTest.java | 2 +-
.../core/async/AsyncLoggerContextSelectorTest.java | 7 +-
.../log4j/core/async/AsyncLoggerContextTest.java | 2 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 7 +-
.../log4j/core/async/AsyncLoggerLocationTest.java | 2 +-
.../logging/log4j/core/async/AsyncLoggerTest.java | 4 +-
.../async/AsyncLoggerTestArgumentFreedOnError.java | 2 +-
.../async/AsyncLoggerTestCachedThreadName.java | 2 +-
.../log4j/core/async/AsyncLoggerTestNanoTime.java | 2 +-
.../async/AsyncLoggerTestUncachedThreadName.java | 2 +-
.../AsyncLoggerThreadContextCopyOnWriteTest.java | 2 +-
.../async/AsyncLoggerThreadContextDefaultTest.java | 2 +-
.../AsyncLoggerThreadContextGarbageFreeTest.java | 2 +-
.../core/async/AsyncLoggerThreadContextTest.java | 2 +-
.../async/AsyncLoggerThreadNameStrategyTest.java | 2 +-
.../async/AsyncLoggerTimestampMessageTest.java | 2 +-
.../async/AsyncLoggerUseAfterShutdownTest.java | 2 +-
.../async/AsyncLoggersWithAsyncAppenderTest.java | 4 +-
.../AsyncLoggersWithAsyncLoggerConfigTest.java | 4 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 2 +-
.../log4j/core/async/AsyncRootReloadTest.java | 6 +-
.../async/BasicAsyncLoggerContextSelectorTest.java | 107 +
.../async/DefaultAsyncQueueFullPolicyTest.java | 2 +-
.../async/DiscardingAsyncQueueFullPolicyTest.java | 2 +-
.../log4j/core/async/Log4j2Jira1688AsyncTest.java | 4 +-
.../log4j/core/async/Log4j2Jira1688Test.java | 4 +-
.../core/async/QueueFullAsyncAppenderTest.java | 4 +-
.../core/async/QueueFullAsyncAppenderTest2.java | 4 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 4 +-
...lAsyncLoggerConfigLoggingFromToStringTest2.java | 4 +-
.../core/async/QueueFullAsyncLoggerConfigTest.java | 4 +-
.../async/QueueFullAsyncLoggerConfigTest2.java | 4 +-
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 4 +-
...eueFullAsyncLoggerLoggingFromToStringTest2.java | 4 +-
.../log4j/core/async/QueueFullAsyncLoggerTest.java | 4 +-
.../core/async/QueueFullAsyncLoggerTest2.java | 4 +-
.../core/async/QueueFullAsyncLoggerTest3.java | 4 +-
.../log4j/core/async/RingBufferLogEventTest.java | 3 +-
.../logging/log4j/core/categories/Appenders.java | 33 +
.../log4j/core/categories/AsyncLoggers.java | 23 +
.../log4j/core/categories/Configurations.java | 25 +
.../logging/log4j/core/categories/Layouts.java | 28 +
.../log4j/core/categories/PerformanceTests.java | 24 +
.../logging/log4j/core/categories/Scripts.java | 24 +
.../log4j/core/categories/package-info.java | 22 +
.../log4j/core/config/AbstractLog4j2_1100Test.java | 68 -
.../logging/log4j/core/config/AdvertiserTest.java | 29 +-
.../core/config/AppenderControlArraySetTest.java | 10 +-
.../config/CompositeConfigurationMissingTest.java | 15 +-
.../core/config/CompositeConfigurationTest.java | 2 +-
.../core/config/ConfigurationFactoryTest.java | 134 ++
.../log4j/core/config/ConfigurationSourceTest.java | 10 +-
.../log4j/core/config/ConfigurationTest.java | 157 --
.../log4j/core/config/ConfiguratorTest.java | 18 +-
.../log4j/core/config/CustomConfigurationTest.java | 54 +-
.../logging/log4j/core/config/FileOutputTest.java | 37 +-
.../log4j/core/config/JiraLog4j2_1100JsonTest.java | 31 -
.../log4j/core/config/JiraLog4j2_1100XmlTest.java | 27 -
.../core/config/JiraLog4j2_1100YamlBadTest.java | 33 -
.../core/config/JiraLog4j2_1100YamlGoodTest.java | 31 -
.../log4j/core/config/JiraLog4j2_2134Test.java | 23 +-
.../log4j/core/config/LoggerConfigTest.java | 57 +-
.../log4j/core/config/LoggersPluginTest.java | 12 +-
.../log4j/core/config/MissingRootLoggerTest.java | 30 +-
.../log4j/core/config/MockReliabilityStrategy.java | 105 +
.../core/config/MultipleTriggeringPolicyTest.java | 84 +
.../logging/log4j/core/config/PropertyTest.java | 39 +-
.../core/config/ReconfigurationDeadlockTest.java | 210 +-
.../log4j/core/config/ReliabilityStrategyTest.java | 51 +
.../log4j/core/config/TestConfigurator.java | 169 +-
.../log4j/core/config/TestConfiguratorError.java | 24 +-
.../logging/log4j/core/config/XIncludeTest.java | 139 --
.../config/builder/ConfigurationAssemblerTest.java | 28 +-
.../config/builder/ConfigurationBuilderTest.java | 16 +-
.../core/config/plugins/LegacyPluginTest.java | 31 +-
.../plugins/util/PluginManagerPackagesTest.java | 27 +-
.../validators/RequiredValidatorTest.java | 12 +-
.../validators/ValidHostValidatorTest.java | 24 +-
.../validators/ValidPortValidatorTest.java | 12 +-
.../ValidatingPluginWithFailoverTest.java | 12 +-
.../ValidatingPluginWithGenericBuilderTest.java | 16 +-
...ngPluginWithGenericSubclassFoo1BuilderTest.java | 16 +-
.../ValidatingPluginWithTypedBuilderTest.java | 16 +-
.../PropertiesConfigurationRootLoggerOnlyTest.java | 60 -
.../properties/PropertiesConfigurationTest.java | 85 +-
...rtiesConfigurationTrailingSpaceOnLevelTest.java | 67 -
.../properties/RollingFilePropertiesTest.java | 60 -
.../core/config/xml/XmlConfigurationPropsTest.java | 22 +-
.../core/config/xml/XmlConfigurationSecurity.java | 41 +
.../core/config/xml/XmlConigurationSecurity.java | 36 -
.../log4j/core/config/xml/XmlLoggerPropsTest.java | 72 +-
.../log4j/core/config/xml/XmlSchemaTest.java | 137 ++
.../log4j/core/filter/AbstractFilterTest.java | 4 +-
.../log4j/core/filter/AbstractFilterableTest.java | 14 +-
.../core/filter/AbstractScriptFilterTest.java | 38 +-
.../log4j/core/filter/BurstFilterLogDelayTest.java | 8 +-
.../logging/log4j/core/filter/BurstFilterTest.java | 56 +-
.../core/filter/DynamicThresholdFilterTest.java | 66 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 7 +-
.../logging/log4j/core/filter/MapFilterTest.java | 49 +-
.../log4j/core/filter/MarkerFilterTest.java | 7 +-
.../log4j/core/filter/NoMarkerFilterTest.java | 5 +-
.../logging/log4j/core/filter/RegexFilterTest.java | 19 +-
.../filter/ScriptFileFilterPropertiesTest.java | 21 +-
.../log4j/core/filter/ScriptFileFilterTest.java | 21 +-
.../log4j/core/filter/ScriptFilterTest.java | 21 +-
.../log4j/core/filter/ScriptRefFilterTest.java | 21 +-
.../core/filter/StructuredDataFilterTest.java | 41 +-
.../core/filter/ThreadContextMapFilterTest.java | 11 +-
.../log4j/core/filter/ThresholdFilterTest.java | 7 +-
.../logging/log4j/core/filter/TimeFilterTest.java | 81 +-
.../logging/log4j/core/hamcrest/Descriptors.java | 44 +
.../logging/log4j/core/hamcrest/FileMatchers.java | 163 ++
.../logging/log4j/core/hamcrest/MapMatchers.java | 62 +
...taFactoryPropertySetMissingConstructorTest.java | 4 +-
.../impl/ContextDataFactoryPropertySetTest.java | 4 +-
.../log4j/core/impl/ContextDataFactoryTest.java | 4 +-
.../core/impl/JdkMapAdapterStringMapTest.java | 204 +-
.../log4j/core/impl/Log4jLogEventNanoTimeTest.java | 24 +-
.../logging/log4j/core/impl/Log4jLogEventTest.java | 92 +-
.../log4j/core/impl/MutableLogEventTest.java | 189 +-
.../NestedLoggingFromThrowableMessageTest.java | 2 +-
.../core/impl/NestedLoggingFromToStringTest.java | 2 +-
.../core/impl/ReusableLogEventFactoryTest.java | 42 +-
.../core/impl/ThreadContextDataInjectorTest.java | 2 +-
.../core/impl/ThrowableFormatOptionsTest.java | 90 +-
.../log4j/core/impl/ThrowableProxyTest.java | 55 +-
.../apache/logging/log4j/core/jmx/ServerTest.java | 4 +-
.../logging/log4j/core/junit/AppenderResolver.java | 54 +
.../log4j/core/junit/ConfigurationResolver.java | 39 +
.../apache/logging/log4j/core/junit/JndiRule.java | 59 +
.../log4j/core/junit/LoggerContextResolver.java | 157 ++
.../log4j/core/junit/LoggerContextRule.java | 319 +++
.../log4j/core/junit/LoggerContextSource.java | 79 +
.../org/apache/logging/log4j/core/junit/Named.java | 41 +
.../log4j/core/junit/ReconfigurationPolicy.java | 35 +
.../logging/log4j/core/junit/package-info.java | 22 +
.../core/layout/AbstractStringLayoutTest.java | 30 +-
.../ConcurrentLoggingWithGelfLayoutTest.java | 104 +-
.../logging/log4j/core/layout/GelfLayout2Test.java | 51 +
.../logging/log4j/core/layout/GelfLayout3Test.java | 100 +
.../core/layout/GelfLayoutPatternSelectorTest.java | 82 +
.../logging/log4j/core/layout/GelfLayoutTest.java | 50 +-
.../logging/log4j/core/layout/GelfLayoutTest2.java | 50 -
.../logging/log4j/core/layout/GelfLayoutTest3.java | 67 -
.../logging/log4j/core/layout/HtmlLayoutTest.java | 170 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 4 +-
.../log4j/core/layout/Log4j2_2195_Test.java | 43 +-
.../log4j/core/layout/LogEventFixtures.java | 7 +-
.../core/layout/PatternLayoutLookupDateTest.java | 20 +-
.../layout/PatternLayoutMainMapLookupTest.java | 39 +-
.../core/layout/PatternLayoutNoLookupDateTest.java | 21 +-
.../log4j/core/layout/PatternLayoutRepeatTest.java | 40 +
.../log4j/core/layout/PatternLayoutTest.java | 71 +-
.../log4j/core/layout/PatternSelectorTest.java | 16 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 96 +-
.../core/layout/StringBuilderEncoderTest.java | 118 +-
.../log4j/core/layout/SyslogLayoutTest.java | 30 +-
.../logging/log4j/core/lookup/CaseLookupTest.java | 12 +-
.../log4j/core/lookup/ContextMapLookupTest.java | 40 +-
.../logging/log4j/core/lookup/DateLookupTest.java | 11 +-
.../log4j/core/lookup/EnvironmentLookupTest.java | 8 +-
.../logging/log4j/core/lookup/EventLookupTest.java | 7 +-
.../log4j/core/lookup/InterpolatorTest.java | 2 +-
.../logging/log4j/core/lookup/JndiLookupTest.java | 2 +-
.../logging/log4j/core/lookup/Log4jLookupTest.java | 28 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 29 +-
.../lookup/MainInputArgumentsJmxLookupTest.java | 14 +-
.../logging/log4j/core/lookup/MainLookupTest.java | 30 +-
.../logging/log4j/core/lookup/MapLookupTest.java | 26 +-
.../log4j/core/lookup/MarkerLookupConfigTest.java | 45 +-
.../log4j/core/lookup/MarkerLookupTest.java | 7 +-
.../core/lookup/ResourceBundleLookupTest.java | 17 +-
.../log4j/core/lookup/StrSubstitutorTest.java | 15 +-
.../core/lookup/StructuredDataLookupTest.java | 7 +-
.../core/lookup/SystemPropertiesLookupTest.java | 15 +-
.../message/ExtendedThreadInformationTest.java | 6 +-
.../MutableLogEventWithReusableParamMsgTest.java | 75 +
.../logging/log4j/core/net/PriorityTest.java | 9 +-
.../log4j/core/net/SocketMessageLossTest.java | 24 +-
.../log4j/core/net/SocketReconnectTest.java | 28 +-
.../apache/logging/log4j/core/net/SocketTest.java | 37 +-
.../net/ssl/EnvironmentPasswordProviderTest.java | 8 +-
.../core/net/ssl/FilePasswordProviderTest.java | 13 +-
.../core/net/ssl/KeyStoreConfigurationTest.java | 60 +-
.../core/net/ssl/MemoryPasswordProviderTest.java | 6 +-
.../log4j/core/net/ssl/SslConfigurationTest.java | 50 +-
.../log4j/core/net/ssl/StoreConfigurationTest.java | 16 +-
.../core/net/ssl/TrustStoreConfigurationTest.java | 54 +-
.../core/parser/AbstractLogEventParserTest.java | 8 +-
.../log4j/core/pattern/CallerInformationTest.java | 29 +-
.../core/pattern/DatePatternConverterTest.java | 4 +-
.../log4j/core/pattern/DisableAnsiTest.java | 28 +-
.../core/pattern/EncodingPatternConverterTest.java | 17 +-
.../pattern/EndOfBatchPatternConverterTest.java | 4 +-
.../EqualsIgnoreCaseReplacementConverterTest.java | 10 +-
.../pattern/EqualsReplacementConverterTest.java | 9 +-
.../ExtendedThrowablePatternConverterTest.java | 28 +-
.../log4j/core/pattern/ExtendedThrowableTest.java | 30 +-
.../log4j/core/pattern/FormattingInfoTest.java | 4 +-
.../log4j/core/pattern/HighlightConverterTest.java | 38 +-
.../core/pattern/LevelPatternConverterTest.java | 7 +-
.../core/pattern/LiteralPatternConverterTest.java | 86 +-
.../pattern/LoggerFqcnPatternConverterTest.java | 4 +-
.../core/pattern/MapPatternConverterTest.java | 19 +-
.../core/pattern/MarkerPatternConverterTest.java | 4 +-
.../MarkerSimpleNamePatternConverterTest.java | 6 +-
.../log4j/core/pattern/MaxLengthConverterTest.java | 16 +-
.../core/pattern/MdcPatternConverterTest.java | 30 +-
.../core/pattern/MessageJansiConverterTest.java | 32 +-
.../core/pattern/MessagePatternConverterTest.java | 52 +-
.../core/pattern/MessageStyledConverterTest.java | 32 +-
.../core/pattern/NanoTimePatternConverterTest.java | 7 +-
.../core/pattern/NdcPatternConverterTest.java | 13 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 34 +-
.../log4j/core/pattern/PatternParserTest.java | 47 +-
.../log4j/core/pattern/PatternParserTest2.java | 7 +-
.../pattern/ProcessIdPatternConverterTest.java | 9 +-
.../pattern/RegexReplacementConverterTest.java | 8 +-
.../log4j/core/pattern/RegexReplacementTest.java | 69 +-
.../core/pattern/RepeatPatternConverterTest.java | 51 +
.../pattern/RootThrowablePatternConverterTest.java | 28 +-
.../log4j/core/pattern/RootThrowableTest.java | 36 +-
.../SequenceNumberPatternConverterTest.java | 28 +-
...quenceNumberPatternConverterZeroPaddedTest.java | 36 +-
.../log4j/core/pattern/StyleConverterTest.java | 41 +-
.../core/pattern/ThreadIdPatternConverterTest.java | 7 +-
.../pattern/ThreadNamePatternConverterTest.java | 7 +-
.../ThreadPriorityPatternConverterTest.java | 7 +-
.../pattern/ThrowablePatternConverterTest.java | 32 +-
.../logging/log4j/core/pattern/ThrowableTest.java | 32 +-
.../VariablesNotEmptyReplacementConverterTest.java | 10 +-
.../core/selector/BasicContextSelectorTest.java | 55 +
.../selector/ClassLoaderContextSelectorTest.java | 8 +-
.../logging/log4j/core/time/ClockFactoryTest.java | 14 +-
.../log4j/core/time/MutableInstantTest.java | 85 +-
.../log4j/core/time/SystemNanoClockTest.java | 6 +-
.../core/time/internal/DummyNanoClockTest.java | 5 +-
.../log4j/core/time/internal/SystemClockTest.java | 9 +-
.../log4j/core/tools/GenerateCustomLoggerTest.java | 85 +-
.../core/tools/GenerateExtendedLoggerTest.java | 84 +-
.../log4j/core/util/ContextDataProviderTest.java | 25 +-
.../log4j/core/util/CronExpressionTest.java | 30 +-
.../logging/log4j/core/util/CyclicBufferTest.java | 22 +-
.../logging/log4j/core/util/FileUtilsTest.java | 18 +-
.../apache/logging/log4j/core/util/InitTest.java | 12 +-
.../logging/log4j/core/util/IntegersTest.java | 4 +-
.../logging/log4j/core/util/JsonUtilsTest.java | 4 +-
.../apache/logging/log4j/core/util/LoaderTest.java | 13 +-
.../logging/log4j/core/util/NetUtilsTest.java | 123 +-
.../logging/log4j/core/util/ProcessIdUtilTest.java | 9 +-
.../core/util/ShutdownCallbackRegistryTest.java | 29 +-
.../logging/log4j/core/util/ThrowablesTest.java | 30 +-
.../apache/logging/log4j/core/util/UuidTest.java | 20 +-
.../logging/log4j/core/util/WatchHttpTest.java | 2 +-
.../logging/log4j/core/util/WatchManagerTest.java | 28 +-
.../logging/log4j/junit/AppenderResolver.java | 54 +
.../logging/log4j/junit/ConfigurationResolver.java | 39 +
.../logging/log4j/junit/LoggerContextResolver.java | 157 ++
.../logging/log4j/junit/LoggerContextRule.java | 5 +
.../logging/log4j/junit/LoggerContextSource.java | 79 +
.../java/org/apache/logging/log4j/junit/Named.java | 41 +
.../logging/log4j/junit/ReconfigurationPolicy.java | 35 +
.../MutableLogEventWithReusableParamMsgTest.java | 2 +-
.../log4j/test/SomethingThatUsesLogging.java | 36 -
.../log4j/test/appender/DeadlockAppender.java | 84 -
.../log4j/test/appender/FailOnceAppender.java | 102 +-
.../logging/log4j/test/appender/ListAppender.java | 5 +-
.../log4j/test/appender/UsesLoggingAppender.java | 67 -
.../logging/log4j/test/layout/BasicLayout.java | 57 -
.../AsyncAppenderExceptionHandlingTest.xml | 32 +
.../{GelfLayoutTest2.xml => GelfLayout2Test.xml} | 0
log4j-core/src/test/resources/GelfLayout3Test.xml | 37 +
.../resources/GelfLayoutPatternSelectorTest.xml | 37 +
log4j-core/src/test/resources/GelfLayoutTest3.xml | 35 -
.../MemoryMappedFileAppenderLocationTest.xml | 4 +-
.../MemoryMappedFileAppenderRemapTest.xml | 4 +-
.../resources/MemoryMappedFileAppenderTest.xml | 4 +-
.../src/test/resources/PatternLayoutRepeat.xml | 29 +
.../src/test/resources/ReliabilityStrategyTest.xml | 32 +
.../src/test/resources/__files/onStartup.log | 19 +-
log4j-core/src/test/resources/log4j-filetest.xml | 6 +-
.../src/test/resources/log4j-rollOnStartup.xml | 38 +
.../test/resources/log4j-rollOnStartupDirect.xml | 37 +
.../resources/log4j-rolling-cron-onStartup.xml | 47 +
log4j-core/src/test/resources/log4j-test4.xml | 36 -
.../test/resources/reconfiguration-deadlock.xml | 25 +-
log4j-couchdb/pom.xml | 8 +-
log4j-csv/pom.xml | 13 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 4 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 6 +-
.../csv/layout/CsvParameterLayoutAllAsyncTest.java | 4 +-
.../log4j/csv/layout/CsvParameterLayoutTest.java | 8 +-
log4j-docker/pom.xml | 27 +-
log4j-flume-ng/pom.xml | 16 +-
log4j-iostreams/pom.xml | 8 +-
.../logging/log4j/io/AbstractStreamTest.java | 2 +-
.../log4j/io/IoBuilderCallerInfoTesting.java | 2 +-
.../org/apache/logging/log4j/io/IoBuilderTest.java | 2 +-
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 2 +-
log4j-jcl/pom.xml | 11 +-
.../org/apache/logging/log4j/jcl/LogAdapter.java | 5 +-
.../logging/log4j/jcl/CallerInformationTest.java | 2 +-
.../org/apache/logging/log4j/jcl/LoggerTest.java | 2 +-
log4j-jdbc-dbcp2/pom.xml | 16 +-
.../appender/PoolableConnectionFactoryTest.java | 2 +-
log4j-jdbc/pom.xml | 16 +-
.../AbstractJdbcAppenderDataSourceTest.java | 4 +-
.../AbstractJdbcAppenderFactoryMethodTest.java | 2 +-
.../appender/DataSourceConnectionSourceTest.java | 5 +-
.../FactoryMethodConnectionSourceTest.java | 3 +-
.../JdbcAppenderColumnMappingLiteralTest.java | 2 +-
.../JdbcAppenderColumnMappingPatternTest.java | 2 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 4 +-
.../JdbcAppenderStringSubstitutionTest.java | 2 +-
.../logging/log4j/jdbc/appender/JdbcRule.java | 2 +-
log4j-jeromq/pom.xml | 13 +-
.../log4j/jeromq/appender/JeroMqManager.java | 13 +-
.../log4j/jeromq/appender/JeroMqAppenderTest.java | 6 +-
log4j-jms/pom.xml | 13 +-
.../log4j/jms/appender/JmsAppenderTest.java | 6 +-
log4j-jmx-gui/pom.xml | 73 +-
log4j-jpa/pom.xml | 13 +-
.../jpa/appender/AbstractJpaAppenderTest.java | 3 +-
.../log4j/jpa/appender/JpaH2AppenderTest.java | 2 +-
.../log4j/jpa/appender/JpaHsqldbAppenderTest.java | 3 +-
.../ContextDataAttributeConverterTest.java | 3 +-
.../ContextDataJsonAttributeConverterTest.java | 3 +-
.../ContextMapAttributeConverterTest.java | 3 +-
.../ContextMapJsonAttributeConverterTest.java | 3 +-
.../ContextStackAttributeConverterTest.java | 3 +-
.../ContextStackJsonAttributeConverterTest.java | 5 +-
.../converter/InstantAttributeConverterTest.java | 2 +-
.../converter/MarkerAttributeConverterTest.java | 3 +-
.../converter/MessageAttributeConverterTest.java | 3 +-
.../StackTraceElementAttributeConverterTest.java | 3 +-
.../converter/ThrowableAttributeConverterTest.java | 3 +-
log4j-jpl/pom.xml | 32 +-
.../log4j/jpl/Log4jSystemLoggerAdapter.java | 5 +-
log4j-jul/pom.xml | 16 +-
.../logging/log4j/jul/AbstractLoggerAdapter.java | 5 +-
.../logging/log4j/jul/AbstractLoggerTest.java | 84 +-
.../logging/log4j/jul/AsyncLoggerThreadsTest.java | 7 +-
.../logging/log4j/jul/CallerInformationTest.java | 2 +-
log4j-kafka/pom.xml | 13 +-
.../logging/log4j/kafka/appender/KafkaManager.java | 4 +-
.../appender/KafkaAppenderCloseTimeoutTest.java | 6 +-
.../log4j/kafka/appender/KafkaAppenderTest.java | 6 +-
.../KafkaManagerProducerThreadLeakTest.java | 65 +
.../kafka/builder/ConfigurationBuilderTest.java | 2 +-
log4j-kubernetes/pom.xml | 34 +-
log4j-layout-jackson-json/pom.xml | 13 +-
.../jackson/json/JacksonIssue429MyNamesTest.java | 2 +-
.../log4j/jackson/json/JacksonIssue429Test.java | 2 +-
.../log4j/jackson/json/LevelMixInJsonTest.java | 2 +-
.../log4j/jackson/json/MarkerMixInJsonTest.java | 2 +-
.../json/StackTraceElementJsonMixInTest.java | 2 +-
.../ConcurrentLoggingWithJsonLayoutTest.java | 2 +-
.../jackson/json/layout/JsonLayoutMillisTest.java | 4 +-
.../log4j/jackson/json/layout/JsonLayoutTest.java | 2 +-
log4j-layout-jackson-xml/pom.xml | 13 +-
.../xml/ExtendedStackTraceElementXmlMixIn.java | 18 +-
.../jackson/xml/StackTraceElementXmlMixIn.java | 17 +-
.../log4j/jackson/xml/LevelMixInXmlTest.java | 2 +-
.../log4j/jackson/xml/MarkerMixInXmlTest.java | 2 +-
.../jackson/xml/StackTraceElementXmlMixInTest.java | 2 +-
.../layout/ConcurrentLoggingWithXmlLayoutTest.java | 2 +-
.../log4j/jackson/xml/layout/XmlLayoutTest.java | 4 +-
log4j-layout-jackson-yaml/pom.xml | 13 +-
.../log4j/jackson/yaml/LevelMixInYamlTest.java | 2 +-
.../log4j/jackson/yaml/MarkerMixInYamlTest.java | 2 +-
.../yaml/StackTraceElementYamlMixInTest.java | 2 +-
.../ConcurrentLoggingWithYamlLayoutTest.java | 2 +-
.../log4j/jackson/yaml/layout/YamlLayoutTest.java | 2 +-
log4j-layout-jackson/pom.xml | 8 +-
.../jackson/ExtendedStackTraceElementMixIn.java | 19 +
.../Log4jStackTraceElementDeserializer.java | 68 +-
.../log4j/jackson/StackTraceElementConstants.java | 3 +
.../log4j/jackson/StackTraceElementMixIn.java | 12 +
.../logging/log4j/jackson/LevelMixInTest.java | 2 +-
log4j-layout-json-template/pom.xml | 555 -----
.../layout/json/template/JsonTemplateLayout.java | 696 ------
.../json/template/JsonTemplateLayoutDefaults.java | 213 --
.../json/template/resolver/EndOfBatchResolver.java | 44 -
.../resolver/EndOfBatchResolverFactory.java | 41 -
.../json/template/resolver/EventResolver.java | 21 -
.../template/resolver/EventResolverContext.java | 228 --
.../template/resolver/EventResolverFactories.java | 65 -
.../template/resolver/EventResolverFactory.java | 21 -
.../resolver/ExceptionInternalResolverFactory.java | 68 -
.../json/template/resolver/ExceptionResolver.java | 122 --
.../resolver/ExceptionResolverFactory.java | 43 -
.../resolver/ExceptionRootCauseResolver.java | 127 --
.../ExceptionRootCauseResolverFactory.java | 41 -
.../json/template/resolver/LevelResolver.java | 176 --
.../template/resolver/LevelResolverFactory.java | 41 -
.../json/template/resolver/LoggerResolver.java | 92 -
.../template/resolver/LoggerResolverFactory.java | 41 -
.../json/template/resolver/MainMapResolver.java | 90 -
.../template/resolver/MainMapResolverFactory.java | 41 -
.../layout/json/template/resolver/MapResolver.java | 91 -
.../json/template/resolver/MapResolverFactory.java | 41 -
.../json/template/resolver/MarkerResolver.java | 86 -
.../template/resolver/MarkerResolverFactory.java | 41 -
.../json/template/resolver/MessageResolver.java | 260 ---
.../template/resolver/MessageResolverFactory.java | 41 -
.../json/template/resolver/PatternResolver.java | 87 -
.../template/resolver/PatternResolverFactory.java | 41 -
.../json/template/resolver/SourceResolver.java | 148 --
.../template/resolver/SourceResolverFactory.java | 41 -
.../resolver/StackTraceElementObjectResolver.java | 92 -
.../StackTraceElementObjectResolverContext.java | 93 -
.../StackTraceElementObjectResolverFactories.java | 39 -
.../StackTraceElementObjectResolverFactory.java | 43 -
.../resolver/StackTraceObjectResolver.java | 54 -
.../json/template/resolver/StackTraceResolver.java | 19 -
.../resolver/StackTraceStringResolver.java | 51 -
.../json/template/resolver/TemplateResolver.java | 42 -
.../template/resolver/TemplateResolverConfig.java | 29 -
.../template/resolver/TemplateResolverContext.java | 34 -
.../template/resolver/TemplateResolverFactory.java | 25 -
.../json/template/resolver/TemplateResolvers.java | 414 ----
.../resolver/ThreadContextDataResolver.java | 357 ---
.../resolver/ThreadContextDataResolverFactory.java | 43 -
.../resolver/ThreadContextStackResolver.java | 107 -
.../ThreadContextStackResolverFactory.java | 43 -
.../json/template/resolver/ThreadResolver.java | 90 -
.../template/resolver/ThreadResolverFactory.java | 41 -
.../json/template/resolver/TimestampResolver.java | 505 -----
.../resolver/TimestampResolverFactory.java | 41 -
.../layout/json/template/util/DummyRecycler.java | 37 -
.../json/template/util/DummyRecyclerFactory.java | 39 -
.../layout/json/template/util/JsonReader.java | 447 ----
.../layout/json/template/util/JsonWriter.java | 889 --------
.../layout/json/template/util/MapAccessor.java | 139 --
.../json/template/util/QueueingRecycler.java | 61 -
.../template/util/QueueingRecyclerFactory.java | 40 -
.../log4j/layout/json/template/util/Recycler.java | 25 -
.../json/template/util/RecyclerFactories.java | 205 --
.../layout/json/template/util/RecyclerFactory.java | 31 -
.../json/template/util/StringParameterParser.java | 292 ---
.../json/template/util/ThreadLocalRecycler.java | 45 -
.../template/util/ThreadLocalRecyclerFactory.java | 40 -
.../util/TruncatingBufferedPrintWriter.java | 60 -
.../template/util/TruncatingBufferedWriter.java | 208 --
.../log4j/layout/json/template/util/Uris.java | 138 --
.../src/main/resources/EcsLayout.json | 46 -
.../src/main/resources/GelfLayout.json | 41 -
.../main/resources/LogstashJsonEventLayoutV1.json | 58 -
.../template/BlackHoleByteBufferDestination.java | 50 -
.../log4j/layout/json/template/EcsLayoutTest.java | 90 -
.../log4j/layout/json/template/GelfLayoutTest.java | 109 -
.../log4j/layout/json/template/JacksonFixture.java | 29 -
.../log4j/layout/json/template/JsonLayoutTest.java | 71 -
.../JsonTemplateLayoutConcurrentEncodeTest.java | 192 --
.../template/JsonTemplateLayoutGcFreeTest.java | 40 -
.../JsonTemplateLayoutNullEventDelimiterTest.java | 127 --
.../json/template/JsonTemplateLayoutTest.java | 1889 ----------------
.../json/template/LayoutComparisonHelpers.java | 19 -
.../layout/json/template/LogEventFixture.java | 151 --
.../log4j/layout/json/template/LogstashIT.java | 503 -----
.../layout/json/template/util/JsonReaderTest.java | 380 ----
.../layout/json/template/util/JsonWriterTest.java | 729 ------
.../json/template/util/RecyclerFactoriesTest.java | 120 -
.../template/util/StringParameterParserTest.java | 393 ----
.../util/TruncatingBufferedWriterTest.java | 228 --
.../log4j/layout/json/template/util/UrisTest.java | 65 -
.../resources/gcFreeJsonTemplateLayoutLogging.xml | 39 -
...nullEventDelimitedJsonTemplateLayoutLogging.xml | 39 -
.../src/test/resources/testJsonTemplateLayout.json | 68 -
log4j-layout-template-json/pom.xml | 483 ++++
log4j-layout-template-json/revapi.json | 440 ++++
.../layout/template/json/JsonTemplateLayout.java | 639 ++++++
.../template/json/JsonTemplateLayoutDefaults.java | 146 ++
.../template/json/resolver/EndOfBatchResolver.java | 44 +
.../json/resolver/EndOfBatchResolverFactory.java | 41 +
.../template/json/resolver/EventResolver.java | 21 +
.../json/resolver/EventResolverContext.java | 258 +++
.../json/resolver/EventResolverFactories.java | 68 +
.../json/resolver/EventResolverFactory.java | 21 +
.../template/json/resolver/ExceptionResolver.java | 327 +++
.../json/resolver/ExceptionResolverFactory.java | 43 +
.../json/resolver/ExceptionRootCauseResolver.java | 49 +
.../ExceptionRootCauseResolverFactory.java | 41 +
.../template/json/resolver/LevelResolver.java | 176 ++
.../json/resolver/LevelResolverFactory.java | 41 +
.../template/json/resolver/LoggerResolver.java | 92 +
.../json/resolver/LoggerResolverFactory.java | 41 +
.../template/json/resolver/MainMapResolver.java | 90 +
.../json/resolver/MainMapResolverFactory.java | 41 +
.../layout/template/json/resolver/MapResolver.java | 51 +
.../template/json/resolver/MapResolverFactory.java | 41 +
.../template/json/resolver/MarkerResolver.java | 86 +
.../json/resolver/MarkerResolverFactory.java | 41 +
.../json/resolver/MessageParameterResolver.java | 215 ++
.../resolver/MessageParameterResolverFactory.java | 41 +
.../template/json/resolver/MessageResolver.java | 223 ++
.../json/resolver/MessageResolverFactory.java | 41 +
.../template/json/resolver/PatternResolver.java | 88 +
.../json/resolver/PatternResolverFactory.java | 41 +
.../json/resolver/ReadOnlyStringMapResolver.java | 386 ++++
.../template/json/resolver/SourceResolver.java | 149 ++
.../json/resolver/SourceResolverFactory.java | 41 +
.../resolver/StackTraceElementObjectResolver.java | 92 +
.../StackTraceElementObjectResolverContext.java | 93 +
.../StackTraceElementObjectResolverFactories.java | 41 +
.../StackTraceElementObjectResolverFactory.java | 43 +
.../json/resolver/StackTraceObjectResolver.java | 54 +
.../template/json/resolver/StackTraceResolver.java | 19 +
.../json/resolver/StackTraceStringResolver.java | 127 ++
.../template/json/resolver/TemplateResolver.java | 69 +
.../json/resolver/TemplateResolverConfig.java | 29 +
.../json/resolver/TemplateResolverContext.java | 34 +
.../json/resolver/TemplateResolverFactory.java | 25 +
.../template/json/resolver/TemplateResolvers.java | 427 ++++
.../json/resolver/ThreadContextDataResolver.java | 38 +
.../resolver/ThreadContextDataResolverFactory.java | 43 +
.../json/resolver/ThreadContextStackResolver.java | 107 +
.../ThreadContextStackResolverFactory.java | 43 +
.../template/json/resolver/ThreadResolver.java | 90 +
.../json/resolver/ThreadResolverFactory.java | 41 +
.../template/json/resolver/TimestampResolver.java | 508 +++++
.../json/resolver/TimestampResolverFactory.java | 41 +
.../layout/template/json/util/DummyRecycler.java | 37 +
.../template/json/util/DummyRecyclerFactory.java | 39 +
.../layout/template/json/util/JsonReader.java | 447 ++++
.../layout/template/json/util/JsonWriter.java | 900 ++++++++
.../layout/template/json/util/MapAccessor.java | 192 ++
.../template/json/util/QueueingRecycler.java | 61 +
.../json/util/QueueingRecyclerFactory.java | 40 +
.../log4j/layout/template/json/util/Recycler.java | 25 +
.../template/json/util/RecyclerFactories.java | 207 ++
.../layout/template/json/util/RecyclerFactory.java | 31 +
.../template/json/util/StringParameterParser.java | 320 +++
.../template/json/util/ThreadLocalRecycler.java | 45 +
.../json/util/ThreadLocalRecyclerFactory.java | 40 +
.../json/util/TruncatingBufferedPrintWriter.java | 92 +
.../json/util/TruncatingBufferedWriter.java | 267 +++
.../log4j/layout/template/json/util/Uris.java | 140 ++
.../src/main/resources/EcsLayout.json | 48 +
.../src/main/resources/GelfLayout.json | 43 +
.../src/main/resources/JsonLayout.json | 0
.../main/resources/LogstashJsonEventLayoutV1.json | 60 +
.../main/resources/StackTraceElementLayout.json | 0
.../src/site/manual/index.md | 0
.../src/site/site.xml | 0
.../json/BlackHoleByteBufferDestination.java | 50 +
.../log4j/layout/template/json/EcsLayoutTest.java | 101 +
.../log4j/layout/template/json/GelfLayoutTest.java | 120 +
.../log4j/layout/template/json/JacksonFixture.java | 31 +
.../log4j/layout/template/json/JsonLayoutTest.java | 87 +
.../JsonTemplateLayoutAdditionalFieldJsonTest.java | 36 +
...emplateLayoutAdditionalFieldPropertiesTest.java | 36 +
...onTemplateLayoutAdditionalFieldTestHelpers.java | 69 +
.../JsonTemplateLayoutAdditionalFieldXmlTest.java | 36 +
.../JsonTemplateLayoutAdditionalFieldYamlTest.java | 36 +
.../JsonTemplateLayoutConcurrentEncodeTest.java | 205 ++
.../json/JsonTemplateLayoutGcFreeTest.java | 43 +
.../JsonTemplateLayoutNullEventDelimiterTest.java | 150 ++
.../template/json/JsonTemplateLayoutTest.java | 2317 ++++++++++++++++++++
.../template/json/LayoutComparisonHelpers.java | 37 +
.../layout/template/json/LogEventFixture.java | 153 ++
.../log4j/layout/template/json/LogstashIT.java | 516 +++++
.../layout/template/json/util/JsonReaderTest.java | 380 ++++
.../layout/template/json/util/JsonWriterTest.java | 900 ++++++++
.../template/json/util/RecyclerFactoriesTest.java | 139 ++
.../json/util/StringParameterParserTest.java | 410 ++++
.../json/util/TruncatingBufferedWriterTest.java | 244 +++
.../log4j/layout/template/json/util/UrisTest.java | 63 +
...onalFieldEnrichedJsonTemplateLayoutLogging.json | 42 +
...eldEnrichedJsonTemplateLayoutLogging.properties | 37 +
...ionalFieldEnrichedJsonTemplateLayoutLogging.xml | 34 +
...onalFieldEnrichedJsonTemplateLayoutLogging.yaml | 39 +
.../resources/gcFreeJsonTemplateLayoutLogging.xml | 38 +
...nullEventDelimitedJsonTemplateLayoutLogging.xml | 38 +
...rFactoryCustomizedJsonTemplateLayoutLogging.xml | 30 +
.../src/test/resources/testJsonTemplateLayout.json | 70 +
log4j-liquibase/pom.xml | 13 +-
log4j-liquibase/src/site/markdown/index.md | 2 +-
log4j-mongodb3/pom.xml | 16 +-
.../log4j/mongodb3/MongoDb3AuthFailureTest.java | 4 +-
.../logging/log4j/mongodb3/MongoDb3CappedTest.java | 4 +-
.../log4j/mongodb3/MongoDb3MapMessageTest.java | 4 +-
.../logging/log4j/mongodb3/MongoDb3Test.java | 4 +-
log4j-mongodb4/pom.xml | 16 +-
.../log4j/mongodb4/MongoDb4AuthFailureTest.java | 4 +-
.../logging/log4j/mongodb4/MongoDb4CappedTest.java | 4 +-
.../log4j/mongodb4/MongoDb4MapMessageTest.java | 4 +-
.../logging/log4j/mongodb4/MongoDb4Test.java | 4 +-
log4j-osgi/pom.xml | 23 +-
log4j-perf/pom.xml | 14 +-
.../json/template/JsonTemplateLayoutBenchmark.java | 185 --
.../JsonTemplateLayoutBenchmarkReport.java | 359 ---
.../template/JsonTemplateLayoutBenchmarkState.java | 212 --
.../template/json/JsonTemplateLayoutBenchmark.java | 185 ++
.../json/JsonTemplateLayoutBenchmarkReport.java | 359 +++
.../json/JsonTemplateLayoutBenchmarkState.java | 205 ++
.../jmh/ParameterizedMessageInliningBenchmark.java | 3 +-
log4j-plugins-java9/pom.xml | 157 --
log4j-plugins-java9/src/assembly/java9.xml | 41 -
log4j-plugins-java9/src/main/java/module-info.java | 34 -
.../org/apache/logging/log4j/plugins/Dummy.java | 24 -
.../apache/logging/log4j/plugins/bind/Dummy.java | 24 -
.../logging/log4j/plugins/convert/Dummy.java | 24 -
.../plugins/convert/plugins/Log4jPlugins.java | 25 -
.../apache/logging/log4j/plugins/inject/Dummy.java | 24 -
.../apache/logging/log4j/plugins/name/Dummy.java | 24 -
.../log4j/plugins/processor/PluginService.java | 24 -
.../apache/logging/log4j/plugins/util/Dummy.java | 24 -
.../logging/log4j/plugins/validation/Dummy.java | 24 -
.../plugins/validation/constraints/Dummy.java | 24 -
.../log4j/plugins/validation/validators/Dummy.java | 24 -
log4j-plugins/pom.xml | 204 +-
.../log4j/plugins/internal/util/BeanUtils.java | 37 +
.../plugins/name/AnnotatedElementNameProvider.java | 6 +-
.../log4j/plugins/processor/PluginProcessor.java | 4 -
log4j-plugins/src/main/java9/module-info.java | 37 +
.../log4j/plugins/test/processor/FakePlugin.java | 33 +
.../AbstractPluginWithGenericBuilder.java | 59 +
.../log4j/plugins/test/validation/HostAndPort.java | 53 +
.../PluginWithGenericSubclassFoo1Builder.java | 66 +
.../plugins/test/validation/ValidatingPlugin.java | 69 +
.../ValidatingPluginWithGenericBuilder.java | 68 +
.../ValidatingPluginWithTypedBuilder.java | 69 +
.../log4j/plugins/processor/FakePlugin.java | 33 -
.../plugins/processor/PluginProcessorTest.java | 7 +-
.../util/ResolverUtilCustomProtocolTest.java | 4 +-
.../log4j/plugins/util/ResolverUtilTest.java | 5 +-
.../AbstractPluginWithGenericBuilder.java | 59 -
.../log4j/plugins/validation/HostAndPort.java | 53 -
.../PluginWithGenericSubclassFoo1Builder.java | 66 -
.../log4j/plugins/validation/ValidatingPlugin.java | 69 -
.../ValidatingPluginWithGenericBuilder.java | 68 -
.../ValidatingPluginWithTypedBuilder.java | 69 -
log4j-plugins/src/test/java9/module-info.java | 16 +
log4j-redis/pom.xml | 13 +-
log4j-samples/log4j-samples-configuration/pom.xml | 1 +
log4j-samples/log4j-samples-flume-common/pom.xml | 1 +
log4j-samples/log4j-samples-flume-embedded/pom.xml | 1 +
log4j-samples/log4j-samples-flume-remote/pom.xml | 1 +
.../log4j-samples-loggerProperties/pom.xml | 1 +
log4j-samples/pom.xml | 3 +-
log4j-slf4j-impl/pom.xml | 16 +-
.../apache/logging/slf4j/Log4jLoggerFactory.java | 8 +-
.../org/apache/logging/slf4j/Log4jMDCAdapter.java | 4 +-
.../logging/slf4j/CallerInformationTest.java | 2 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 2 +-
.../org/apache/logging/slf4j/OptionalTest.java | 2 +-
.../org/apache/logging/slf4j/SerializeTest.java | 4 +-
log4j-slf4j18-impl/pom.xml | 16 +-
.../apache/logging/slf4j/Log4jLoggerFactory.java | 8 +-
.../org/apache/logging/slf4j/Log4jMDCAdapter.java | 4 +-
.../logging/slf4j/CallerInformationTest.java | 2 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 2 +-
.../org/apache/logging/slf4j/SerializeTest.java | 4 +-
log4j-smtp/pom.xml | 13 +-
.../log4j/smtp/appender/SmtpAppenderAsyncTest.java | 2 +-
.../log4j/smtp/appender/SmtpAppenderTest.java | 2 +-
log4j-spring-boot/pom.xml | 64 +-
.../boot/Log4j2CloudConfigLoggingSystem.java | 2 +-
.../log4j/spring/boot/SpringEnvironmentHolder.java | 4 +-
.../boot/Log4j2CloudConfigLoggingSystemTest.java | 41 +
.../log4j-spring-cloud-config-client/pom.xml | 18 +-
.../cloud/config/client/Log4j2EventListener.java | 21 +-
.../src/main/resources/META-INF/spring.factories | 18 +-
.../config/client/Log4j2EventListenerTest.java | 114 +
.../cloud/config/client/SpringConfiguration.java | 26 +
.../src/test/resources/log4j2-console.xml | 0
.../README.md | 6 +-
.../pom.xml | 49 +-
.../cloud/config/sample/config/WebMvcConfig.java | 4 +-
.../src/main/resources/EnhancedGelf.json | 5 +-
.../pom.xml | 37 +-
.../src/main/config-repo/log4j2.xml | 42 +-
.../log4j-spring-cloud-config-samples/pom.xml | 10 +-
log4j-spring-cloud-config/pom.xml | 9 +-
log4j-taglib/pom.xml | 16 +-
.../logging/log4j/taglib/CatchingTagTest.java | 2 +-
.../apache/logging/log4j/taglib/EnterTagTest.java | 2 +-
.../apache/logging/log4j/taglib/ExitTagTest.java | 2 +-
.../logging/log4j/taglib/IfEnabledTagTest.java | 2 +-
.../log4j/taglib/LoggingMessageTagSupportTest.java | 2 +-
log4j-to-slf4j/pom.xml | 8 +-
.../org/apache/logging/slf4j/MDCContextMap.java | 6 +-
.../logging/slf4j/SLF4JLoggerContextFactory.java | 6 +
.../java/org/apache/logging/slf4j/LoggerTest.java | 41 +-
log4j-web/pom.xml | 19 +-
.../web/Log4jServletContainerInitializer.java | 5 +-
.../log4j/web/Log4jServletContextListener.java | 27 +-
.../Log4jShutdownOnContextDestroyedListener.java | 80 +
.../apache/logging/log4j/web/Log4jWebSupport.java | 7 +
.../web/Log4jServletContainerInitializerTest.java | 60 +-
.../log4j/web/Log4jServletContextListenerTest.java | 58 +-
.../logging/log4j/web/Log4jServletFilterTest.java | 23 +-
...og4jShutdownOnContextDestroyedListenerTest.java | 83 +
.../log4j/web/Log4jWebInitializerImplTest.java | 166 +-
.../org/apache/logging/log4j/web/PropertyTest.java | 10 +-
.../logging/log4j/web/ServletAppenderTest.java | 12 +-
.../apache/logging/log4j/web/WebLookupTest.java | 42 +-
pom.xml | 139 +-
src/changes/changes.xml | 304 ++-
src/site/asciidoc/articles.adoc | 4 +
src/site/asciidoc/download.adoc | 31 +-
src/site/asciidoc/manual/async.adoc | 10 +-
src/site/asciidoc/manual/configuration.adoc | 18 +-
src/site/asciidoc/manual/customconfig.adoc | 6 +-
src/site/asciidoc/manual/garbagefree.adoc | 2 +
src/site/asciidoc/manual/json-template-layout.adoc | 1209 ----------
.../asciidoc/manual/json-template-layout.vm.adoc | 1384 ++++++++++++
src/site/asciidoc/manual/layouts.adoc | 85 +-
src/site/asciidoc/manual/lookups.adoc | 2 +-
src/site/asciidoc/manual/webapp.adoc | 13 +-
src/site/markdown/manual/cloud.md | 83 +-
toolchains-sample-linux.xml | 18 +-
toolchains-sample-mac.xml | 20 +-
toolchains-sample-win.xml | 20 +-
1306 files changed, 37005 insertions(+), 45074 deletions(-)
create mode 100644 .github/workflows/main.yml
delete mode 100644 .github/workflows/maven.yml
delete mode 100644 .travis-toolchains.xml
delete mode 100644 .travis.yml
create mode 100644 SECURITY.md
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Appender.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/AppenderSkeleton.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/BasicConfigurator.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Category.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/ConsoleAppender.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Layout.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Level.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/LogManager.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Logger.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/MDC.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/NDC.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/PatternLayout.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/Priority.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/PropertyConfigurator.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/RenderedMessage.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/SimpleLayout.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/WriterAppender.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/AppenderWrapper.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/ErrorHandlerAdapter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/FilterAdapter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/FilterWrapper.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/LayoutWrapper.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/BooleanHolder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/BuilderManager.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/Holder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/NullAppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/filter/FilterBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/filter/LevelRangeFilterBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/filter/StringMatchFilterBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/LayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/TTCCLayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/InputStreamWrapper.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/Log4j1Configuration.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/PropertySetter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/PropertySetterException.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/config/package-info.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/helpers/OptionConverter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/helpers/QuietWriter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/helpers/package-info.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/legacy/core/ContextUtil.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/or/ObjectRenderer.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/or/RendererSupport.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/package-info.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/Configurator.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/ErrorCode.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/ErrorHandler.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/Filter.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/LocationInfo.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/LoggerFactory.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/LoggerRepository.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/LoggingEvent.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/OptionHandler.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/RepositorySelector.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/ThrowableInformation.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/spi/package-info.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java
delete mode 100644 log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/package-info.java
delete mode 100644 log4j-1.2-api/src/src/main/resources/org/apache/log4j/xml/log4j.dtd
delete mode 100644 log4j-1.2-api/src/src/site/markdown/index.md
delete mode 100644 log4j-1.2-api/src/src/site/site.xml
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/BasicConfigurationFactory.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/CallerInformationTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/CategoryTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/LevelTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/ListAppender.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/LogWithMDCTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/LogWithRouteTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/LoggerTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/LoggingTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/MDCTestCase.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/NDCTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/PriorityTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/VelocityTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/AutoConfigTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterSparkTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
delete mode 100644 log4j-1.2-api/src/src/test/java/org/apache/log4j/util/SerializationTestHelper.java
delete mode 100644 log4j-1.2-api/src/src/test/resources/L7D_en_US.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/L7D_fr.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/L7D_fr_CH.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-auth-examples/src/main/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-minikdc/src/main/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs-client/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-aws/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-azure/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-openstack/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-NullAppender.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-EnhancedPatternLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-HtmlLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-PatternLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-SimpleLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-TTCCLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-file-SimpleLayout.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-system-properties-1.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/log4j-system-properties-2.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/R/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/common/network-common/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/common/network-shuffle/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/core/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/flume-sink/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/flume/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/java8-tests/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/kafka-0-10/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/kafka-0-8/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/kinesis-asl/src/main/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/external/kinesis-asl/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/graphx/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/launcher/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/mllib/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/repl/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/sql/catalyst/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/sql/core/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/sql/hive/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/streaming/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/config-1.2/spark/yarn/src/test/resources/log4j.properties
delete mode 100644 log4j-1.2-api/src/src/test/resources/hello.vm
delete mode 100644 log4j-1.2-api/src/src/test/resources/log-RouteWithMDC.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/log4j.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/log4j1-file.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/log4j1-list.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/log4j2-config.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/logWithMDC.xml
delete mode 100644 log4j-1.2-api/src/src/test/resources/witness/serialization/info.bin
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesReconfigurationTest.java
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlReconfigurationTest.java
delete mode 100644 log4j-api-java9/pom.xml
delete mode 100644 log4j-api-java9/src/assembly/java9.xml
delete mode 100644 log4j-api-java9/src/main/java/module-info.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/Dummy.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/log4j/util/PropertySource.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/message/Dummy.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/simple/Dummy.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/spi/Provider.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/status/Dummy.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/util/PrivateSecurityManagerStackTraceUtil.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java
delete mode 100644 log4j-api-java9/src/main/java/org/apache/logging/log4j/util/internal/DefaultObjectInputFilter.java
delete mode 100644 log4j-api-java9/src/test/java/module-info.java
delete mode 100644 log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/ProcessIdUtilTest.java
delete mode 100644 log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
create mode 100644 log4j-api-test/pom.xml
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractExternalFileCleaner.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanFiles.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanFolders.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanUpDirectories.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/CleanUpFiles.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Mutable.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java
create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/URLStreamHandlerFactoryRule.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/internal/LogManagerStatus.java
rename {log4j-api-java9 => log4j-api}/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java (100%)
create mode 100644 log4j-api/src/main/java9/module-info.java
copy {log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application => log4j-api}/src/main/resources/META-INF/MANIFEST.MF (100%)
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/AbstractSerializationTest.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/SerializableMatchers.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/TestLogger.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/TestLoggerContext.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/TestLoggerContextFactory.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/ThreadContextHolder.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/ThreadContextTest.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/ThreadContextUtilityClass.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/AbstractExternalFileCleaner.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/ClassMatchers.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/CleanFiles.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/CleanFolders.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/CleanUpDirectories.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/CleanUpFiles.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/DirectoryCleaner.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/FileCleaner.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/LogManagerLoggerContextFactoryRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/LoggerContextFactoryExtension.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/Mutable.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/SerialUtil.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/StatusLoggerLevel.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/StatusLoggerLevelExtension.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/StatusLoggerRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/ThreadContextExtension.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/ThreadContextMapRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/ThreadContextRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/ThreadContextStackRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/URLStreamHandlerFactoryRule.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/UsingAnyThreadContext.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/UsingThreadContextMap.java
create mode 100644 log4j-api/src/test/java-test/org/apache/logging/log4j/test/junit/UsingThreadContextStack.java
create mode 100644 log4j-api/src/test/java/module-info.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/AbstractSerializationTest.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/SerializableMatchers.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextUtilityClass.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/ClassMatchers.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/LogManagerLoggerContextFactoryRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/LoggerContextFactoryExtension.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/Mutable.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/StatusLoggerLevelExtension.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/StatusLoggerRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java
delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
copy log4j-api/src/{main => test}/resources/Log4j-charsets.properties (100%)
delete mode 100644 log4j-core-java9/pom.xml
delete mode 100644 log4j-core-java9/src/assembly/java9.xml
delete mode 100644 log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/Clock.java
delete mode 100644 log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/Instant.java
delete mode 100644 log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/MutableInstant.java
delete mode 100644 log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/PreciseClock.java
delete mode 100644 log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/SystemClock.java
delete mode 100644 log4j-core-java9/src/test/java/org/apache/logging/log4j/core/util/Dummy.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverListener.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RepeatPatternConverter.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/LoggingTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderShutdownTimeoutTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnStartupTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncAppenderExceptionHandlingTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelectorTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/Appenders.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/AsyncLoggers.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/Configurations.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/Layouts.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/PerformanceTests.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/Scripts.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/categories/package-info.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationFactoryTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/MockReliabilityStrategy.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/MultipleTriggeringPolicyTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/ReliabilityStrategyTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTrailingSpaceOnLevelTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationSecurity.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlSchemaTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/hamcrest/Descriptors.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/hamcrest/FileMatchers.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/hamcrest/MapMatchers.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/AppenderResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/ConfigurationResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/JndiRule.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/LoggerContextResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/LoggerContextRule.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/LoggerContextSource.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/Named.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/ReconfigurationPolicy.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/junit/package-info.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayout2Test.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayout3Test.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutPatternSelectorTest.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest2.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest3.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutRepeatTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/message/MutableLogEventWithReusableParamMsgTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RepeatPatternConverterTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/selector/BasicContextSelectorTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/AppenderResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/ConfigurationResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextResolver.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextSource.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/Named.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/ReconfigurationPolicy.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/SomethingThatUsesLogging.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
create mode 100644 log4j-core/src/test/resources/AsyncAppenderExceptionHandlingTest.xml
rename log4j-core/src/test/resources/{GelfLayoutTest2.xml => GelfLayout2Test.xml} (100%)
create mode 100644 log4j-core/src/test/resources/GelfLayout3Test.xml
create mode 100644 log4j-core/src/test/resources/GelfLayoutPatternSelectorTest.xml
delete mode 100644 log4j-core/src/test/resources/GelfLayoutTest3.xml
create mode 100644 log4j-core/src/test/resources/PatternLayoutRepeat.xml
create mode 100644 log4j-core/src/test/resources/ReliabilityStrategyTest.xml
create mode 100644 log4j-core/src/test/resources/log4j-rollOnStartup.xml
create mode 100644 log4j-core/src/test/resources/log4j-rollOnStartupDirect.xml
create mode 100644 log4j-core/src/test/resources/log4j-rolling-cron-onStartup.xml
delete mode 100644 log4j-core/src/test/resources/log4j-test4.xml
create mode 100644 log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/appender/KafkaManagerProducerThreadLeakTest.java
delete mode 100644 log4j-layout-json-template/pom.xml
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayout.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutDefaults.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverContext.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactories.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionInternalResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverContext.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactories.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceObjectResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceStringResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverConfig.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverContext.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolver.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolverFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecycler.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecyclerFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonReader.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonWriter.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/MapAccessor.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecycler.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecyclerFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Recycler.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactories.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParser.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecycler.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecyclerFactory.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedPrintWriter.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriter.java
delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Uris.java
delete mode 100644 log4j-layout-json-template/src/main/resources/EcsLayout.json
delete mode 100644 log4j-layout-json-template/src/main/resources/GelfLayout.json
delete mode 100644 log4j-layout-json-template/src/main/resources/LogstashJsonEventLayoutV1.json
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/BlackHoleByteBufferDestination.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/GelfLayoutTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JacksonFixture.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonLayoutTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutConcurrentEncodeTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutGcFreeTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutNullEventDelimiterTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LayoutComparisonHelpers.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogEventFixture.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonReaderTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonWriterTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactoriesTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParserTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriterTest.java
delete mode 100644 log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/UrisTest.java
delete mode 100644 log4j-layout-json-template/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml
delete mode 100644 log4j-layout-json-template/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml
delete mode 100644 log4j-layout-json-template/src/test/resources/testJsonTemplateLayout.json
create mode 100644 log4j-layout-template-json/pom.xml
create mode 100644 log4j-layout-template-json/revapi.json
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverContext.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageParameterResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageParameterResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ReadOnlyStringMapResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverContext.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceObjectResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverConfig.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolver.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolverFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecycler.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecyclerFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonReader.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecycler.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecyclerFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Recycler.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecycler.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecyclerFactory.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedPrintWriter.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriter.java
create mode 100644 log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java
create mode 100644 log4j-layout-template-json/src/main/resources/EcsLayout.json
create mode 100644 log4j-layout-template-json/src/main/resources/GelfLayout.json
rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/JsonLayout.json (100%)
create mode 100644 log4j-layout-template-json/src/main/resources/LogstashJsonEventLayoutV1.json
rename {log4j-layout-json-template => log4j-layout-template-json}/src/main/resources/StackTraceElementLayout.json (100%)
rename {log4j-layout-json-template => log4j-layout-template-json}/src/site/manual/index.md (100%)
rename {log4j-layout-json-template => log4j-layout-template-json}/src/site/site.xml (100%)
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/EcsLayoutTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/GelfLayoutTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonLayoutTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldJsonTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldPropertiesTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTestHelpers.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldXmlTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldYamlTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutGcFreeTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonReaderTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonWriterTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactoriesTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriterTest.java
create mode 100644 log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/UrisTest.java
create mode 100644 log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.json
create mode 100644 log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.properties
create mode 100644 log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.xml
create mode 100644 log4j-layout-template-json/src/test/resources/additionalFieldEnrichedJsonTemplateLayoutLogging.yaml
create mode 100644 log4j-layout-template-json/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml
create mode 100644 log4j-layout-template-json/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml
create mode 100644 log4j-layout-template-json/src/test/resources/recyclerFactoryCustomizedJsonTemplateLayoutLogging.xml
create mode 100644 log4j-layout-template-json/src/test/resources/testJsonTemplateLayout.json
delete mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmark.java
delete mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkReport.java
delete mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkState.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java
delete mode 100644 log4j-plugins-java9/pom.xml
delete mode 100644 log4j-plugins-java9/src/assembly/java9.xml
delete mode 100644 log4j-plugins-java9/src/main/java/module-info.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/bind/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/convert/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/convert/plugins/Log4jPlugins.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/inject/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/name/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/processor/PluginService.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/util/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/validation/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/validation/constraints/Dummy.java
delete mode 100644 log4j-plugins-java9/src/main/java/org/apache/logging/log4j/plugins/validation/validators/Dummy.java
create mode 100644 log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/BeanUtils.java
create mode 100644 log4j-plugins/src/main/java9/module-info.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/processor/FakePlugin.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/AbstractPluginWithGenericBuilder.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/HostAndPort.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/PluginWithGenericSubclassFoo1Builder.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/ValidatingPlugin.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/ValidatingPluginWithGenericBuilder.java
create mode 100644 log4j-plugins/src/test/java-test/org/apache/logging/log4j/plugins/test/validation/ValidatingPluginWithTypedBuilder.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/processor/FakePlugin.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/AbstractPluginWithGenericBuilder.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/HostAndPort.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/PluginWithGenericSubclassFoo1Builder.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/ValidatingPlugin.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/ValidatingPluginWithGenericBuilder.java
delete mode 100644 log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/validation/ValidatingPluginWithTypedBuilder.java
create mode 100644 log4j-plugins/src/test/java9/module-info.java
create mode 100644 log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2CloudConfigLoggingSystemTest.java
create mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListenerTest.java
create mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/SpringConfiguration.java
copy {log4j-core => log4j-spring-cloud-config/log4j-spring-cloud-config-client}/src/test/resources/log4j2-console.xml (100%)
create mode 100644 log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
create mode 100644 log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
delete mode 100644 src/site/asciidoc/manual/json-template-layout.adoc
create mode 100644 src/site/asciidoc/manual/json-template-layout.vm.adoc