Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2e5b2591 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2e5b2591 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2e5b2591 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 2e5b2591913af0d43cb9f781f35466ac2da9f202 Parents: de52134 2490cbe Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Wed Aug 3 13:33:32 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Wed Aug 3 13:33:32 2016 +0200 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 1 + .../logging/log4j/message/ObjectMessage.java | 10 ++ .../log4j/message/ReusableObjectMessage.java | 10 ++ .../org/apache/logging/log4j/util/Unbox.java | 1 + .../apache/logging/log4j/TraceLoggingTest.java | 1 - .../logging/log4j/junit/BundleTestInfo.java | 137 +++++++++--------- .../apache/logging/log4j/junit/OsgiRule.java | 141 ++++++++++--------- log4j-core/.gitignore | 11 +- log4j-core/pom.xml | 10 ++ .../rolling/action/FileRenameAction.java | 1 - .../core/pattern/DatePatternConverter.java | 2 +- .../log4j/core/pattern/HighlightConverter.java | 38 +++-- .../log4j/core/pattern/JAnsiTextRenderer.java | 2 - .../log4j/core/pattern/NameAbbreviator.java | 2 + .../log4j/core/pattern/StyleConverter.java | 24 ++-- .../apache/logging/log4j/core/util/Loader.java | 1 - .../core/util/datetime/FastDateParser.java | 54 +++---- .../core/util/datetime/FixedDateFormat.java | 77 ++++++++-- .../core/layout/CsvParameterLayoutTest.java | 1 - .../osgi/equinox/EquinoxLoadCoreBundleTest.java | 6 +- .../osgi/felix/FelixLoadCoreBundleTest.java | 4 + .../core/pattern/DatePatternConverterTest.java | 22 +++ .../core/pattern/HighlightConverterTest.java | 78 ++++++++++ .../core/util/datetime/FixedDateFormatTest.java | 35 +++-- log4j-core/src/test/resources/gcFreeLogging.xml | 11 +- .../resources/gcFreeMixedSyncAsyncLogging.xml | 10 +- log4j-core/src/test/resources/log4j-style.xml | 4 +- log4j-flume-ng/pom.xml | 1 + log4j-jmx-gui/pom.xml | 1 + log4j-jul/pom.xml | 1 + log4j-nosql/pom.xml | 1 + .../org/apache/logging/slf4j/Log4j1222Test.java | 1 - log4j-web/pom.xml | 1 + pom.xml | 6 + src/changes/announcement.vm | 15 +- src/changes/changes.xml | 26 +++- src/site/xdoc/manual/garbagefree.xml | 10 +- src/site/xdoc/manual/lookups.xml | 18 +-- 38 files changed, 530 insertions(+), 245 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e5b2591/pom.xml ----------------------------------------------------------------------
