Updating features.xml of dlux

Adding dependency of l2switch and apidocs features,
 so users don't have to install manually while installing dlux

Change-Id: If01eaa1eec255f73f746b9124c1da10f33066d07
Signed-off-by: Harman Singh <harmasin@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 78427e1a72812a18dbb99949206beeb25ede6d9c..0d5f27c59d623969c06409c3d7d9cb356145142c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -106,6 +106,20 @@
           <artifactId>dlux.yangvisualizer</artifactId>
           <version>${project.version}</version>
       </dependency>
+      <dependency>
+          <groupId>org.opendaylight.l2switch</groupId>
+          <artifactId>features-l2switch</artifactId>
+          <version>${l2switch.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>features-restconf</artifactId>
+          <version>${mdsal.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+      </dependency>
   </dependencies>
 
   <build>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 40f08123439a111efaa900089b8260bdfd8bf5eb..0ee2b39f6ca874f20780089b856dcd2ab2cdc5cd 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -4,6 +4,8 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
+    <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
     <feature name='odl-dlux-all' version='${project.version}' description="Opendaylight dlux all features">
        <feature>odl-dlux-core</feature>
         <feature>odl-dlux-node</feature>
@@ -13,6 +15,7 @@
 
     <feature name='odl-dlux-core' version='${project.version}' description="Opendaylight dlux minimal feature">
         <feature>http</feature>
+        <feature version="${l2switch.version}">odl-l2switch-switch-rest</feature>
         <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
         <bundle>mvn:org.opendaylight.dlux/loader/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.dlux/loader.implementation/${project.version}</bundle>
@@ -34,6 +37,7 @@
 
     <feature name="odl-dlux-yangui" version='${project.version}' description="Enable Yang UI in Opendaylight dlux">
         <feature>odl-dlux-core</feature>
+        <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
         <bundle>mvn:org.opendaylight.dlux/dlux.yangui/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.dlux/dlux.common.yangutils/${project.version}</bundle>
     </feature>

diff --git a/pom.xml b/pom.xml
index d6be22f7ca624c72259ec89b6c1f8585a018792f..33b25167bc61516d072393e3a39587f164e22719 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,8 @@
       <common.login.resources.version>0.1.0-SNAPSHOT</common.login.resources.version>
       <common.yangutils.resources.version>0.1.0-SNAPSHOT</common.yangutils.resources.version>
       <common.sigmatopology.resources.version>0.1.0-SNAPSHOT</common.sigmatopology.resources.version>
+      <l2switch.version>0.2.0-SNAPSHOT</l2switch.version>
+      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     </properties>
 
     <modules>