From 7ba8dd701ab5d6ce7a4a4c43035fa5c375d18581 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 30 Aug 2023 11:47:20 +0200
Subject: [PATCH] Clean up dependencies

We have quite a few warnings about used undeclared dependencies, clean
them up.

Change-Id: I768629694f426f99aaa32a53d19b18642b88a0bd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/mdsal-binding-api/pom.xml             |  4 +++
 binding/mdsal-binding-runtime-osgi/pom.xml    |  4 +++
 binding/mdsal-binding-spi/pom.xml             | 12 +++++++
 dom/mdsal-dom-broker/pom.xml                  |  4 +++
 dom/mdsal-dom-inmemory-datastore/pom.xml      |  4 +++
 .../pom.xml                                   |  4 +++
 .../rfc8345-ietf-network-topology/pom.xml     |  4 +++
 .../pom.xml                                   | 18 ++++++++++-
 .../rfc8346-ietf-l3-unicast-topology/pom.xml  |  8 +++++
 .../ietf/rfc8348-ietf-hardware-state/pom.xml  | 12 +++++++
 .../rfc8349-ietf-ipv6-unicast-routing/pom.xml |  4 +++
 .../rfc8519-ietf-access-control-list/pom.xml  | 12 +++++++
 model/ietf/rfc8520-ietf-acldns/pom.xml        |  4 +++
 model/ietf/rfc8520-ietf-mud/pom.xml           |  8 +++++
 model/ietf/rfc8529/pom.xml                    |  4 +++
 .../rfc8542-ietf-dc-fabric-topology/pom.xml   |  4 +++
 model/ietf/rfc8776-ietf-te-types/pom.xml      |  8 +++++
 .../rfc8795-ietf-te-topology-state/pom.xml    | 12 +++++++
 model/ietf/rfc8795-ietf-te-topology/pom.xml   | 12 +++++++
 replicate/mdsal-replicate-common/pom.xml      | 32 +++++++++++++++++++
 20 files changed, 173 insertions(+), 1 deletion(-)

diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml
index 822eff0b2f..432acfc5f4 100644
--- a/binding/mdsal-binding-api/pom.xml
+++ b/binding/mdsal-binding-api/pom.xml
@@ -29,6 +29,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-common-api</artifactId>
diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml
index b1c5d67324..238fb6b39b 100644
--- a/binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/binding/mdsal-binding-runtime-osgi/pom.xml
@@ -24,6 +24,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml
index bd81dcb30d..8caae392dd 100644
--- a/binding/mdsal-binding-spi/pom.xml
+++ b/binding/mdsal-binding-spi/pom.xml
@@ -25,13 +25,25 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-common-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml
index cd9a401f0d..3c752440d6 100644
--- a/dom/mdsal-dom-broker/pom.xml
+++ b/dom/mdsal-dom-broker/pom.xml
@@ -29,6 +29,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
             <artifactId>modernizer-maven-annotations</artifactId>
diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index 5c7aa9f0e2..df8f001caf 100644
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -30,6 +30,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-common-api</artifactId>
diff --git a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
index 6c06a16790..c5087b6127 100644
--- a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8345 ietf-network-topology for non-NMDA</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-state</artifactId>
diff --git a/model/ietf/rfc8345-ietf-network-topology/pom.xml b/model/ietf/rfc8345-ietf-network-topology/pom.xml
index 52e34a20d8..48a3038d08 100644
--- a/model/ietf/rfc8345-ietf-network-topology/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8345 ietf-network-topology</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network</artifactId>
diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
index 9fdcaea9cd..785063ac94 100644
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
@@ -29,12 +29,28 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-state</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-topology</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology-state</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
index 4c5395bbee..292abd53ef 100644
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
@@ -27,10 +27,18 @@
     <description>RFC8346 ietf-l3-unicast-topology</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8294-ietf-routing-types</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology</artifactId>
