From 36e5d79fd2ac444e60c5b981966f64dac7f03d5d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 1 Jun 2018 11:17:01 +0200
Subject: [PATCH] Depend on odl-mdsal-common

sal-common-api is pulling in MDSAL's bundle, make sure we bring
it in via the proper feature.

Change-Id: Icdcd73732d05e46da5fe22bc19cac61e2e9b329e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal/odl-controller-mdsal-common/pom.xml | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index a13663ffc9..03503c62a6 100644
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -23,18 +23,35 @@
 
     <name>OpenDaylight :: MDSAL :: Common</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.5.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-api</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-common</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-config-api</artifactId>
+            <version>0.9.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-- 
2.36.6