You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/06/05 00:33:46 UTC
logging-log4j-tools git commit: Updates for 3.0.0 modules.
Repository: logging-log4j-tools
Updated Branches:
refs/heads/master bbf31444c -> 7bbfce708
Updates for 3.0.0 modules.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/7bbfce70
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/7bbfce70
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/7bbfce70
Branch: refs/heads/master
Commit: 7bbfce7088252d708b8e8244c21c6148ff6fbcba
Parents: bbf3144
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Jun 4 18:33:43 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Jun 4 18:33:43 2018 -0600
----------------------------------------------------------------------
log4j-server/pom.xml | 17 ++++++++++++++---
.../org/apache/logging/log4j/server/JmsServer.java | 4 ++--
.../server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/server/XmlInputStreamLogEventBridge.java | 2 +-
.../log4j/server/AbstractSocketServerTest.java | 10 ++++++----
pom.xml | 2 +-
6 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/log4j-server/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 10868b9..5a78828 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-tools</artifactId>
- <version>2.11.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-server</artifactId>
@@ -34,11 +34,22 @@
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>log4j-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-layout-jackson-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-layout-jackson-xml</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Used for JMS server (needs an implementation of course) -->
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
----------------------------------------------------------------------
diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index a6cf9cc..e46632c 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -36,9 +36,9 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.appender.mom.JmsAppender;
-import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.net.JndiManager;
+import org.apache.logging.log4j.jms.appender.JmsAppender;
+import org.apache.logging.log4j.jms.appender.JmsManager;
/**
* LogEventListener server that receives LogEvents over a JMS {@link javax.jms.Destination}.
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
----------------------------------------------------------------------
diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
index ae1b0df..8444c74 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.JsonLogEventParser;
+import org.apache.logging.log4j.jackson.json.parser.JsonLogEventParser;
import org.apache.logging.log4j.util.Chars;
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
----------------------------------------------------------------------
diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
index b042bf9..3c4a1e0 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.XmlLogEventParser;
+import org.apache.logging.log4j.jackson.xml.parser.XmlLogEventParser;
/**
* Reads and logs {@link LogEvent}s from an {@link InputStream}.
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
----------------------------------------------------------------------
diff --git a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 404bbf6..0b5fd2d 100644
--- a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++ b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.logging.log4j.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
@@ -32,19 +36,17 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
-import org.apache.logging.log4j.core.layout.JsonLayout;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.core.layout.XmlLayout;
import org.apache.logging.log4j.core.net.Protocol;
+import org.apache.logging.log4j.jackson.json.layout.JsonLayout;
+import org.apache.logging.log4j.jackson.xml.layout.XmlLayout;
import org.apache.logging.log4j.test.AvailablePortFinder;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/7bbfce70/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c3f948c..0f20b3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>log4j-tools</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2 Tools</name>
- <version>2.11.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>