Bug 3341: Fix feature pom dependency issue

Change-Id: Ia9c3fecd2c5edcd080829bf5654c278c77c5bb0a
Signed-off-by: Ed Warnicke <hagbard@gmail.com>

diff --git a/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang b/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang
index 2a764f8ddf24caeb2150d53b96d247c2b2ba897d..a825ba320c2cd5a50af1eda2eb28ed6e44b11bc3 100644 (file)
--- a/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang
+++ b/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang
@@ -20,7 +20,7 @@ module inventory-manager-impl {
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case southbound-impl {
+        case inventory-manager-impl {
             when "/config:modules/config:module/config:type = 'inventory-manager-impl'";
             container broker {
                 uses config:service-ref {

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ed045438c05332c239c028319d4daedb375b4a3b..10ec98b609138efe816bc1d67e387622be7a93cb 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -85,6 +85,13 @@
                 <artifactId>inventory-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>inventory-manager</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>lldp-speaker</artifactId>
@@ -105,11 +112,25 @@
                 <artifactId>topology-lldp-discovery</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-lldp-discovery</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>topology-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-manager</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>of-switch-config-pusher</artifactId>
@@ -225,4 +246,3 @@
         </dependencies>
     </dependencyManagement>
 </project>
-

diff --git a/features/pom.xml b/features/pom.xml
index 8ded1c16f49bb0db80ddbe196a625134b5e649a7..1b42d60d47101bf8683239950393d4b7115e893a 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -87,6 +87,12 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>inventory-manager</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>inventory-manager</artifactId>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>lldp-speaker</artifactId>
@@ -149,10 +155,22 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>topology-lldp-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-lldp-discovery</artifactId>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>topology-manager</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-manager</artifactId>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>