You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ch...@apache.org on 2017/02/20 10:35:55 UTC

svn commit: r1783735 - in /sling/trunk/bundles/commons/log-webconsole: pom.xml src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java

Author: chetanm
Date: Mon Feb 20 10:35:55 2017
New Revision: 1783735

URL: http://svn.apache.org/viewvc?rev=1783735&view=rev
Log:
SLING-6529 - Remove usage of org.json from Log WebConsole Module

Modified:
    sling/trunk/bundles/commons/log-webconsole/pom.xml
    sling/trunk/bundles/commons/log-webconsole/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java

Modified: sling/trunk/bundles/commons/log-webconsole/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log-webconsole/pom.xml?rev=1783735&r1=1783734&r2=1783735&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log-webconsole/pom.xml (original)
+++ sling/trunk/bundles/commons/log-webconsole/pom.xml Mon Feb 20 10:35:55 2017
@@ -234,7 +234,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.webconsole</artifactId>
-      <version>4.2.0</version>
+      <version>4.3.0</version>
     </dependency>
 
     <!-- servlet API for the web console plugin -->
@@ -329,12 +329,6 @@
 
     <!-- Required for testing WebConsole Support -->
     <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20070829</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
       <version>1.2.1</version>

Modified: sling/trunk/bundles/commons/log-webconsole/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log-webconsole/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java?rev=1783735&r1=1783734&r2=1783735&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log-webconsole/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java (original)
+++ sling/trunk/bundles/commons/log-webconsole/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java Mon Feb 20 10:35:55 2017
@@ -99,7 +99,6 @@ public abstract class LogTestBase {
             mavenBundle("org.apache.felix", "org.apache.felix.scr").versionAsInProject(),
             mavenBundle("commons-io", "commons-io").versionAsInProject(),
             wrappedBundle(mavenBundle("commons-fileupload", "commons-fileupload").versionAsInProject()),
-            wrappedBundle(mavenBundle("org.json", "json").versionAsInProject()),
             LogTestBase.configAdmin(),
             addPaxExamSpecificOptions(),
             addCodeCoverageOption(), addDebugOptions(), addExtraOptions(), addDefaultOptions());