commit e7108f83a2a3f75379b6a0f02994fe5d4050b271
author Karl Pauls <pauls@apache.org> Wed May 31 11:57:54 2017 +0000
committer Karl Pauls <pauls@apache.org> Wed May 31 11:57:54 2017 +0000
tree 1ca5eeb795ef8c35b2858ec443d27ee04b48287a
parent ae9e5eab9dc6fa82367bfae83bd54284d532fc8c

SLING-6897: Remove commons.json from Log Tail Implementation.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1797018 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 90ef6b8..2d2aa56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java

diff --git a/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java b/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
index 98f947d..1e6ebd5 100644
--- a/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java
@@ -25,9 +25,9 @@
 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 @@
                 }

 

                 JSONWriter json = new JSONWriter(response.getWriter());

-                json.setTidy(true);

                 json.object();

 

                 boolean reverse = false;