From a05515b02c6548dfbfdbed96a8860f4dcf05b308 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 12 May 2021 23:14:18 +0200
Subject: [PATCH] Cleanup dependencies a bit

There are a number of unnecessary dependencies we are using, which are
getting flagged by odlparent-9. Clean the most obvious ones, reducing
our footprint.

Change-Id: I0881d82f4928505998254088c4c729057c86bb7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 netconf/models/ietf-netconf-monitoring/pom.xml    |  6 +++++-
 netconf/models/ietf-netconf-nmda/pom.xml          | 12 ++++++++++--
 netconf/models/ietf-netconf-notifications/pom.xml |  4 ++--
 netconf/netconf-api/pom.xml                       |  8 --------
 netconf/netconf-notifications-api/pom.xml         |  4 ++--
 netconf/netconf-util/pom.xml                      |  6 +++++-
 netconf/sal-netconf-connector/pom.xml             |  4 ++++
 7 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/netconf/models/ietf-netconf-monitoring/pom.xml
index b35d498686..9ede42a3db 100644
--- a/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring/pom.xml
@@ -25,7 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991</artifactId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/netconf/models/ietf-netconf-nmda/pom.xml b/netconf/models/ietf-netconf-nmda/pom.xml
index cf92844561..6f47595d40 100644
--- a/netconf/models/ietf-netconf-nmda/pom.xml
+++ b/netconf/models/ietf-netconf-nmda/pom.xml
@@ -25,11 +25,19 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8342</artifactId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8342-ietf-datastores</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8342-ietf-origin</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/netconf/models/ietf-netconf-notifications/pom.xml
index 9461b5a9b6..acdc8e3490 100644
--- a/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/netconf/models/ietf-netconf-notifications/pom.xml
@@ -29,11 +29,11 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991</artifactId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc8525</artifactId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 30e6d06e1f..34e585631e 100644
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -32,14 +32,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>ietf-netconf-monitoring</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring-extension</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-api</artifactId>
diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index 90ec06bcf9..5b05a9b2c4 100644
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -34,8 +34,8 @@
             <artifactId>ietf-netconf-notifications</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8525</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 288ed537bb..ce950d524a 100644
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -38,7 +38,11 @@
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 06155a88a1..77df465a68 100644
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -27,6 +27,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>ietf-netconf-monitoring</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ietf-netconf-monitoring-extension</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ietf-netconf-notifications</artifactId>
-- 
2.36.6