Add VBD to distribution

Change-Id: I1bf7422f7905fcb04becc18aa0310fc52229e924
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index dffb94feecc15ba4c3c11f5a37d71872e40db6fc..276c20bca3876714312ad8b121340fa3dc6d481d 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -146,6 +146,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.honeycomb.vbd</groupId>
+                <artifactId>vbd-artifacts</artifactId>
+                <version>${honeycomb.vbd.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 64a74eccd0ff96383ce87c873119650f831b6a93..c7aab3a2aa20bb584fe24881a68f9b8d6a63ca3d 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -169,6 +169,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Honeycomb/VBD -->
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>vbd-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- InfraUtils -->
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 1e06266d36828d598f7fa43208228decd91c52ad..613858e169d5aaf1f179b42db9239fb2791e651b 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -62,45 +62,45 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- Daexim -->
+         <!-- BGPCEP -->
         <dependency>
-           <groupId>org.opendaylight.daexim</groupId>
-            <artifactId>odl-daexim-all</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>odl-bgpcep-bgp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
-        <!-- Distribution -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-distribution-version</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>odl-bgpcep-bmp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
-         <!-- BGPCEP -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bgp</artifactId>
+            <artifactId>odl-bgpcep-pcep</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bmp</artifactId>
+            <artifactId>odl-bgpcep-rsvp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <!-- Daexim -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-pcep</artifactId>
+           <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>odl-daexim-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <!-- Distribution -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-rsvp</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-distribution-version</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -131,6 +131,26 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Honeycomb/VBD -->
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-rest</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-ui</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- LISP Flow Mapping -->
         <dependency>
             <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -201,14 +221,6 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- TTP -->
-        <dependency>
-            <groupId>org.opendaylight.ttp</groupId>
-            <artifactId>odl-ttp-model-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <!-- OVSDB -->
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
@@ -269,5 +281,13 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- TTP -->
+        <dependency>
+            <groupId>org.opendaylight.ttp</groupId>
+            <artifactId>odl-ttp-model-rest</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
     </dependencies>
 </project>