From 66b3688f2596b1d57b4b2feeeda9efc144fd445e Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 18 May 2022 13:01:55 +0200
Subject: [PATCH] Clean up EOS dependencies

We have a bit of a mess in dependencies, let's clean them up as much as
possible.

Change-Id: Ibc1984e95943846a19ca6de3a887694785db076d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 entityownership/mdsal-eos-binding-adapter/pom.xml | 14 +++++++++-----
 entityownership/mdsal-eos-binding-api/pom.xml     |  4 ----
 entityownership/mdsal-eos-common-api/pom.xml      |  8 --------
 entityownership/mdsal-eos-common-spi/pom.xml      | 12 ------------
 entityownership/mdsal-eos-dom-api/pom.xml         |  8 ++++++++
 entityownership/mdsal-eos-dom-simple/pom.xml      |  8 ++++----
 6 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml
index 17dc0e4401..cacebaf7af 100644
--- a/entityownership/mdsal-eos-binding-adapter/pom.xml
+++ b/entityownership/mdsal-eos-binding-adapter/pom.xml
@@ -25,19 +25,23 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-eos-dom-api</artifactId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
+            <artifactId>mdsal-binding-dom-codec-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>general-entity</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-eos-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-eos-dom-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -49,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
+            <artifactId>yang-data-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.guicedee.services</groupId>
diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml
index 92d50ab5ad..b0db328444 100644
--- a/entityownership/mdsal-eos-binding-api/pom.xml
+++ b/entityownership/mdsal-eos-binding-api/pom.xml
@@ -27,10 +27,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-common-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-eos-common-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>general-entity</artifactId>
diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml
index 5315de826b..5327cd8ebe 100644
--- a/entityownership/mdsal-eos-common-api/pom.xml
+++ b/entityownership/mdsal-eos-common-api/pom.xml
@@ -27,14 +27,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</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>mockito-configuration</artifactId>
diff --git a/entityownership/mdsal-eos-common-spi/pom.xml b/entityownership/mdsal-eos-common-spi/pom.xml
index a24d22c6cd..f69ec1ce01 100644
--- a/entityownership/mdsal-eos-common-spi/pom.xml
+++ b/entityownership/mdsal-eos-common-spi/pom.xml
@@ -23,22 +23,10 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-common-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</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>mockito-configuration</artifactId>
diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml
index 5f842baaa3..6de967e7cf 100644
--- a/entityownership/mdsal-eos-dom-api/pom.xml
+++ b/entityownership/mdsal-eos-dom-api/pom.xml
@@ -19,10 +19,18 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-common-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml
index b3cc1b2505..81b840a63a 100644
--- a/entityownership/mdsal-eos-dom-simple/pom.xml
+++ b/entityownership/mdsal-eos-dom-simple/pom.xml
@@ -29,15 +29,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-eos-common-spi</artifactId>
+            <artifactId>mdsal-eos-dom-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-eos-dom-api</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
+            <artifactId>yang-data-api</artifactId>
         </dependency>
 
         <dependency>
-- 
2.36.6