From d46321de8033a7459ee472206225696614c6cd5d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 26 Dec 2020 18:20:02 +0100
Subject: [PATCH] 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>
---
 features/restconf/odl-restconf-common/pom.xml       | 8 --------
 features/restconf/odl-restconf-nb-bierman02/pom.xml | 7 +++++++
 restconf/restconf-nb-rfc8040/pom.xml                | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 53085dc5da..a576c0ea67 100644
--- 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 3d8ef51376..1312780703 100644
--- 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 3a5d54ceda..6ac0a04413 100644
--- 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>
-- 
2.36.6