Add OCPplugin to Distribution

Change-Id: I5fef81ff71b75b08230174912842dccfe29cb1b7
Signed-off-by: marko <marko.lai@gmail.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index d9077d19e4fb0dce2194bb831c5174af8b37e42e..e5a1ae24593ab4efe4555c55f97c764489c5bb50 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -118,6 +118,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- OCP Plugin -->
+            <dependency>
+                <groupId>org.opendaylight.ocpplugin</groupId>
+                <artifactId>features-ocpplugin</artifactId>
+                <version>${ocpplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- ODL Parent -->
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 16c796e4f239d5fd900902de3769112926f86cb4..8d39b8bd8443cb88a7cd1048e1ea8f746ec5f943 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -96,6 +96,15 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- OCP Plugin -->
+            <dependency>
+                <groupId>org.opendaylight.ocpplugin</groupId>
+                <artifactId>odl-ocpplugin-all</artifactId>
+                <version>${ocpplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- SNMP4SDN -->
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index c1a86497253c02fec1e5f86dfc4489eef7a77e67..8b684a5dcbc07240d8106b6f1db33ec4f9ebc4fb 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -245,6 +245,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- OCPplugin -->
+        <dependency>
+            <groupId>org.opendaylight.ocpplugin</groupId>
+            <artifactId>features-ocpplugin</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- ODL Parent -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index d13899e05d17fe19cae44d59a6ff933584e5a539..efb69bfcff5e9ab5f8418310530dadc41cb84478 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -81,7 +81,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-rsvp</artifactId>
@@ -132,6 +131,7 @@
         </dependency>
 
         <!-- Honeycomb/VBD -->
+        <!-- Commented out because netconf topology issue
         <dependency>
             <groupId>org.opendaylight.honeycomb.vbd</groupId>
             <artifactId>odl-vbd</artifactId>
@@ -150,6 +150,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- LISP Flow Mapping -->
         <dependency>
@@ -160,18 +161,21 @@
         </dependency>
 
         <!-- Netconf -->
+        <!-- Commented out because netconf topology issue
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-mdsal</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-mdsal-apidocs</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Commented out because netconf topology issue
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-callhome-ssh</artifactId>
@@ -184,6 +188,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
@@ -205,6 +210,14 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- OCPplugin -->
+        <dependency>
+            <groupId>org.opendaylight.ocpplugin</groupId>
+            <artifactId>odl-ocpplugin-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- OpenflowPlugin -->
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>