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>

diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/netconf/models/ietf-netconf-monitoring/pom.xml
index b35d498686ee1d48ae1aa0853be2d699caf66c24..9ede42a3dbb9c6a9c4e79f85dc90fcde25ad291b 100644 (file)
--- 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 cf92844561e6b8bc5b181478fc66e2659da98a77..6f47595d40882ad6de96a87bb85a02de574f7ba8 100644 (file)
--- 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 9461b5a9b68b3443042b0a64f94a22031bfa2111..acdc8e3490fb09325c5b28167da845c1e6d0d436 100644 (file)
--- 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 30e6d06e1fb456788a4253b6629b805e2677e9b6..34e585631ed9efcdf304f68c6027a067ea101f08 100644 (file)
--- 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 90ec06bcf950ba965c5b3d4b8a81bb4a725cba92..5b05a9b2c4eafab00504b86f96a988fc65928bc5 100644 (file)
--- 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 288ed537bb2ad94b0adbd034858999f9fe0713ac..ce950d524ab173558d678883304efe9e8976a163 100644 (file)
--- 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 06155a88a19095ab6e2be788d3bca2a1c8dd8db2..77df465a68c2c3405e9c18a2270f9a1f3fbe247d 100644 (file)
--- 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>