From 7a3400635fe6777980d15becabd587f248b7b290 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 26 Jun 2023 15:03:02 +0200
Subject: [PATCH] Clean up dependencies

Clean up dependencies of mdsal-trace-impl, mdsal-eos-binding-api,
mdsal-dom-spi and mdsal-rfc8294-netty.

Change-Id: Ic3be075e80a2700207abe3628d4d3f972818e64c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 dom/mdsal-dom-spi/pom.xml                     | 49 ++++++++++++++++++-
 entityownership/mdsal-eos-binding-api/pom.xml |  4 ++
 netty/mdsal-rfc8294-netty/pom.xml             |  4 ++
 trace/mdsal-trace-impl/pom.xml                | 32 +++++++++++-
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml
index d12205b675..82c40ac700 100644
--- a/dom/mdsal-dom-spi/pom.xml
+++ b/dom/mdsal-dom-spi/pom.xml
@@ -26,13 +26,33 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-api</artifactId>
+            <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>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odlext-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</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>
@@ -41,12 +61,37 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-tree-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-repo-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-repo-spi</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>
 
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-api</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml
index 2b8c50e1ab..754758cb7e 100644
--- a/entityownership/mdsal-eos-binding-api/pom.xml
+++ b/entityownership/mdsal-eos-binding-api/pom.xml
@@ -23,6 +23,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>concepts</artifactId>
diff --git a/netty/mdsal-rfc8294-netty/pom.xml b/netty/mdsal-rfc8294-netty/pom.xml
index 0efa254643..c939a02c2f 100644
--- a/netty/mdsal-rfc8294-netty/pom.xml
+++ b/netty/mdsal-rfc8294-netty/pom.xml
@@ -25,6 +25,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
diff --git a/trace/mdsal-trace-impl/pom.xml b/trace/mdsal-trace-impl/pom.xml
index 9a3389bbb0..7efb7605b7 100644
--- a/trace/mdsal-trace-impl/pom.xml
+++ b/trace/mdsal-trace-impl/pom.xml
@@ -25,9 +25,33 @@
             <artifactId>spotbugs-annotations</artifactId>
             <optional>true</optional>
         </dependency>
+        <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.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-trace-api</artifactId>
+            <artifactId>mdsal-binding-dom-codec-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-common-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -35,7 +59,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-codec-api</artifactId>
+            <artifactId>mdsal-trace-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
         </dependency>
     </dependencies>
 
-- 
2.36.6