sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-discovery-oak] 03/06: SLING-6692: Replace commons.json usage in org.apache.sling.discovery.oak
Date Tue, 07 Nov 2017 09:29:19 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.discovery.oak-1.2.18
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git

commit 64f07a63ef26a12b3977f6e1c488b1095a55eb3e
Author: Karl Pauls <pauls@apache.org>
AuthorDate: Tue Mar 28 13:03:15 2017 +0000

    SLING-6692: Replace commons.json usage in org.apache.sling.discovery.oak
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1789120
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 958e817..5a4c4f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,12 +214,6 @@
 			<version>4.3.5</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.sling</groupId>
-			<artifactId>org.apache.sling.commons.json</artifactId>
-			<version>2.0.6</version>
-            <scope>provided</scope>
-		</dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -308,6 +302,12 @@
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
             <version>1.2.0</version>
             <scope>test</scope>
+            <exclusions>
+            <exclusion>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.json</artifactId>
+            </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
         	<groupId>org.apache.jackrabbit</groupId>
@@ -332,5 +332,11 @@
         	<artifactId>org.apache.sling.hc.core</artifactId>
         	<version>1.0.6</version>
         </dependency>
+        <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.commons.johnzon</artifactId>
+                <version>0.1.0-SNAPSHOT</version>
+                <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message