From d22df7c373b39ab39b1dc6c4a5aefed601c2f717 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 5 Oct 2021 18:27:44 +0200
Subject: [PATCH] Cleanup dependency

We have some over-inclusion of dependencies on tools-api. Clean that up
along with testutils and upgrade.

Change-Id: I5fbfc167c9d47a3e33347f5d37079d0a13d32a59
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 tools/api/pom.xml       | 18 +++++-------------
 tools/testutils/pom.xml |  7 +++----
 upgrade/pom.xml         |  4 +---
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/tools/api/pom.xml b/tools/api/pom.xml
index 854669a8..d1dcd6bc 100644
--- a/tools/api/pom.xml
+++ b/tools/api/pom.xml
@@ -28,11 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
+      <artifactId>concepts</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
@@ -40,15 +36,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-dom-api</artifactId>
+      <artifactId>mdsal-common-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>metrics-api</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>infrautils-util</artifactId>
+      <artifactId>metrics-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.guicedee.services</groupId>
@@ -66,9 +62,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>value</artifactId>
       <classifier>annotations</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-api</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/tools/testutils/pom.xml b/tools/testutils/pom.xml
index 04e81d59..368fdecc 100644
--- a/tools/testutils/pom.xml
+++ b/tools/testutils/pom.xml
@@ -27,13 +27,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>tools-api</artifactId>
+      <artifactId>rpc-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>rpc-api</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
diff --git a/upgrade/pom.xml b/upgrade/pom.xml
index 513a8fee..b57fe7ff 100644
--- a/upgrade/pom.xml
+++ b/upgrade/pom.xml
@@ -36,13 +36,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-dom-api</artifactId>
+      <artifactId>mdsal-common-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>
-      <version>8.0.5</version>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
-- 
2.36.6