From 78c2284901c6689b362ddd20854e75214adb4ace Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Mon, 21 Sep 2015 11:06:22 +0200
Subject: [PATCH] Fix features not pulling all its dependencies

odl-message-bus requires messagebus-netconf, but does not pull it in.

Change-Id: I85da9727c89dd14dfb52b411ca6ce5f109f3ba4b
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 features/netconf-connector/pom.xml            | 34 +++++++++++++------
 .../netconf/netconf-artifacts/pom.xml         |  7 ++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 5b1b04e527..fe50cec1e4 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -20,6 +20,19 @@
    <properties>
       <features.file>features.xml</features.file>
    </properties>
+
+   <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+   </dependencyManagement>
+
    <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -68,14 +81,20 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>sal-netconf-connector</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>messagebus-netconf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>messagebus-netconf</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
     </dependency>
-   <dependency>
-       <groupId>${project.groupId}</groupId>
-       <artifactId>messagebus-netconf</artifactId>
-   </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-config-dispatcher</artifactId>
@@ -108,13 +127,6 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
-   <dependency>
-       <groupId>${project.groupId}</groupId>
-       <artifactId>messagebus-netconf</artifactId>
-       <version>${netconf.version}</version>
-       <type>xml</type>
-       <classifier>config</classifier>
-   </dependency>
 
     <!--
       Optional TODO: Remove TODO comments.
diff --git a/opendaylight/netconf/netconf-artifacts/pom.xml b/opendaylight/netconf/netconf-artifacts/pom.xml
index 76b4883dbc..9f03eb8469 100644
--- a/opendaylight/netconf/netconf-artifacts/pom.xml
+++ b/opendaylight/netconf/netconf-artifacts/pom.xml
@@ -148,6 +148,13 @@
                 <artifactId>messagebus-netconf</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>messagebus-netconf</artifactId>
+                <version>${project.version}</version>
+                <classifier>config</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-netconf-connector</artifactId>
-- 
2.36.6