You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:24:50 UTC
[sling-org-apache-sling-tail] 05/08: SLING-6897: Remove
commons.json from Log Tail Implementation.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tail.git
commit e7108f83a2a3f75379b6a0f02994fe5d4050b271
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Wed May 31 11:57:54 2017 +0000
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 | 12 ++++++++----
.../apache/sling/tail/impl/LogTailerWebConsolePlugin.java | 3 +--
2 files changed, 9 insertions(+), 6 deletions(-)
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>
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.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 extends AbstractWebConsolePlugin {
}
JSONWriter json = new JSONWriter(response.getWriter());
- json.setTidy(true);
json.object();
boolean reverse = false;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.