From 58e6612f1f172a1c12b21421b9bd08341f521fd2 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 29 May 2020 16:43:38 +0200
Subject: [PATCH] Clean up odl-mdsal-binding-runtime

mdsal-dom-schema-osgi does not depend on mdsal-dom-broker, as it
is getting everything it needs from mdsal-dom-spi.

Since this implementation is part of odl-mdsal-binding-runtime,
fix the feature definition to also depend on odl-mdsal-dom-api.

This solves duplicate packaging of:
- mdsal-common-api
- mdsal-dom-api
- mdsal-dom-spi

JIRA: MDSAL-560
Change-Id: Id9351c4d84a055ceb6a77803e60232bf7f5bb646
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 dom/mdsal-dom-schema-osgi/pom.xml          | 6 +-----
 features/odl-mdsal-binding-runtime/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index c25666e96f..972acccc0e 100644
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -22,16 +22,12 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-api</artifactId>
+            <artifactId>mdsal-dom-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-runtime-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-broker</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
diff --git a/features/odl-mdsal-binding-runtime/pom.xml b/features/odl-mdsal-binding-runtime/pom.xml
index 4a37df40f2..7fe8d12c1b 100644
--- a/features/odl-mdsal-binding-runtime/pom.xml
+++ b/features/odl-mdsal-binding-runtime/pom.xml
@@ -45,6 +45,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-dom-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-impl</artifactId>
-- 
2.36.6