You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/04/21 06:18:55 UTC
[19/19] logging-log4j2 git commit: Merge changes from master
Merge changes from master
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aea91cc1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aea91cc1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aea91cc1
Branch: refs/heads/java9NoMultiRelease
Commit: aea91cc1896860134b9450b70e220a496c59c0b7
Parents: 8475d17 c6209a8
Author: Ralph Goers <rg...@nextiva.com>
Authored: Thu Apr 20 23:02:07 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Thu Apr 20 23:02:07 2017 -0700
----------------------------------------------------------------------
.../log4j/message/ParameterizedMessage.java | 3 +
.../message/ReusableParameterizedMessage.java | 8 ++-
.../apache/logging/log4j/util/Constants.java | 15 +++++
.../apache/logging/log4j/util/LoaderUtil.java | 2 +-
.../logging/log4j/util/StringBuilders.java | 14 ++++
.../logging/log4j/util/StringBuildersTest.java | 37 ++++++++++
.../log4j/core/async/RingBufferLogEvent.java | 22 +++---
.../log4j/core/config/ConfigurationFactory.java | 3 +
.../config/json/JsonConfigurationFactory.java | 5 +-
.../config/yaml/YamlConfigurationFactory.java | 2 +-
.../log4j/core/filter/StructuredDataFilter.java | 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 4 --
.../log4j/core/impl/MutableLogEvent.java | 13 ++--
.../log4j/core/layout/AbstractStringLayout.java | 12 ++--
.../log4j/core/pattern/MdcPatternConverter.java | 6 +-
pom.xml | 2 +-
src/changes/changes.xml | 20 +++++-
src/site/xdoc/manual/appenders.xml | 2 +-
src/site/xdoc/manual/layouts.xml.vm | 71 ++++++++++++--------
src/site/xdoc/runtime-dependencies.xml | 4 ++
20 files changed, 168 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aea91cc1/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aea91cc1/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 06b99c7,3b13862..542437a
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@@ -32,7 -32,7 +32,8 @@@ import org.apache.logging.log4j.message
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.message.ReusableMessage;
import org.apache.logging.log4j.message.SimpleMessage;
+import org.apache.logging.log4j.util.StackLocatorUtil;
+ import org.apache.logging.log4j.util.StringBuilders;
import org.apache.logging.log4j.util.StringMap;
import org.apache.logging.log4j.util.Strings;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aea91cc1/pom.xml
----------------------------------------------------------------------