Migrate to Karaf 4

Change-Id: I7648cd9d591b7ba8aab0aa6b4836b87394ef7b3b
Signed-off-by: Yakir Dorani <yakir.dorani@hpe.com>
Depends-On: https://git.opendaylight.org/gerrit/#/c/51966/
Depends-On: https://git.opendaylight.org/gerrit/#/c/54107/

diff --git a/cisco-xe-driver/pom.xml b/cisco-xe-driver/pom.xml
index a5dbc926172ee5f40041b08ab0a1ee9ac0f83838..99edf8fcdb8d10a9de5da70632659ca1d7945e6c 100644 (file)
--- a/cisco-xe-driver/pom.xml
+++ b/cisco-xe-driver/pom.xml
@@ -134,14 +134,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <!-- For REST -->
         <dependency>
             <groupId>com.eclipsesource.jaxrs</groupId>

diff --git a/cisco-xr-driver/pom.xml b/cisco-xr-driver/pom.xml
index 3126cdb8348a0b297123708a6c86997b6ef1a30d..f881063e8872fda3528794fd4edeb11a999d118b 100644 (file)
--- a/cisco-xr-driver/pom.xml
+++ b/cisco-xr-driver/pom.xml
@@ -119,13 +119,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/cli/pom.xml b/cli/pom.xml
index 85c280f9485e47e15aa0099c780d06931a65a381..80cbbdb0099aaed1c7d390381165562883a5a6ad 100644 (file)
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -77,4 +77,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
   </dependencies>
 
+  <build>
+   <plugins>
+     <plugin>
+       <groupId>org.apache.felix</groupId>
+       <artifactId>maven-bundle-plugin</artifactId>
+       <extensions>true</extensions>
+       <configuration>
+         <instructions>
+           <!-- This bundle works with Karaf 3 and 4.0, see https://wiki.opendaylight.org/view/Karaf_4_migration#Karaf_CLI_commands -->
+           <Import-Package>
+             org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+             org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+             *
+           </Import-Package>
+         </instructions>
+       </configuration>
+     </plugin>
+   </plugins>
+  </build>
+
 </project>

diff --git a/cli/src/main/resources/OSGI-INF/blueprint/commands.xml b/cli/src/main/resources/org/opendaylight/blueprint/commands.xml
similarity index 100%
rename from cli/src/main/resources/OSGI-INF/blueprint/commands.xml
rename to cli/src/main/resources/org/opendaylight/blueprint/commands.xml

diff --git a/dlux/cpeui/cpeui-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/dlux/cpeui/cpeui-bundle/src/main/resources/org/opendaylight/blueprint/blueprint.xml
similarity index 100%
rename from dlux/cpeui/cpeui-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
rename to dlux/cpeui/cpeui-bundle/src/main/resources/org/opendaylight/blueprint/blueprint.xml

