You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/05/31 11:57:54 UTC
svn commit: r1797018 - in /sling/trunk/contrib/extensions/logtail: pom.xml
src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
Author: pauls
Date: Wed May 31 11:57:54 2017
New Revision: 1797018
URL: http://svn.apache.org/viewvc?rev=1797018&view=rev
Log:
SLING-6897: Remove commons.json from Log Tail Implementation.
Modified:
sling/trunk/contrib/extensions/logtail/pom.xml
sling/trunk/contrib/extensions/logtail/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
Modified: sling/trunk/contrib/extensions/logtail/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/logtail/pom.xml?rev=1797018&r1=1797017&r2=1797018&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/logtail/pom.xml (original)
+++ sling/trunk/contrib/extensions/logtail/pom.xml Wed May 31 11:57:54 2017
@@ -49,6 +49,9 @@
<Sling-Bundle-Resources>
/libs/sling/logtail-plugin/css, /libs/sling/logtail-plugin/js
</Sling-Bundle-Resources>
+ <Embed-Dependency>
+ org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter,
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -106,13 +109,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
+ <version>4.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.6</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Modified: sling/trunk/contrib/extensions/logtail/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/logtail/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java?rev=1797018&r1=1797017&r2=1797018&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/logtail/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java (original)
+++ sling/trunk/contrib/extensions/logtail/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java Wed May 31 11:57:54 2017
@@ -25,9 +25,9 @@ import ch.qos.logback.core.Appender;
import ch.qos.logback.core.FileAppender;
import org.apache.felix.scr.annotations.*;
import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.utils.json.JSONWriter;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.apache.felix.webconsole.WebConsoleConstants;
-import org.apache.sling.commons.json.io.JSONWriter;
import org.apache.sling.tail.LogFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +90,6 @@ public class LogTailerWebConsolePlugin e
}
JSONWriter json = new JSONWriter(response.getWriter());
- json.setTidy(true);
json.object();
boolean reverse = false;