Lower org.json exposure

osg.json package is now used only by bierman02 and unit tests,
adjust dependencies accordingly.

JIRA: NETCONF-471
Change-Id: Ifcefd3728ff349acfcbe52c47d1563d6f682ccbd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 53085dc5da446b02750b9770791d909a4e8624f5..a576c0ea67e867186494bf44adf6519059a343b6 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -111,13 +111,5 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-common</artifactId>
         </dependency>
-
-        <!-- TODO: Remove this when RESTCONF is converted to GSON -->
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20131018</version>
-        </dependency>
-
     </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml
index 3d8ef51376c029a7de89141d3890bba8e88696a1..1312780703ad533b31ee3b580e89a68075583d05 100644 (file)
--- a/features/restconf/odl-restconf-nb-bierman02/pom.xml
+++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml
@@ -67,5 +67,12 @@
             <type>cfg</type>
             <classifier>restconf</classifier>
         </dependency>
+
+        <!-- TODO: Remove this when RESTCONF is converted to GSON -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20131018</version>
+        </dependency>
     </dependencies>
 </project>

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 3a5d54ceda96f5a158e7b98e8b8375124ed11303..6ac0a04413ee496030fb96f9e5fc7dc4cdc261cc 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -128,6 +128,7 @@
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
       <version>20131018</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>