diff --git a/features/features-unimgr/pom.xml b/features/features-unimgr/pom.xml
new file mode 100644 (file)
index 0000000..a143492
--- /dev/null
+++ b/features/features-unimgr/pom.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>unimgr-features</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <!-- <name> formatting is used by autorelease to parse and notify projects on
+       build failure. Please do not modify this unless you have a good reason. -->
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- project specific dependencies -->
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>restconf-artifacts</artifactId>
+        <version>${restconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${netconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.l2switch</groupId>
+        <artifactId>l2switch-artifacts</artifactId>
+        <version>${l2switch.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <classifier>features</classifier>
+      <version>${yangtools.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-restconf</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf-connector</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <classifier>features</classifier>
+      <version>${dlux.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dluxapps</groupId>
+      <artifactId>features-dluxapps</artifactId>
+      <classifier>features</classifier>
+      <version>${dluxapps.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-features</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-netvirt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-presto-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-cli</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-cisco-xr-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>cpeui-bundle</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>cisco-xrmodels</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-cisco-xe-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ovs-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>edgeassure-1000</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>vpnservice-features</artifactId>
+      <version>${vpnservice.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>genius-features</artifactId>
+      <version>${genius.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>unimgr-legato-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.l2switch</groupId>
+      <artifactId>features-l2switch</artifactId>
+      <classifier>features</classifier>
+      <version>${l2switch.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/src/main/features/features.xml b/features/features-unimgr/src/main/features/features.xml
similarity index 97%
rename from features/src/main/features/features.xml
rename to features/features-unimgr/src/main/features/features.xml
index fec643e25875d49af01abcf343627666c8bf1588..b0f4ff7998b348eef9f3e070d7583fd29dd543f6 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/features-unimgr/src/main/features/features.xml
@@ -33,7 +33,7 @@
 
   <feature name='odl-unimgr' version='${project.version}'
     description='OpenDaylight :: UniMgr'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
     <feature version='${project.version}'>odl-unimgr-api</feature>
     <feature version='${project.version}'>odl-unimgr-presto-api</feature>
@@ -49,7 +49,7 @@
 
   <feature name='odl-unimgr-netvirt' version='${project.version}'
     description='OpenDaylight :: UniMgr :: NetVirt'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${project.version}'>odl-unimgr</feature>
     <feature version='${genius.version}'>odl-genius-api</feature>
     <feature version='${vpnservice.version}'>odl-netvirt-impl</feature>

diff --git a/features/features4-unimgr/pom.xml b/features/features4-unimgr/pom.xml
new file mode 100644 (file)
index 0000000..b0fd7c2
--- /dev/null
+++ b/features/features4-unimgr/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>feature-repo-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>features4-unimgr</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-netvirt</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-dlux</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-console</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-rest</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-ui</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-cisco-xe-driver</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-cisco-xr-driver</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-ovs-driver</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-presto-api</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-unimgr-api</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+
+  </dependencies>
+</project>
\ No newline at end of file

diff --git a/features/odl-unimgr-api/pom.xml b/features/odl-unimgr-api/pom.xml
new file mode 100755 (executable)
index 0000000..743a6fe
--- /dev/null
+++ b/features/odl-unimgr-api/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-api</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>odl-mdsal-models</artifactId>
+      <version>${mdsal.model.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-api</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-cisco-xe-driver/pom.xml b/features/odl-unimgr-cisco-xe-driver/pom.xml
new file mode 100755 (executable)
index 0000000..2076f53
--- /dev/null
+++ b/features/odl-unimgr-cisco-xe-driver/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-cisco-xe-driver</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-cisco-xe-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.eclipsesource.jaxrs</groupId>
+      <artifactId>jersey-all</artifactId>
+      <version>2.22.2</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-cisco-xr-driver/pom.xml b/features/odl-unimgr-cisco-xr-driver/pom.xml
new file mode 100755 (executable)
index 0000000..97ee4ca
--- /dev/null
+++ b/features/odl-unimgr-cisco-xr-driver/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-cisco-xr-driver</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>cisco-xrmodels</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-cisco-xr-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-unimgr-console/pom.xml b/features/odl-unimgr-console/pom.xml
new file mode 100755 (executable)
index 0000000..042ff6f
--- /dev/null
+++ b/features/odl-unimgr-console/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-console</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-cli</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-dlux/pom.xml b/features/odl-unimgr-dlux/pom.xml
new file mode 100755 (executable)
index 0000000..375bffe
--- /dev/null
+++ b/features/odl-unimgr-dlux/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-dlux</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr-netvirt</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>odl-dlux-core</artifactId>
+      <version>${dlux.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>cpeui-bundle</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-netvirt/pom.xml b/features/odl-unimgr-netvirt/pom.xml
new file mode 100755 (executable)
index 0000000..fe62057
--- /dev/null
+++ b/features/odl-unimgr-netvirt/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-netvirt</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>${controller.mdsal.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>odl-genius-api</artifactId>
+      <version>${genius.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>odl-netvirt-impl</artifactId>
+      <version>${vpnservice.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf</artifactId>
+      <version>${restconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-netvirt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-legato-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-ovs-driver/pom.xml b/features/odl-unimgr-ovs-driver/pom.xml
new file mode 100755 (executable)
index 0000000..7954f6e
--- /dev/null
+++ b/features/odl-unimgr-ovs-driver/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-ovs-driver</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.l2switch</groupId>
+      <artifactId>odl-l2switch-all</artifactId>
+      <version>${l2switch.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf</artifactId>
+      <version>${restconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-library</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-api</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-impl</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-impl-rest</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowjava</groupId>
+      <artifactId>odl-openflowjava-protocol</artifactId>
+      <version>${openflowjava.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-flow-services</artifactId>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-southbound</artifactId>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>ovs-driver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-presto-api/pom.xml b/features/odl-unimgr-presto-api/pom.xml
new file mode 100755 (executable)
index 0000000..6356d04
--- /dev/null
+++ b/features/odl-unimgr-presto-api/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-presto-api</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+  
+  <properties>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+  </properties>  
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>odl-mdsal-models</artifactId>
+      <version>${mdsal.model.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-presto-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-rest/pom.xml b/features/odl-unimgr-rest/pom.xml
new file mode 100755 (executable)
index 0000000..460f8ad
--- /dev/null
+++ b/features/odl-unimgr-rest/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-rest</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf</artifactId>
+      <version>${restconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr-ui/pom.xml b/features/odl-unimgr-ui/pom.xml
new file mode 100755 (executable)
index 0000000..67f245c
--- /dev/null
+++ b/features/odl-unimgr-ui/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr-ui</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr-rest</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr-console</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-mdsal-apidocs</artifactId>
+      <version>${restconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dluxapps</groupId>
+      <artifactId>odl-dluxapps-applications</artifactId>
+      <version>${dluxapps.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/features/odl-unimgr/pom.xml b/features/odl-unimgr/pom.xml
new file mode 100755 (executable)
index 0000000..a5bd573
--- /dev/null
+++ b/features/odl-unimgr/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+  and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.unimgr</groupId>
+  <artifactId>odl-unimgr</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <name>ODL :: unimgr :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
+    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <genius.version>0.3.0-SNAPSHOT</genius.version>
+    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
+    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>${controller.mdsal.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-impl</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr-api</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>odl-unimgr-presto-api</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-netconf-connector</artifactId>
+      <version>${netconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-netconf-connector-ssh</artifactId>
+      <version>${netconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-netconf-tcp</artifactId>
+      <version>${netconf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-impl</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-unimgr/src/main/feature/feature.xml b/features/odl-unimgr/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..ab28143
--- /dev/null
+++ b/features/odl-unimgr/src/main/feature/feature.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<features name="odl-unimgr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-unimgr" version="${project.version}">
+        <configfile finalname="${configfile.directory}/unimgr.xml">
+            mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}/xml/config
+        </configfile>
+    </feature>
+</features>
\ No newline at end of file

diff --git a/features/pom.xml b/features/pom.xml
index 84f88df158d338672ba38324e4c863b31374084c..f64b086ea5d95b4feea5bf6dcb4e826d9d8432ae 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -7,13 +7,14 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
+    <artifactId>odlparent-lite</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <relativePath />
   </parent>
-  <groupId>org.opendaylight.unimgr</groupId>
-  <artifactId>unimgr-features</artifactId>
+  <groupId>org.opendaylight.unimgr</groupId>  
+  <artifactId>features-aggregator</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: unimgr :: ${project.artifactId}</name>
@@ -21,212 +22,19 @@
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
-  <properties>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
-    <netvirt.version>1.5.0-SNAPSHOT</netvirt.version>
-    <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-    <genius.version>0.3.0-SNAPSHOT</genius.version>
-    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
-    <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
-    <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${netconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.l2switch</groupId>
-        <artifactId>l2switch-artifacts</artifactId>
-        <version>${l2switch.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <classifier>features</classifier>
-      <version>${dlux.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-features</artifactId>
-      <version>${ovsdb.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-netvirt</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-presto-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-cli</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-cisco-xr-driver</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>cpeui-bundle</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.unimgr</groupId>
-      <artifactId>cisco-xrmodels</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-cisco-xe-driver</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ovs-driver</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.unimgr</groupId>
-      <artifactId>edgeassure-1000</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netvirt</groupId>
-      <artifactId>vpnservice-features</artifactId>
-      <version>${vpnservice.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>genius-features</artifactId>
-      <version>${genius.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>unimgr-legato-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch</groupId>
-      <artifactId>features-l2switch</artifactId>
-      <classifier>features</classifier>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>features-unimgr</module>
+    <module>features4-unimgr</module>
+    <module>odl-unimgr-api</module>
+    <module>odl-unimgr-presto-api</module>
+    <module>odl-unimgr</module>
+    <module>odl-unimgr-netvirt</module>
+    <module>odl-unimgr-dlux</module>
+    <module>odl-unimgr-console</module>
+    <module>odl-unimgr-rest</module>
+    <module>odl-unimgr-ui</module>
+    <module>odl-unimgr-cisco-xe-driver</module>
+    <module>odl-unimgr-cisco-xr-driver</module>
+    <module>odl-unimgr-ovs-driver</module>    
+  </modules>  
 </project>

diff --git a/ovs-driver/pom.xml b/ovs-driver/pom.xml
index 487c4f919d4e88e3d99c6f7e6e38624088d66423..c334a371e42e315a09853d95944dceed7d73b4e1 100644 (file)
--- a/ovs-driver/pom.xml
+++ b/ovs-driver/pom.xml
@@ -45,16 +45,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- dependencies to use AbstractDataBrokerTest -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <!-- Testing Dependencies -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>