Add l2switch karaf4 to distribution

Change-Id: I90d418a7dfa5829b9d4b851ad77d1894671f00e2
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

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

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 8d39b8bd8443cb88a7cd1048e1ea8f746ec5f943..e89b1d0369befeb420a36b435c77bbff6aa7e3f6 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -67,6 +67,7 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- Dlux Apps -->
             <dependency>
                 <groupId>org.opendaylight.dluxapps</groupId>
                 <artifactId>odl-dluxapps-nodes</artifactId>
@@ -96,6 +97,29 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- L2switch -->
+            <dependency>
+                <groupId>org.opendaylight.l2switch</groupId>
+                <artifactId>odl-l2switch-switch</artifactId>
+                <version>${l2switch.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.l2switch</groupId>
+                <artifactId>odl-l2switch-switch-rest</artifactId>
+                <version>${l2switch.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.l2switch</groupId>
+                <artifactId>odl-l2switch-switch-ui</artifactId>
+                <version>${l2switch.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- OCP Plugin -->
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 8b684a5dcbc07240d8106b6f1db33ec4f9ebc4fb..f8d101e09088547d40cda827e9472aad0339e890 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -193,7 +193,13 @@
             <type>xml</type>
         </dependency>
 
-        <!-- FIXME: Add Mdsal -->
+        <!-- L2switch -->
+        <dependency>
+            <groupId>org.opendaylight.l2switch</groupId>
+            <artifactId>features-l2switch</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <!-- LISP Flow Mapping -->
         <dependency>
@@ -203,6 +209,8 @@
             <type>xml</type>
         </dependency>
 
+        <!-- FIXME: Add Mdsal -->
+
         <!-- Netconf -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index bade61f171ebb1cdc38778fc7eb18c15e644113f..06a54c5bf4704ef31b5bc2e2ee4a0ee2ef7897c5 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -84,6 +84,26 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- L2switch -->
+        <dependency>
+            <groupId>org.opendaylight.l2switch</groupId>
+            <artifactId>odl-l2switch-switch</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.l2switch</groupId>
+            <artifactId>odl-l2switch-switch-rest</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.l2switch</groupId>
+            <artifactId>odl-l2switch-switch-ui</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- Netconf -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>