From a1ab39a2d59d8191593e022605cdc063a1b07320 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 20 Jul 2021 13:58:48 +0200
Subject: [PATCH] Clean up unused dependencies

odlparent's infrastructure is reporting a number of unused declared
dependencies, clean them up.

Change-Id: Id00e8864e67b7ac36beed2a79184c19e88d0175f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml | 14 +++++++++-----
 southbound/southbound-impl/pom.xml             | 10 +++++++++-
 utils/hwvtepsouthbound-utils/pom.xml           |  9 ++++++---
 utils/southbound-utils/pom.xml                 |  2 +-
 utils/yang-utils/pom.xml                       |  4 ----
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 57ee01dd7..ad4428ea7 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -30,13 +30,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.osgi</groupId>
       <artifactId>osgi.core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-dom-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-codec</artifactId>
+      <artifactId>mdsal-binding-dom-codec-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
@@ -82,10 +90,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>upgrade</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-spi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.core</artifactId>
diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 1ee7ebf59..7b68dd513 100644
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -29,6 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>
@@ -39,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-codec</artifactId>
+      <artifactId>mdsal-binding-dom-codec-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
diff --git a/utils/hwvtepsouthbound-utils/pom.xml b/utils/hwvtepsouthbound-utils/pom.xml
index c6025dd4d..8297917a9 100644
--- a/utils/hwvtepsouthbound-utils/pom.xml
+++ b/utils/hwvtepsouthbound-utils/pom.xml
@@ -36,9 +36,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>utils.mdsal-utils</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-topology</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/utils/southbound-utils/pom.xml b/utils/southbound-utils/pom.xml
index 8befdb30d..fecf5560d 100644
--- a/utils/southbound-utils/pom.xml
+++ b/utils/southbound-utils/pom.xml
@@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </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.model</groupId>
diff --git a/utils/yang-utils/pom.xml b/utils/yang-utils/pom.xml
index 707664e2f..5bf681e62 100644
--- a/utils/yang-utils/pom.xml
+++ b/utils/yang-utils/pom.xml
@@ -24,10 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-- 
2.36.6