BUG-9218: package controller inventory model

Downstreams are pulling in model-inventory artifact because they
do not have a feature where to pull it from. Provide that feature as
odl-mdsal-model-inventory.

Change-Id: I973830ff5b334ea544621f0a8ffc53557439b9c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index 0265294b4059524e7e210c68a1834c34ddcc31aa..dd5664ebe54e6a001044e82b610a4c62c51953f2 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -80,6 +80,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-mdsal-model-inventory</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>

         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>

diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml
index d2cd0b05e397ebb9eca094973df75f6e847aef34..ddc1a85df7c81cac36c90e8bfe6a639a331bed0d 100644 (file)
--- a/features/mdsal/odl-mdsal-all/pom.xml
+++ b/features/mdsal/odl-mdsal-all/pom.xml
@@ -48,6 +48,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-mdsal-model-inventory</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>

         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-toaster</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-toaster</artifactId>

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
new file mode 100644 (file)
index 0000000..579ded9
--- /dev/null
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016, 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>odl-mdsal-model-inventory</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: MD-SAL :: Inventory Model</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.4.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.12.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-binding-runtime</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index c344bd146e2745221db6d5eeb2705766c65f1821..f2ec75e3afa69f56f2d6e823c9a86c231c182cc0 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -42,14 +42,14 @@
     <dependencies>
         <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-binding-base -->
         <dependency>
     <dependencies>
         <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-binding-base -->
         <dependency>

-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-model-inventory</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>

-            <version>${project.version}</version>

             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>


@@ -78,4 +78,4 @@
             <classifier>config</classifier>
         </dependency>
     </dependencies>
             <classifier>config</classifier>
         </dependency>
     </dependencies>

-</project>
\ No newline at end of file
+</project>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 46adb1a70671691cc9ff2d3438cb8fd42392da80..2a4770325b8d310191eab9681e0fa8d6c7e1d3df 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -32,6 +32,7 @@
         <module>odl-mdsal-clustering-commons</module>
         <module>odl-mdsal-common</module>
         <module>odl-mdsal-distributed-datastore</module>
         <module>odl-mdsal-clustering-commons</module>
         <module>odl-mdsal-common</module>
         <module>odl-mdsal-distributed-datastore</module>

+        <module>odl-mdsal-model-inventory</module>

         <module>odl-mdsal-remoterpc-connector</module>
         <module>odl-message-bus-collector</module>
         <module>odl-toaster</module>
         <module>odl-mdsal-remoterpc-connector</module>
         <module>odl-message-bus-collector</module>
         <module>odl-toaster</module>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index d624da92d28437a47b8bf0933d1012a34ab901c5..7a48c9aa198ff2a11b63009a767b00f8ca40e855 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -360,6 +360,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-model-inventory</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-toaster</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-toaster</artifactId>