From 1bda86b3d8996c3124446baf009690f179f08090 Mon Sep 17 00:00:00 2001
From: Sai MarapaReddy <sai.marapareddy@gmail.com>
Date: Sun, 30 Jul 2017 23:09:48 -0700
Subject: [PATCH] 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>
---
 artifacts/upstream/feature-repos/pom.xml     |  9 ++++++++
 artifacts/upstream/single-features/pom.xml   | 24 ++++++++++++++++++++
 features/repos/index/pom.xml                 | 10 +++++++-
 features/singles/odl-integration-all/pom.xml | 20 ++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index e5a1ae24..e70094ed 100644
--- 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 8d39b8bd..e89b1d03 100644
--- 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 8b684a5d..f8d101e0 100644
--- 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 bade61f1..06a54c5b 100644
--- 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>
-- 
2.36.6