Avoid depending on commons-lang
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5f361e01 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5f361e01 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5f361e01 Branch: refs/heads/LOG4J2-1553 Commit: 5f361e01213b97d5cd0014ca5ab926bb5a270f32 Parents: 871a097 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Aug 21 17:02:02 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Aug 21 17:02:02 2016 +0200 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 4 ---- .../src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java | 4 ++-- .../java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f361e01/log4j-1.2-api/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index 76b1937..779f050 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -54,10 +54,6 @@ <artifactId>log4j-api</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f361e01/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java index 8f9df10..1df66d5 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java @@ -16,7 +16,6 @@ */ package org.apache.log4j.layout; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Node; @@ -26,6 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.layout.AbstractStringLayout; import org.apache.logging.log4j.core.layout.ByteBufferDestination; import org.apache.logging.log4j.core.util.Transform; +import org.apache.logging.log4j.util.Strings; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -102,7 +102,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout { List<String> ndc = event.getContextStack().asList(); if (!ndc.isEmpty()) { buf.append("<log4j:NDC><![CDATA["); - Transform.appendEscapingCData(buf, StringUtils.join(ndc, ' ')); + Transform.appendEscapingCData(buf, Strings.join(ndc, ' ')); buf.append("]]></log4j:NDC>\r\n"); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f361e01/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java index d3f16f5..1eb38be 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java @@ -16,12 +16,12 @@ */ package org.apache.log4j.pattern; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.pattern.ConverterKeys; import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; import org.apache.logging.log4j.core.pattern.PatternConverter; +import org.apache.logging.log4j.util.Strings; import java.util.List; @@ -58,6 +58,6 @@ public final class Log4j1NdcPatternConverter extends LogEventPatternConverter { @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { List<String> ndc = event.getContextStack().asList(); - toAppendTo.append(StringUtils.join(ndc, ' ')); + toAppendTo.append(Strings.join(ndc, ' ')); } }
