Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3d3069a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3d3069a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3d3069a Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: d3d3069a178e8ef6484d257b7be397fa40429685 Parents: 25148ca 2c0b7db Author: rpopma <[email protected]> Authored: Tue Aug 30 23:44:10 2016 +0900 Committer: rpopma <[email protected]> Committed: Tue Aug 30 23:44:10 2016 +0900 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 4 - .../apache/log4j/layout/Log4j1XmlLayout.java | 4 +- .../pattern/Log4j1NdcPatternConverter.java | 4 +- .../org/apache/logging/log4j/util/Strings.java | 63 +++++++++ log4j-core/pom.xml | 10 ++ .../core/appender/routing/IdlePurgePolicy.java | 57 +++++--- .../core/appender/routing/RoutingAppender.java | 35 ++--- .../builder/api/ConfigurationBuilder.java | 16 +++ .../impl/DefaultConfigurationBuilder.java | 129 +++++++++++++++++++ .../log4j/core/layout/AbstractCsvLayout.java | 10 +- .../apache/logging/log4j/core/DeadlockTest.java | 2 +- .../logging/log4j/core/LoggerUpdateTest.java | 2 +- .../CsvJsonParameterLayoutFileAppenderTest.java | 117 +++++++++++++++++ .../appender/JsonCompleteFileAppenderTest.java | 2 +- .../appender/RandomAccessFileAppenderTests.java | 2 +- .../db/jdbc/AbstractJdbcAppenderTest.java | 12 +- .../db/jpa/AbstractJpaAppenderTest.java | 12 +- .../core/appender/db/jpa/JpaH2AppenderTest.java | 28 ++-- .../db/jpa/JpaHyperSqlAppenderTest.java | 28 ++-- .../RollingAppenderCronOnceADayTest.java | 4 +- .../rolling/RollingAppenderCronTest.java | 2 +- .../routing/PropertiesRoutingAppenderTest.java | 2 +- .../appender/routing/RoutingAppenderTest.java | 2 +- .../routing/RoutingAppenderWithPurgingTest.java | 21 ++- .../routing/RoutingDefaultAppenderTest.java | 2 +- .../log4j/core/config/ConfigurationTest.java | 2 +- .../core/config/CustomConfigurationTest.java | 2 +- .../core/config/MissingRootLoggerTest.java | 2 +- .../logging/log4j/core/config/XIncludeTest.java | 2 +- .../builder/ConfigurationBuilderTest.java | 91 +++++++++++++ .../core/util/ShutdownCallbackRegistryTest.java | 2 +- .../logging/log4j/junit/LoggerContextRule.java | 22 ++-- .../test/resources/log4j-cvs-json-parameter.xml | 32 +++++ log4j-samples/scala-api/.gitignore | 3 + pom.xml | 12 ++ src/changes/changes.xml | 19 ++- 36 files changed, 629 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