diff --git a/model/ietf/rfc8348-ietf-hardware-state/pom.xml b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
index 81ccc9f0a5..8123fbb5ef 100644
--- a/model/ietf/rfc8348-ietf-hardware-state/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
@@ -27,6 +27,18 @@
     <description>RFC8348 ietf-hardware-state</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+            <artifactId>iana-hardware</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8348-ietf-hardware</artifactId>
diff --git a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
index b0841aedb6..720cc573eb 100644
--- a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8349 ietf-ipv6-unicast-routing</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8344</artifactId>
diff --git a/model/ietf/rfc8519-ietf-access-control-list/pom.xml b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
index daf24ab5d7..5cd7659a27 100644
--- a/model/ietf/rfc8519-ietf-access-control-list/pom.xml
+++ b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
@@ -27,10 +27,22 @@
     <description>RFC8519 ietf-access-control-list</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8343</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8519-ietf-ethertypes</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8519-ietf-packet-fields</artifactId>
diff --git a/model/ietf/rfc8520-ietf-acldns/pom.xml b/model/ietf/rfc8520-ietf-acldns/pom.xml
index 8a0e2934db..0c1afa6ff8 100644
--- a/model/ietf/rfc8520-ietf-acldns/pom.xml
+++ b/model/ietf/rfc8520-ietf-acldns/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8520 ietf-acldns</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8519-ietf-access-control-list</artifactId>
diff --git a/model/ietf/rfc8520-ietf-mud/pom.xml b/model/ietf/rfc8520-ietf-mud/pom.xml
index 568b255ab9..d291fd015a 100644
--- a/model/ietf/rfc8520-ietf-mud/pom.xml
+++ b/model/ietf/rfc8520-ietf-mud/pom.xml
@@ -27,6 +27,14 @@
     <description>RFC8520 ietf-mud</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8519-ietf-access-control-list</artifactId>
diff --git a/model/ietf/rfc8529/pom.xml b/model/ietf/rfc8529/pom.xml
index d9cd11e48e..08c63b5924 100644
--- a/model/ietf/rfc8529/pom.xml
+++ b/model/ietf/rfc8529/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8529 Network Instances</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8343</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8344</artifactId>
diff --git a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
index d1b0790b6c..3c34285a14 100644
--- a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
+++ b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
@@ -27,6 +27,10 @@
     <description>RFC8542 ietf-dc-fabric-topology</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology</artifactId>
diff --git a/model/ietf/rfc8776-ietf-te-types/pom.xml b/model/ietf/rfc8776-ietf-te-types/pom.xml
index 7aaca4fbeb..b1ff76c95f 100644
--- a/model/ietf/rfc8776-ietf-te-types/pom.xml
+++ b/model/ietf/rfc8776-ietf-te-types/pom.xml
@@ -26,6 +26,14 @@
     <description>RFC8776 ietf-te-types</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8294-ietf-routing-types</artifactId>
diff --git a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
index a09c76f58d..9c07e07933 100644
--- a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
@@ -27,10 +27,22 @@
     <description>RFC8795 ietf-te-topology-state</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-state</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-topology</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology-state</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8776-ietf-te-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8795-ietf-te-topology</artifactId>
diff --git a/model/ietf/rfc8795-ietf-te-topology/pom.xml b/model/ietf/rfc8795-ietf-te-topology/pom.xml
index 822870d6ef..e12cb028f8 100644
--- a/model/ietf/rfc8795-ietf-te-topology/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology/pom.xml
@@ -27,6 +27,18 @@
     <description>RFC8795 ietf-te-topology</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology</artifactId>
diff --git a/replicate/mdsal-replicate-common/pom.xml b/replicate/mdsal-replicate-common/pom.xml
index 294cae4234..18a0f0ecbe 100644
--- a/replicate/mdsal-replicate-common/pom.xml
+++ b/replicate/mdsal-replicate-common/pom.xml
@@ -20,10 +20,42 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-tree-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-tree-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
     </dependencies>
 
     <scm>
-- 
2.36.6