This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 4e8bde3fb88afd3f6eb14016bf06c8f297f8cd71 Author: rpopma <[email protected]> AuthorDate: Wed Aug 16 07:24:48 2017 +0900 LOG4J2-2011 moved classes from util.picocli to tools.picocli --- .../java/org/apache/logging/log4j/server/AbstractSocketServer.java | 4 ++-- .../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 6 +++--- .../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java index 4f487f5..2024b6b 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java @@ -38,9 +38,9 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.xml.XmlConfiguration; import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory; -import org.apache.logging.log4j.core.util.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; import org.apache.logging.log4j.util.Strings; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 9c3af03..d8dda84 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -34,9 +34,9 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Command; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.message.EntryMessage; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java index 533c4b2..4229003 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; -import org.apache.logging.log4j.core.util.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; /** * Listens for Log4j events on a datagram socket and passes them on to Log4j.
