From b7a7f8ccb61d02e68ec3fe31932cef9bd6bde7b3 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 14 Feb 2017 12:55:57 +0100
Subject: [PATCH] Improve Karaf3 features before Karaf4 migration

+ Feature artifacts inherit from odlparent:features-parent now.
*+ src/main/features/ instead of src/main/resources/.
*+ {{VERSION}} instead of version properties.
*+ No explifit versions for feature dependencies.
+ Use artifact poms: upstream, distribution and all.
*+ Only upstream artifact pom has version properties.
*+ The version properties have simpler names.
+ Removed superfluous maven-bundle-plugin configuration from Version pom.
+ TODOs to rename feature artifactIds.
- No TODOs to use org.opendaylight.integration.distribution
+ General comment line improvements.
+ Added missing licences.
+ Update copyright years on files where edits were significant.
+ Each POM uses parent from Odlparent (instead inheriting from aggregators).
+ Add log.txt to .gitignore

Change-Id: I8d4ce2ba40674138cdefdedc3bc81f3bce907ac7
Signed-off-by: Vratko Polak <vratko.polak@gmail.com>
---
 .gitignore                                    |   3 +
 artifacts/all/pom.xml                         |  56 ++
 artifacts/distribution/pom.xml                |  77 ++
 artifacts/pom.xml                             |  43 ++
 artifacts/upstream/pom.xml                    | 672 ++++++++++++++++++
 distribution-karaf/pom.xml                    |  29 +-
 features-distribution/pom.xml                 | 137 +---
 .../main/{resources => features}/features.xml |   8 +-
 features-index/pom.xml                        | 238 ++-----
 features-index/src/main/features/features.xml | 113 +++
 .../src/main/resources/features.xml           |  98 ---
 features-test/pom.xml                         | 138 +---
 features-test/src/main/features/features.xml  | 194 +++++
 features-test/src/main/resources/features.xml | 171 -----
 pom.xml                                       |  73 +-
 version/pom.xml                               |  23 +-
 16 files changed, 1304 insertions(+), 769 deletions(-)
 create mode 100644 artifacts/all/pom.xml
 create mode 100644 artifacts/distribution/pom.xml
 create mode 100644 artifacts/pom.xml
 create mode 100644 artifacts/upstream/pom.xml
 rename features-distribution/src/main/{resources => features}/features.xml (70%)
 create mode 100644 features-index/src/main/features/features.xml
 delete mode 100644 features-index/src/main/resources/features.xml
 create mode 100644 features-test/src/main/features/features.xml
 delete mode 100644 features-test/src/main/resources/features.xml

diff --git a/.gitignore b/.gitignore
index 718d04c6..b74a9d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ maven-eclipse.xml
 .metadata
 .checkstyle
 .factorypath
+
+# Maven console output redirect
+log.txt
diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
new file mode 100644
index 00000000..e27fd251
--- /dev/null
+++ b/artifacts/all/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  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
+-->
+<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>odlparent-lite</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>all-artifacts</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>distribution:distribution-artifacts</name>
+    <description>POM to import with all ODL artifact versions including Distribution.</description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/all;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>upstream-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>distribution-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
new file mode 100644
index 00000000..5688b114
--- /dev/null
+++ b/artifacts/distribution/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  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
+-->
+<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>odlparent-lite</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>distribution-artifacts</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>distribution:distribution-artifacts</name>
+    <description>POM to import with all Integration/Distribution artifact versions.</description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/distribution;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <dependencyManagement>
+        <dependencies>
+            <!-- Version -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>version</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>version</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <!-- Karaf 3 features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-distribution</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-integration-index</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-integration-test</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
new file mode 100644
index 00000000..bd919ba1
--- /dev/null
+++ b/artifacts/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  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
+-->
+<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>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>artifacts-aggregator</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>distribution:artifacts-aggregator</name>
+    <description>Aggregator for artifacts-related distribution sub-projects.</description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <modules>
+        <module>all</module>
+        <module>distribution</module>
+        <module>upstream</module>
+    </modules>
+</project>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
new file mode 100644
index 00000000..cb7fbbf4
--- /dev/null
+++ b/artifacts/upstream/pom.xml
@@ -0,0 +1,672 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  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
+-->
+<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>odlparent-lite</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>upstream-artifacts</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>distribution:upstream-artifacts</name>
+    <description>POM to import with all upstream ODL artifact versions.</description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Version properties by project or component. -->
+        <!-- Keep this list sorted alphabetically please. -->
+        <aaa.version>0.5.0-SNAPSHOT</aaa.version>
+        <alto.version>0.4.0-SNAPSHOT</alto.version>
+        <!-- Removed from autorelease due to inactivity.
+        <atrium.version>0.1.0-SNAPSHOT</atrium.version>
+        -->
+        <benchmark.version>1.3.0-SNAPSHOT</benchmark.version>
+        <bgpcep.version>0.7.0-SNAPSHOT</bgpcep.version>
+        <bier.version>0.1.0-SNAPSHOT</bier.version>
+        <capwap.version>0.4.0-SNAPSHOT</capwap.version>
+        <cardinal.version>0.2.0-SNAPSHOT</cardinal.version>
+        <!-- Removed from autorelease due to inactivity.
+        <centinel.version>0.3.0-SNAPSHOT</centinel.version>
+        -->
+        <controller.config.version>0.6.0-SNAPSHOT</controller.config.version>
+        <controller.extras.version>1.8.0-SNAPSHOT</controller.extras.version>
+        <didm.version>0.4.0-SNAPSHOT</didm.version>
+        <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+        <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
+        <eman.version>1.1.0-SNAPSHOT</eman.version>
+        <faas.version>1.2.0-SNAPSHOT</faas.version>
+        <flow.version>1.5.0-SNAPSHOT</flow.version>
+        <genius.version>0.2.0-SNAPSHOT</genius.version>
+        <groupbasedpolicy.version>0.5.0-SNAPSHOT</groupbasedpolicy.version>
+        <honeycomb.vbd.version>1.1.0-SNAPSHOT</honeycomb.vbd.version>
+        <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
+        <iotdm.version>0.3.0-SNAPSHOT</iotdm.version>
+        <l2switch.version>0.5.0-SNAPSHOT</l2switch.version>
+        <!-- Removed from autorelease due to inactivity.
+        <lacp.version>1.3.0-SNAPSHOT</lacp.version>
+        -->
+        <lispflowmapping.version>1.5.0-SNAPSHOT</lispflowmapping.version>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <natapp.version>0.2.0-SNAPSHOT</natapp.version>
+        <nemo.version>1.2.0-SNAPSHOT</nemo.version>
+        <netconf.version>1.2.0-SNAPSHOT</netconf.version>
+        <netide.version>0.3.0-SNAPSHOT</netide.version>
+        <netvirt.version>1.4.0-SNAPSHOT</netvirt.version>
+        <nic.version>1.3.0-SNAPSHOT</nic.version>
+        <neutron.version>0.8.0-SNAPSHOT</neutron.version>
+        <ocpplugin.version>0.2.0-SNAPSHOT</ocpplugin.version>
+        <odlparent.version>1.8.0-SNAPSHOT</odlparent.version>
+        <of-config.version>1.2.0-SNAPSHOT</of-config.version>
+        <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
+        <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
+        <packetcable.version>1.5.0-SNAPSHOT</packetcable.version>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+        <sdninterfaceapp.version>1.8.0-SNAPSHOT</sdninterfaceapp.version>
+        <sfc.version>0.5.0-SNAPSHOT</sfc.version>
+        <snbi.version>1.4.0-SNAPSHOT</snbi.version>
+        <snmp.version>1.3.0-SNAPSHOT</snmp.version>
+        <snmp4sdn.version>0.5.0-SNAPSHOT</snmp4sdn.version>
+        <sxp.version>1.4.0-SNAPSHOT</sxp.version>
+        <topoprocessing.version>0.3.0-SNAPSHOT</topoprocessing.version>
+        <tsdr.version>1.3.0-SNAPSHOT</tsdr.version>
+        <ttp.version>0.4.0-SNAPSHOT</ttp.version>
+        <unimgr.version>0.2.0-SNAPSHOT</unimgr.version>
+        <usc.version>1.3.0-SNAPSHOT</usc.version>
+        <!-- Removed from autorelease due to inactivity.
+        <usecplugin.version>1.2.0-SNAPSHOT</usecplugin.version>
+        -->
+        <vpnservice.version>0.4.0-SNAPSHOT</vpnservice.version>
+        <vtn-manager.version>0.6.0-SNAPSHOT</vtn-manager.version>
+        <!-- Removed from autorelease due to inactivity.
+        <yang-push.version>1.2.0-SNAPSHOT</yang-push.version>
+        -->
+        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+        <!-- Keep this list sorted alphabetically please. -->
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <!-- For Version. -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>features-config-persister</artifactId>
+                <version>${controller.config.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- External applications. -->
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-cli-jar</artifactId>
+                <version>${aaa.version}</version>
+            </dependency>
+            <!-- For features, by project. -->
+            <!-- TODO: This basically duplicates features-index dependencies just to save 1 line per dependency there. Worth it? -->
+            <!-- Aaa -->
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>features-aaa</artifactId>
+                <version>${aaa.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>features-aaa-shiro</artifactId>
+                <version>${aaa.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Alto -->
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>features-alto-release</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Atrium
+                Removed from autorelease due to inactivity.
+            <dependency>
+                <groupId>org.opendaylight.atrium</groupId>
+                <artifactId>atrium-features</artifactId>
+                <version>${atrium.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            -->
+            <!-- Bgpcep -->
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>features-bgp</artifactId>
+                <classifier>features</classifier>
+                <version>${bgpcep.version}</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>features-bmp</artifactId>
+                <classifier>features</classifier>
+                <version>${bgpcep.version}</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>features-extras</artifactId>
+                <classifier>features</classifier>
+                <version>${bgpcep.version}</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>features-pcep</artifactId>
+                <classifier>features</classifier>
+                <version>${bgpcep.version}</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>features-rsvp</artifactId>
+                <classifier>features</classifier>
+                <version>${bgpcep.version}</version>
+                <type>xml</type>
+            </dependency>
+            <!-- Bier -->
+            <dependency>
+                <groupId>org.opendaylight.bier</groupId>
+                <artifactId>features-bier</artifactId>
+                <classifier>features</classifier>
+                <version>${bier.version}</version>
+                <type>xml</type>
+            </dependency>
+            <!-- Capwap -->
+            <dependency>
+                <groupId>org.opendaylight.capwap</groupId>
+                <artifactId>capwap-features</artifactId>
+                <version>${capwap.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Cardinal -->
+            <dependency>
+                <groupId>org.opendaylight.cardinal</groupId>
+                <artifactId>cardinal-features</artifactId>
+                <version>${cardinal.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Centinel
+                Removed from autorelease due to inactivity.
+            <dependency>
+                <groupId>org.opendaylight.centinel</groupId>
+                <artifactId>centinel-features</artifactId>
+                <version>${centinel.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            -->
+            <!-- Controller -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>features-extras</artifactId>
+                <version>${controller.extras.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>features-mdsal</artifactId>
+                <version>${mdsal.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>features-mdsal-benchmark</artifactId>
+                <version>${benchmark.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Didm -->
+            <dependency>
+                <groupId>org.opendaylight.didm</groupId>
+                <artifactId>features-didm</artifactId>
+                <version>${didm.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.didm</groupId>
+                <artifactId>features-didm-hp</artifactId>
+                <version>${didm.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.didm</groupId>
+                <artifactId>features-didm-ovs</artifactId>
+                <version>${didm.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Dlux -->
+            <dependency>
+                <groupId>org.opendaylight.dlux</groupId>
+                <artifactId>features-dlux</artifactId>
+                <version>${dlux.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Dluxapps -->
+            <dependency>
+                <groupId>org.opendaylight.dluxapps</groupId>
+                <artifactId>features-dluxapps</artifactId>
+                <version>${dluxapps.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Eman -->
+            <dependency>
+                <groupId>org.opendaylight.eman</groupId>
+                <artifactId>eman-features</artifactId>
+                <version>${eman.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Faas -->
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>features-faas</artifactId>
+                <version>${faas.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Genius -->
+            <dependency>
+                <groupId>org.opendaylight.genius</groupId>
+                <artifactId>genius-features</artifactId>
+                <version>${genius.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Groupbasedpolicy -->
+            <dependency>
+                <groupId>org.opendaylight.groupbasedpolicy</groupId>
+                <artifactId>features-groupbasedpolicy</artifactId>
+                <version>${groupbasedpolicy.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Honeycomb/Vbd -->
+            <dependency>
+                <groupId>org.opendaylight.honeycomb.vbd</groupId>
+                <artifactId>vbd-features</artifactId>
+                <version>${honeycomb.vbd.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Infrautils -->
+            <dependency>
+                <groupId>org.opendaylight.infrautils</groupId>
+                <artifactId>infrautils-features</artifactId>
+                <version>${infrautils.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Iotdm -->
+            <dependency>
+                <groupId>org.opendaylight.iotdm</groupId>
+                <artifactId>onem2mall-features</artifactId>
+                <version>${iotdm.version}</version>
+                <classifier>features</classifier>
+                <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>
+            <!-- Lacp
+                Removed from autorelease due to inactivity.
+            <dependency>
+                <groupId>org.opendaylight.lacp</groupId>
+                <artifactId>features-lacp</artifactId>
+                <version>${lacp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            -->
+            <!-- Lispflowmapping -->
+            <dependency>
+                <groupId>org.opendaylight.lispflowmapping</groupId>
+                <artifactId>features-lispflowmapping</artifactId>
+                <version>${lispflowmapping.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Natapp -->
+            <dependency>
+                <groupId>org.opendaylight.natapp</groupId>
+                <artifactId>natapp-features</artifactId>
+                <version>${natapp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Nemo -->
+            <dependency>
+                <groupId>org.opendaylight.nemo</groupId>
+                <artifactId>nemo-features</artifactId>
+                <version>${nemo.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Netconf -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>features-netconf</artifactId>
+                <version>${netconf.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>features-netconf-connector</artifactId>
+                <version>${netconf.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>features-restconf</artifactId>
+                <version>${restconf.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Netvirt -->
+            <dependency>
+                <groupId>org.opendaylight.netvirt</groupId>
+                <artifactId>features-netvirt</artifactId>
+                <version>${netvirt.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netvirt</groupId>
+                <artifactId>openstack.net-virt-sfc-features</artifactId>
+                <version>${netvirt.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netvirt</groupId>
+                <artifactId>openstack.sfc-translator-features</artifactId>
+                <version>${netvirt.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netvirt</groupId>
+                <artifactId>vpnservice-features</artifactId>
+                <version>${vpnservice.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Netide -->
+            <dependency>
+                <groupId>org.opendaylight.netide</groupId>
+                <artifactId>netide-features</artifactId>
+                <version>${netide.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Neutron -->
+            <dependency>
+                <groupId>org.opendaylight.neutron</groupId>
+                <artifactId>features-neutron</artifactId>
+                <version>${neutron.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Nic -->
+            <dependency>
+                <groupId>org.opendaylight.nic</groupId>
+                <artifactId>features-nic</artifactId>
+                <version>${nic.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Ocpplugin -->
+            <dependency>
+                <groupId>org.opendaylight.ocpplugin</groupId>
+                <artifactId>features-ocpplugin</artifactId>
+                <version>${ocpplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Odlparent -->
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>features-akka</artifactId>
+                <version>${odlparent.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>features-odlparent</artifactId>
+                <version>${odlparent.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Of-config -->
+            <dependency>
+                <groupId>org.opendaylight.of-config</groupId>
+                <artifactId>features-of-config</artifactId>
+                <version>${of-config.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Openflowplugin -->
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>features-openflowplugin</artifactId>
+                <version>${openflowplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>features-openflowplugin-he</artifactId>
+                <version>${openflowplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>features-openflowplugin-extension</artifactId>
+                <version>${openflowplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>features-openflowplugin-extension-he</artifactId>
+                <version>${openflowplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Ovsdb -->
+            <dependency>
+                <groupId>org.opendaylight.ovsdb</groupId>
+                <artifactId>library-features</artifactId>
+                <version>${ovsdb.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.ovsdb</groupId>
+                <artifactId>southbound-features</artifactId>
+                <version>${ovsdb.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.ovsdb</groupId>
+                <artifactId>hwvtepsouthbound-features</artifactId>
+                <version>${ovsdb.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Packetcable -->
+            <dependency>
+                <groupId>org.opendaylight.packetcable</groupId>
+                <artifactId>features-packetcable-policy</artifactId>
+                <version>${packetcable.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Sdninterfaceapp -->
+            <dependency>
+                <groupId>org.opendaylight.sdninterfaceapp</groupId>
+                <artifactId>features-sdninterfaceapp</artifactId>
+                <version>${sdninterfaceapp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Sfc -->
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>features-sfc</artifactId>
+                <version>${sfc.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Snbi -->
+            <dependency>
+                <groupId>org.opendaylight.snbi</groupId>
+                <artifactId>features-snbi</artifactId>
+                <version>${snbi.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Snmp -->
+            <dependency>
+                <groupId>org.opendaylight.snmp</groupId>
+                <artifactId>features-snmp</artifactId>
+                <version>${snmp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Snmp4sdn -->
+            <dependency>
+                <groupId>org.opendaylight.snmp4sdn</groupId>
+                <artifactId>features-snmp4sdn</artifactId>
+                <version>${snmp4sdn.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Sxp -->
+            <dependency>
+                <groupId>org.opendaylight.sxp</groupId>
+                <artifactId>features</artifactId>
+                <version>${sxp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Topoprocessing -->
+            <dependency>
+                <groupId>org.opendaylight.topoprocessing</groupId>
+                <artifactId>features-topoprocessing</artifactId>
+                <version>${topoprocessing.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Tsdr -->
+            <dependency>
+                <groupId>org.opendaylight.tsdr</groupId>
+                <artifactId>features-tsdr</artifactId>
+                <version>${tsdr.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Ttp -->
+            <dependency>
+                <groupId>org.opendaylight.ttp</groupId>
+                <artifactId>features-ttp</artifactId>
+                <version>${ttp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Unimgr -->
+            <dependency>
+                <groupId>org.opendaylight.unimgr</groupId>
+                <artifactId>unimgr-features</artifactId>
+                <version>${unimgr.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Usc -->
+            <dependency>
+                <groupId>org.opendaylight.usc</groupId>
+                <artifactId>usc-features</artifactId>
+                <version>${usc.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Usecplugin
+                Removed from autorelease due to inactivity.
+            <dependency>
+                <groupId>org.opendaylight.usecplugin</groupId>
+                <artifactId>usecplugin-features</artifactId>
+                <version>${usecplugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            -->
+            <!-- Vtn -->
+            <dependency>
+                <groupId>org.opendaylight.vtn</groupId>
+                <artifactId>features-vtn-manager</artifactId>
+                <version>${vtn-manager.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Yang-push
+                Removed from autorelease due to inactivity.
+            <dependency>
+                <groupId>org.opendaylight.yang-push</groupId>
+                <artifactId>yangpush-features</artifactId>
+                <version>${yang-push.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            -->
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 7f695233..996c6e2c 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  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
+-->
 <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>
@@ -8,6 +16,7 @@
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
+    <!-- TODO: Rename to "distribution" or "karaf". -->
     <artifactId>distribution-karaf</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -27,6 +36,17 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=distribution-karaf;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- opendaylight-karaf-parent uses this too -->
         <dependency>
@@ -34,11 +54,10 @@
             <artifactId>framework</artifactId>
             <type>kar</type>
         </dependency>
-        <!-- integration feature -->
+        <!-- Integration index feature repository. -->
         <dependency>
             <artifactId>features-integration-index</artifactId>
             <groupId>org.opendaylight.integration</groupId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
@@ -53,11 +72,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- integration test feature -->
+        <!-- Integration test feature repository. -->
         <dependency>
             <artifactId>features-integration-test</artifactId>
             <groupId>org.opendaylight.integration</groupId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>test</scope>
@@ -73,11 +91,10 @@
             </exclusions>
         </dependency>
 
-        <!-- external application -->
+        <!-- External applications. -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-cli-jar</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/features-distribution/pom.xml b/features-distribution/pom.xml
index ea146098..8f3ce3b6 100644
--- a/features-distribution/pom.xml
+++ b/features-distribution/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright (c) 2016-2017 Cisco Systems, Inc. and others.  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,
@@ -10,12 +10,14 @@
 <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.integration</groupId>
-        <artifactId>root</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
+    <groupId>org.opendaylight.integration</groupId>
     <artifactId>features-distribution</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>distribution:${project.artifactId}</name>
     <description>Sub-project building features internal to distribution.</description>
@@ -33,20 +35,26 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features-distribution;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <properties>
-        <features.file>features.xml</features.file>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- version module -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>version</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>version</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
@@ -54,117 +62,8 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-config-persister</artifactId>
-            <version>${feature.controller.config.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- test to validate features.xml -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${feature.odlparent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${feature.odlparent.version}</version>
-            <type>zip</type>
-        </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <!-- This generates the META-INF/maven/dependencies.properties file
-                     which is required by the versionAsInProject() used in SingleFeatureTest -->
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
-                <executions>
-                  <execution>
-                   <id>generate-dependencies.properties-file</id>
-                   <goals>
-                     <goal>generate-depends-file</goal>
-                   </goals>
-                  </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>features-create-kar</id>
-                        <goals>
-                            <goal>features-create-kar</goal>
-                        </goals>
-                        <configuration>
-                            <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
-                        </configuration>
-                    </execution>
-                </executions>
-                <!-- There is no useful configuration for the kar mojo. The features-generate-descriptor mojo configuration may be useful -->
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                        <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>org.opendaylight.odlparent:features-test</dependency>
-                    </dependenciesToScan>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/features-distribution/src/main/resources/features.xml b/features-distribution/src/main/features/features.xml
similarity index 70%
rename from features-distribution/src/main/resources/features.xml
rename to features-distribution/src/main/features/features.xml
index a1a5fcb1..f98959f9 100644
--- a/features-distribution/src/main/resources/features.xml
+++ b/features-distribution/src/main/features/features.xml
@@ -7,14 +7,14 @@
  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-distribution-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-integration-distribution-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           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-config-persister/${feature.controller.config.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-distribution-version' version='${project.version}'>
         <feature>odl-config-startup</feature>
-        <bundle>mvn:org.opendaylight.integration/version/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/odl-version.xml">mvn:org.opendaylight.integration/version/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.integration/version/{{VERSION}}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/odl-version.xml">mvn:org.opendaylight.integration/version/{{VERSION}}/xml/config</configfile>
     </feature>
 </features>
diff --git a/features-index/pom.xml b/features-index/pom.xml
index 575f8723..6cf35aa9 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  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,
@@ -10,12 +10,15 @@
 <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.integration</groupId>
-        <artifactId>root</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <!-- TODO: Rename to features-index when migrating to Karaf 4. -->
     <artifactId>features-integration-index</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>distribution:${project.artifactId}</name>
     <description>Sub-project gathering feature repositories of all ODL projects participating in distribution.</description>
@@ -33,571 +36,450 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features-index;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <properties>
-        <features.file>features.xml</features.file>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-        <!-- feature repository dependencies from this project -->
+        <!-- Feature repository dependencies from this project. -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>features-distribution</artifactId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- feature repository dependencies from other ODL projects -->
+        <!-- Feature repository dependencies from other ODL projects. -->
+        <!-- TODO: Use comment lines to separate ODL project blocks? -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
-            <version>${feature.aaa.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa-shiro</artifactId>
-            <version>${feature.aaa.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.alto</groupId>
             <artifactId>features-alto-release</artifactId>
-            <version>${feature.alto.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Removed from autorelease due to inactivity.
+        <dependency>
+            <groupId>org.opendaylight.atrium</groupId>
+            <artifactId>atrium-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+         -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bmp</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-extras</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-pcep</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-rsvp</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>features-bier</artifactId>
             <classifier>features</classifier>
-            <version>${feature.bier.version}</version>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.capwap</groupId>
             <artifactId>capwap-features</artifactId>
-            <version>${feature.capwap.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.cardinal</groupId>
             <artifactId>cardinal-features</artifactId>
-            <version>${feature.cardinal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Removed from autorelease due to inactivity.
+        <dependency>
+            <groupId>org.opendaylight.centinel</groupId>
+            <artifactId>centinel-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-extras</artifactId>
-            <version>${feature.controller.extras.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${feature.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-mdsal-benchmark</artifactId>
-            <version>${feature.benchmark.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm</artifactId>
-            <version>${didm.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm-hp</artifactId>
-            <version>${didm.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm-ovs</artifactId>
-            <version>${didm.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>
-            <version>${feature.dlux.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.dluxapps</groupId>
             <artifactId>features-dluxapps</artifactId>
-            <version>${feature.dluxapps.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.eman</groupId>
             <artifactId>eman-features</artifactId>
-            <version>${feature.eman.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features-faas</artifactId>
-            <version>${feature.faas.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>genius-features</artifactId>
-            <version>${feature.genius.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.groupbasedpolicy</groupId>
             <artifactId>features-groupbasedpolicy</artifactId>
-            <version>${feature.groupbasedpolicy.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.honeycomb.vbd</groupId>
             <artifactId>vbd-features</artifactId>
-            <version>${feature.honeycomb.vbd.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-features</artifactId>
-            <version>${feature.infrautils.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.iotdm</groupId>
             <artifactId>onem2mall-features</artifactId>
-            <version>${feature.iotdm.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.l2switch</groupId>
             <artifactId>features-l2switch</artifactId>
-            <version>${feature.l2switch.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Removed from autorelease due to inactivity.
+        <dependency>
+            <groupId>org.opendaylight.lacp</groupId>
+            <artifactId>features-lacp</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.lispflowmapping</groupId>
             <artifactId>features-lispflowmapping</artifactId>
-            <version>${feature.lispflowmapping.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.natapp</groupId>
             <artifactId>natapp-features</artifactId>
-            <version>${feature.natapp.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.nemo</groupId>
             <artifactId>nemo-features</artifactId>
-            <version>${feature.nemo.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-netconf</artifactId>
-            <version>${feature.netconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-netconf-connector</artifactId>
-            <version>${feature.netconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-restconf</artifactId>
-            <version>${feature.restconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>features-netvirt</artifactId>
-            <version>${feature.netvirt.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>openstack.net-virt-sfc-features</artifactId>
-            <version>${feature.netvirt.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>openstack.sfc-translator-features</artifactId>
-            <version>${feature.netvirt.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>vpnservice-features</artifactId>
-            <version>${feature.netvirt.vpnservice.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netide</groupId>
             <artifactId>netide-features</artifactId>
-            <version>${feature.netide.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>features-neutron</artifactId>
-            <version>${feature.neutron.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.nic</groupId>
             <artifactId>features-nic</artifactId>
-            <version>${feature.nic.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ocpplugin</groupId>
             <artifactId>features-ocpplugin</artifactId>
-            <version>${feature.ocpplugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-akka</artifactId>
-            <version>${feature.odlparent.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-odlparent</artifactId>
-            <version>${feature.odlparent.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>features-of-config</artifactId>
-            <version>${feature.of-config.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin</artifactId>
-            <version>${feature.openflowplugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin-he</artifactId>
-            <version>${feature.openflowplugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin-extension</artifactId>
-            <version>${feature.openflowplugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin-extension-he</artifactId>
-            <version>${feature.openflowplugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>library-features</artifactId>
-            <version>${feature.ovsdb.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>southbound-features</artifactId>
-            <version>${feature.ovsdb.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>hwvtepsouthbound-features</artifactId>
-            <version>${feature.ovsdb.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.packetcable</groupId>
             <artifactId>features-packetcable-policy</artifactId>
-            <version>${feature.packetcable.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.sdninterfaceapp</groupId>
             <artifactId>features-sdninterfaceapp</artifactId>
-            <version>${feature.sdninterfaceapp.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>features-sfc</artifactId>
-            <version>${feature.sfc.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.snbi</groupId>
             <artifactId>features-snbi</artifactId>
-            <version>${feature.snbi.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.snmp</groupId>
             <artifactId>features-snmp</artifactId>
-            <version>${snmp.plugin.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>
             <artifactId>features-snmp4sdn</artifactId>
-            <version>${feature.snmp4sdn.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>features</artifactId>
-            <version>${feature.sxp.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.topoprocessing</groupId>
             <artifactId>features-topoprocessing</artifactId>
-            <version>${feature.topoprocessing.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>features-tsdr</artifactId>
-            <version>${feature.tsdr.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ttp</groupId>
             <artifactId>features-ttp</artifactId>
-            <version>${feature.ttp.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>unimgr-features</artifactId>
-            <version>${feature.unimgr.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.usc</groupId>
             <artifactId>usc-features</artifactId>
-            <version>${feature.usc.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Removed from autorelease due to inactivity.
         <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>features-vtn-manager</artifactId>
-            <version>${feature.vtn-manager.version}</version>
+            <groupId>org.opendaylight.usecplugin</groupId>
+            <artifactId>usecplugin-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- test to validate features.xml -->
+        -->
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${feature.odlparent.version}</version>
-            <scope>test</scope>
+            <groupId>org.opendaylight.vtn</groupId>
+            <artifactId>features-vtn-manager</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
+        <!-- Removed from autorelease due to inactivity.
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${feature.odlparent.version}</version>
-            <type>zip</type>
+            <groupId>org.opendaylight.yang-push</groupId>
+            <artifactId>yangpush-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+        -->
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <!-- This generates the META-INF/maven/dependencies.properties file
-                     which is required by the versionAsInProject() used in SingleFeatureTest -->
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
-                <executions>
-                  <execution>
-                   <id>generate-dependencies.properties-file</id>
-                   <goals>
-                     <goal>generate-depends-file</goal>
-                   </goals>
-                  </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>features-create-kar</id>
-                        <goals>
-                            <goal>features-create-kar</goal>
-                        </goals>
-                        <configuration>
-                            <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
-                        </configuration>
-                    </execution>
-                </executions>
-                <!-- There is no useful configuration for the kar mojo. The features-generate-descriptor mojo configuration may be useful -->
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                        <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>org.opendaylight.odlparent:features-test</dependency>
-                    </dependenciesToScan>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/features-index/src/main/features/features.xml b/features-index/src/main/features/features.xml
new file mode 100644
index 00000000..8dfd4b6d
--- /dev/null
+++ b/features-index/src/main/features/features.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014,2017 Cisco Systems, Inc. and others.  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
+-->
+<features name="odl-integration-index-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          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">
+
+    <!--
+        Concept:
+            This file is a registry of feature repos defined in the projects.
+
+            The intent is to provide a single usable index that will pull in all available features in ODL.
+
+            No features should be defined here, only <repositories> should be listed.
+
+        Directions:
+            1) Make sure your feature file is running the tests and passing them in master:
+                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
+            2) Add your <repository> below
+            3) Go to the ../pom.xml and
+                a)  Add a dependency for your feature
+                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
+    -->
+
+
+    <!-- Please add new repository in an alphabetical order -->
+    <repository>mvn:org.opendaylight.aaa/features-aaa/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.alto/features-alto-release/{{VERSION}}/xml/features</repository>
+    <!-- Removed from autorelease due to inactivity.
+    <repository>mvn:org.opendaylight.atrium/atrium-features/{{VERSION}}/xml/features</repository>
+    -->
+    <repository>mvn:org.opendaylight.bgpcep/features-bgp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-bmp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-extras/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.capwap/capwap-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
+    <!-- Removed from autorelease due to inactivity.
+    <repository>mvn:org.opendaylight.centinel/centinel-features/{{VERSION}}/xml/features</repository>
+    -->
+    <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/features-didm/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/features-didm-hp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/features-didm-ovs/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.eman/eman-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.faas/features-faas/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.infrautils/infrautils-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.integration/features-distribution/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.iotdm/onem2mall-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
+    <!-- Removed from autorelease due to inactivity.
+    <repository>mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features</repository>
+    -->
+    <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.natapp/natapp-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.nemo/nemo-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-netconf/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netide/netide-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/features-netvirt/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/openstack.sfc-translator-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/vpnservice-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.nic/features-nic/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.odlparent/features-akka/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.of-config/features-of-config/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension-he/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/library-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.snbi/features-snbi/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.snmp/features-snmp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.tsdr/features-tsdr/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>
+    <!-- Removed from autorelease due to inactivity.
+    <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/{{VERSION}}/xml/features</repository>
+    -->
+    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/{{VERSION}}/xml/features</repository>
+    <!-- Removed from autorelease due to inactivity.
+    <repository>mvn:org.opendaylight.yang-push/yangpush-features/{{VERSION}}/xml/features</repository>
+    -->
+</features>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
deleted file mode 100644
index edab9848..00000000
--- a/features-index/src/main/resources/features.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  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
--->
-<features name="odl-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          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">
-
-    <!--
-        Concept:
-            This file is a registry of feature repos defined in the projects.
-
-            The intent is to provide a single usable index that will pull in all available features in ODL.
-
-            No features should be defined here, only <repositories> should be listed.
-
-        Directions:
-            1) Make sure your feature file is running the tests and passing them in master:
-                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
-            2) Add your <repository> below
-            3) Go to the ../pom.xml and
-                a)  Add a dependendy for your feature
-                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
-    -->
-
-
-    <!-- Please add new repository in an alphabetical order -->
-    <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bier/features-bier/${feature.bier.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.cardinal/cardinal-features/${feature.cardinal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-extras/${feature.controller.extras.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm-hp/${didm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm-ovs/${didm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${feature.dluxapps.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.eman/eman-features/${feature.eman.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.genius/genius-features/${feature.genius.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/${feature.honeycomb.vbd.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.infrautils/infrautils-features/${feature.infrautils.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.integration/features-distribution/${project.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.iotdm/onem2mall-features/${feature.iotdm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.l2switch/features-l2switch/${feature.l2switch.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.natapp/natapp-features/${feature.natapp.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.nemo/nemo-features/${feature.nemo.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-netconf/${feature.netconf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/openstack.sfc-translator-features/${feature.netvirt.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.odlparent/features-akka/${feature.odlparent.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.odlparent/features-odlparent/${feature.odlparent.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/${feature.openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension-he/${feature.openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/library-features/${feature.ovsdb.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/${feature.ovsdb.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/${feature.snmp4sdn.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sxp/features/${feature.sxp.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tsdr/features-tsdr/${feature.tsdr.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
-</features>
diff --git a/features-test/pom.xml b/features-test/pom.xml
index 056c5e5a..7ecf724f 100644
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  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,
@@ -10,12 +10,15 @@
 <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.integration</groupId>
-        <artifactId>root</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <!-- TODO: Rename to features-test when migrating to Karaf 4. -->
     <artifactId>features-integration-test</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>distribution:${project.artifactId}</name>
     <description>Sub-project building aggregate features used for feature compatibility testing.</description>
@@ -33,125 +36,24 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features-test;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <properties>
-        <features.file>features.xml</features.file>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-        <!-- dependencies on feature repos -->
+        <!-- Dependencies on feature repos. -->
         <dependency>
             <groupId>org.opendaylight.integration</groupId>
             <artifactId>features-integration-index</artifactId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- ****************************************************************************************
-                *** DO NOT ADD a <dependency> to org.opendaylight.odlparent:features-test here! ***
-               Since the introduction of the bundles-test, this lead to very weird following error:
-               java.lang.NoClassDefFoundError: Could not initialize class org.opendaylight.odlparent.featuretest.SingleFeatureTest
-               The features-test (and the bundles-test through a transitive dependency from it)
-               are already on the classpath transitively from the previous dependency above,
-               so it works without repeating it here.  Why repeating it here, which should
-               have no effect in Maven, leads to the NoClassDefFoundError, is one of the
-               currently unsolved mysteries of the universe.
-             **************************************************************************************** -->
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${feature.odlparent.version}</version>
-            <type>zip</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <!-- This generates the META-INF/maven/dependencies.properties file
-                     which is required by the versionAsInProject() used in SingleFeatureTest -->
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
-                <executions>
-                  <execution>
-                   <id>generate-dependencies.properties-file</id>
-                   <goals>
-                     <goal>generate-depends-file</goal>
-                   </goals>
-                  </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>features-create-kar</id>
-                        <goals>
-                            <goal>features-create-kar</goal>
-                        </goals>
-                        <configuration>
-                            <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
-                        </configuration>
-                    </execution>
-                </executions>
-                <!-- There is no useful configuration for the kar mojo. The features-generate-descriptor mojo configuration may be useful -->
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                        <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>org.opendaylight.odlparent:features-test</dependency>
-                    </dependenciesToScan>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/features-test/src/main/features/features.xml b/features-test/src/main/features/features.xml
new file mode 100644
index 00000000..10c4b99d
--- /dev/null
+++ b/features-test/src/main/features/features.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014 Cisco Systems, Inc. and others.  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
+-->
+<features name="odl-integration-test-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          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">
+
+    <!--
+        Concept:
+            This file is a registry of features defined in the projects for use in integration testing.
+
+            The intent is to capture high level (not low level features).  This means a project
+            may have features that are not listed here.  That is fine.  Only the stuff you think
+            end users would want to install should be indexed here.
+
+            There are two kinds of features defined here:
+
+            odl-integration-compatible-with-all - to list high level features that don't have compatibility
+                issues
+
+            odl-integration-all - to list all features available in OpenDaylighthigh level features
+                that have compatibility issues with some other features.  This feature includes
+                odl-integration-compatible-with-all
+
+        Directions:
+            1) Make sure your feature file is running the tests and passing them in master:
+                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
+            2) Add your <repository> to integration/features/index/src/main/resources/features.xml
+            3) If and ONLY if your top level feature is compatible with everything, add it to
+                odl-integration-compatible-with-all
+            4) If and ONLY if your top level feature is incompatible with other things, add it to
+                odl-integration-all
+            5) Go to the ../pom.xml and
+                a)  Add a dependendy for your feature
+                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
+
+            Important note: None of the features defined in this file will be in the integration/karaf build by default
+                            because that is what we ship, and test features should not by default ship.
+                            Please be aware that the features pulled in via features-integration-repo from the projects
+                            *will* be.  Its only these aggregating test features that will be missing.
+                            If you need to have these test features defined in this file (for example if you are doing
+                            integration testing) then:
+                            cd integration/distributions/karaf
+                            perl -i -pe "s/features-integration-index/features-integration-test/" target/assembly/etc/org.apache.karaf.features.cfg
+                            and they will be present and availble
+    -->
+    <!-- The features-integration-index should be the one and only repository in this file.
+        If you think another repository is needed, please add it to integration/features/index/src/main/resource/features.xml
+    -->
+    <repository>mvn:org.opendaylight.integration/features-integration-index/{{VERSION}}/xml/features</repository>
+
+    <!-- Please use alphabetical order to add a compatible with all features -->
+    <feature name='odl-integration-compatible-with-all' version='${project.version}'>
+        <feature>odl-aaa-authn</feature>
+        <feature>odl-aaa-shiro</feature>
+        <feature>odl-aaa-netconf-plugin</feature>
+        <feature>odl-bgpcep-bgp-all</feature>
+        <feature>odl-bgpcep-bmp</feature>
+        <feature>odl-bgpcep-pcep-all</feature>
+        <feature>odl-bgpcep-rsvp</feature>
+        <feature>odl-capwap-ac-rest</feature>
+        <feature>odl-cardinal</feature>
+        <!-- Commented out because two of the features lead to Yang pares errors.
+            Also, removed from autorelease due to inactivity.
+        <feature>odl-centinel-core</feature>
+        <feature>odl-centinel-laas</feature>
+        <feature>odl-centinel-streamhandler</feature>
+        <feature>odl-centinel-ui</feature>
+        -->
+        <feature>odl-didm-all</feature>
+        <feature>odl-dlux-core</feature>
+        <feature>odl-distribution-version</feature>
+        <feature>odl-eman</feature>
+        <feature>odl-eman-rest</feature>
+        <feature>odl-eman-ui</feature>
+        <feature>odl-lispflowmapping-msmr</feature>
+        <feature>odl-lispflowmapping-ui</feature>
+        <feature>odl-mdsal-benchmark</feature>
+        <feature>odl-mdsal-broker</feature>
+        <feature>odl-nemo-engine</feature>
+        <feature>odl-nemo-engine-rest</feature>
+        <feature>odl-nemo-engine-ui</feature>
+        <!-- Failed netide merge job makes distribution fail
+        <feature>odl-netide-rest</feature>
+        <feature>odl-netide-app</feature>
+        -->
+        <feature>odl-neutron-service</feature>
+        <feature>odl-ocpplugin-all</feature>
+        <feature>odl-openflowplugin-flow-services</feature>
+        <feature>odl-openflowplugin-flow-services-rest</feature>
+        <feature>odl-openflowplugin-flow-services-ui</feature>
+        <feature>odl-openflowplugin-nxm-extensions</feature>
+        <feature>odl-ovsdb-hwvtepsouthbound</feature>
+        <feature>odl-ovsdb-library</feature>
+        <feature>odl-ovsdb-southbound-impl</feature>
+        <feature>odl-packetcable-policy-server-all</feature>
+        <feature>odl-restconf-noauth</feature>
+        <feature>odl-sdninterfaceapp-all</feature>
+        <feature>odl-sfc-netconf</feature>
+        <feature>odl-sfc-ovs</feature>
+        <feature>odl-sfc-sb-rest</feature>
+        <feature>odl-sfc-test-consumer</feature>
+        <feature>odl-sfc-ui</feature>
+        <feature>odl-sfclisp</feature>
+        <feature>odl-sxp-controller</feature>
+        <feature>odl-snmp-plugin</feature>
+        <!-- Issues with yang parser show up in aaa distribution-check
+        <feature>odl-snmp4sdn-all</feature>
+        -->
+        <feature>odl-topoprocessing-i2rs</feature>
+        <feature>odl-topoprocessing-inventory</feature>
+        <feature>odl-topoprocessing-inventory-rendering</feature>
+        <feature>odl-topoprocessing-mlmt</feature>
+        <feature>odl-topoprocessing-network-topology</feature>
+        <feature>odl-ttp-all</feature>
+        <feature>odl-usc-channel</feature>
+        <feature>odl-usc-channel-rest</feature>
+        <feature>odl-usc-channel-ui</feature>
+        <!-- Removed from autorelease due to inactivity.
+        <feature>odl-usecplugin-aaa</feature>
+        <feature>odl-usecplugin-openflow</feature>
+        -->
+    </feature>
+
+    <!-- Please use alphabetical order for non-compatible features -->
+    <feature name='odl-integration-all' version='${project.version}'>
+        <feature>odl-alto-release</feature>
+        <!-- Removed from autorelease due to inactivity.
+        <feature>odl-atrium-all</feature>
+        -->
+        <feature>odl-bier-all</feature>
+        <feature>odl-faas-base</feature>
+        <feature>odl-genius-rest</feature>
+        <feature>odl-groupbasedpolicy-faas</feature>
+        <feature>odl-groupbasedpolicy-iovisor</feature>
+        <feature>odl-groupbasedpolicy-neutronmapper</feature>
+        <feature>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
+        <feature>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
+        <feature>odl-groupbasedpolicy-ne-location-provider</feature>
+        <feature>odl-groupbasedpolicy-ofoverlay</feature>
+        <feature>odl-groupbasedpolicy-sxp-ep-provider</feature>
+        <feature>odl-groupbasedpolicy-ui</feature>
+        <feature>odl-groupbasedpolicy-vpp</feature>
+        <feature>odl-integration-compatible-with-all</feature>
+        <!-- Commenting this feature due to an issue with Jetty server
+        <feature>odl-iotdm-onem2m</feature>
+        -->
+        <feature>odl-l2switch-switch</feature>
+        <feature>odl-l2switch-switch-rest</feature>
+        <feature>odl-l2switch-switch-ui</feature>
+        <!-- Commented out, because LACP brings in Li designed OpenFlowPlugin
+            which leads to BindException.
+            Also, removed from autorelease due to inactivity.
+        <feature>odl-lacp-ui</feature>
+        -->
+        <feature>odl-natapp</feature>
+        <feature>odl-natapp-api</feature>
+        <!-- The following two Netconf features are incompatible with each other.
+        As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
+        <feature>odl-netconf-clustered-topology</feature>
+        <feature>odl-netconf-connector-ssh</feature>
+        <feature>odl-netvirt-openstack</feature>
+        <feature>odl-netvirt-openstack-sfc-translator</feature>
+        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
+            which leads to BindException.
+        <feature>odl-nic-core-mdsal</feature>
+        -->
+        <feature>odl-of-config-all</feature>
+        <feature>odl-ovsdb-openstack</feature>
+        <feature>odl-ovsdb-sfc</feature>
+        <feature>odl-snbi-all</feature>
+        <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
+        <feature>odl-sfc-ios-xe-renderer</feature>
+        -->
+        <feature>odl-sfc-openflow-renderer</feature>
+        <!-- Issues with yang parser show up in aaa distribution-check
+        <feature>odl-tsdr-hsqldb-all</feature>
+        -->
+        <feature>odl-unimgr</feature>
+        <feature>odl-vtn-manager-neutron</feature>
+        <feature>odl-vtn-manager-rest</feature>
+        <!-- Removed from autorelease due to inactivity.
+        <feature>odl-yangpush</feature>
+        <feature>odl-yangpush-api</feature>
+        -->
+    </feature>
+
+</features>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
deleted file mode 100644
index 73896757..00000000
--- a/features-test/src/main/resources/features.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  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
--->
-<features name="odl-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          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">
-
-    <!--
-        Concept:
-            This file is a registry of features defined in the projects for use in integration testing.
-
-            The intent is to capture high level (not low level features).  This means a project
-            may have features that are not listed here.  That is fine.  Only the stuff you think
-            end users would want to install should be indexed here.
-
-            There are two kinds of features defined here:
-
-            odl-integration-compatible-with-all - to list high level features that don't have compatibility
-                issues
-
-            odl-integration-all - to list all features available in OpenDaylighthigh level features
-                that have compatibility issues with some other features.  This feature includes
-                odl-integration-compatible-with-all
-
-        Directions:
-            1) Make sure your feature file is running the tests and passing them in master:
-                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
-            2) Add your <repository> to integration/features/index/src/main/resources/features.xml
-            3) If and ONLY if your top level feature is compatible with everything, add it to
-                odl-integration-compatible-with-all
-            4) If and ONLY if your top level feature is incompatible with other things, add it to
-                odl-integration-all
-            5) Go to the ../pom.xml and
-                a)  Add a dependendy for your feature
-                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
-
-            Important note: None of the features defined in this file will be in the integration/karaf build by default
-                            because that is what we ship, and test features should not by default ship.
-                            Please be aware that the features pulled in via features-integration-repo from the projects
-                            *will* be.  Its only these aggregating test features that will be missing.
-                            If you need to have these test features defined in this file (for example if you are doing
-                            integration testing) then:
-                            cd integration/distributions/karaf
-                            perl -i -pe "s/features-integration-index/features-integration-test/" target/assembly/etc/org.apache.karaf.features.cfg
-                            and they will be present and availble
-    -->
-    <!-- The features-integration-index should be the one and only repository in this file.
-        If you think another repository is needed, please add it to integration/features/index/src/main/resource/features.xml
-    -->
-    <repository>mvn:org.opendaylight.integration/features-integration-index/${project.version}/xml/features</repository>
-
-    <!-- Please use alphabetical order to add a compatible with all features -->
-    <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <feature version='${feature.aaa.version}'>odl-aaa-authn</feature>
-        <feature version='${feature.aaa.version}'>odl-aaa-shiro</feature>
-        <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
-        <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
-        <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
-        <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
-        <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
-        <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
-        <feature version='${feature.cardinal.version}'>odl-cardinal</feature>
-        <feature version='${didm.version}'>odl-didm-all</feature>
-        <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
-        <feature version='${project.version}'>odl-distribution-version</feature>
-        <feature version='${feature.eman.version}'>odl-eman</feature>
-        <feature version='${feature.eman.version}'>odl-eman-rest</feature>
-        <feature version='${feature.eman.version}'>odl-eman-ui</feature>
-        <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
-        <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
-        <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
-        <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
-        <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
-        <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
-        <!-- Failed netide merge job makes distribution fail
-        <feature version='${feature.netide.version}'>odl-netide-rest</feature>
-        <feature version='${feature.netide.version}'>odl-netide-app</feature>
-        -->
-        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
-        <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-hwvtepsouthbound</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
-        <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
-        <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
-        <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
-        <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
-        <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
-        <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
-        <!-- Issues with yang parser show up in aaa distribution-check
-        <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
-        -->
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory-rendering</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
-        <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
-        <feature version='${feature.usc.version}'>odl-usc-channel</feature>
-        <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
-        <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-    </feature>
-
-    <!-- Please use alphabetical order for non-compatible features -->
-    <feature name='odl-integration-all' version='${project.version}'>
-        <feature version='${feature.alto.version}'>odl-alto-release</feature>
-        <feature version='${feature.bier.version}'>odl-bier-all</feature>
-        <feature version='${feature.faas.version}'>odl-faas-base</feature>
-        <feature version='${feature.genius.version}'>odl-genius-rest</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-ep-provider</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-vpp</feature>
-        <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
-        <!-- Commenting this feature due to an issue with Jetty server
-        <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
-        -->
-        <feature version='${feature.l2switch.version}'>odl-l2switch-switch</feature>
-        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-rest</feature>
-        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-ui</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
-        <!-- The following two Netconf features are incompatible with each other.
-        As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
-        <feature version='${feature.netconf.version}'>odl-netconf-clustered-topology</feature>
-        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
-        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
-        <feature version='${feature.netvirt.version}'>odl-netvirt-openstack-sfc-translator</feature>
-        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
-            which leads to BindException.
-        <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
-        -->
-        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
-        <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
-        <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
-        <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
-        <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
-        <feature version='${feature.sfc.version}'>odl-sfc-ios-xe-renderer</feature>
-        -->
-        <feature version='${feature.sfc.version}'>odl-sfc-openflow-renderer</feature>
-        <!-- Issues with yang parser show up in aaa distribution-check
-        <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
-        -->
-        <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
-        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
-        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
-    </feature>
-
-</features>
diff --git a/pom.xml b/pom.xml
index 9cfd133b..a1d13941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  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
+-->
 <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>odlparent</artifactId>
+        <artifactId>odlparent-lite</artifactId>
         <version>1.8.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.integration</groupId>
-    <artifactId>root</artifactId>
+    <artifactId>agregator</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <!-- <name> value is used by Sonar to set project name -->
@@ -28,64 +36,9 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <properties>
-        <!-- Keep this list sorted alphabetically please -->
-        <didm.version>0.4.0-SNAPSHOT</didm.version>
-        <feature.aaa.version>0.5.0-SNAPSHOT</feature.aaa.version>
-        <feature.alto.version>0.4.0-SNAPSHOT</feature.alto.version>
-        <feature.benchmark.version>1.3.0-SNAPSHOT</feature.benchmark.version>
-        <feature.bgpcep.version>0.7.0-SNAPSHOT</feature.bgpcep.version>
-        <feature.bier.version>0.1.0-SNAPSHOT</feature.bier.version>
-        <feature.capwap.version>0.4.0-SNAPSHOT</feature.capwap.version>
-        <feature.cardinal.version>0.2.0-SNAPSHOT</feature.cardinal.version>
-        <feature.controller.config.version>0.6.0-SNAPSHOT</feature.controller.config.version>
-        <feature.controller.extras.version>1.8.0-SNAPSHOT</feature.controller.extras.version>
-        <feature.dlux.version>0.5.0-SNAPSHOT</feature.dlux.version>
-        <feature.dluxapps.version>0.5.0-SNAPSHOT</feature.dluxapps.version>
-        <feature.eman.version>1.1.0-SNAPSHOT</feature.eman.version>
-        <feature.faas.version>1.2.0-SNAPSHOT</feature.faas.version>
-        <feature.flow.version>1.5.0-SNAPSHOT</feature.flow.version>
-        <feature.genius.version>0.2.0-SNAPSHOT</feature.genius.version>
-        <feature.groupbasedpolicy.version>0.5.0-SNAPSHOT</feature.groupbasedpolicy.version>
-        <feature.honeycomb.vbd.version>1.1.0-SNAPSHOT</feature.honeycomb.vbd.version>
-        <feature.infrautils.version>1.1.0-SNAPSHOT</feature.infrautils.version>
-        <feature.iotdm.version>0.3.0-SNAPSHOT</feature.iotdm.version>
-        <feature.l2switch.version>0.5.0-SNAPSHOT</feature.l2switch.version>
-        <feature.lispflowmapping.version>1.5.0-SNAPSHOT</feature.lispflowmapping.version>
-        <feature.mdsal.version>1.5.0-SNAPSHOT</feature.mdsal.version>
-        <feature.natapp.version>0.2.0-SNAPSHOT</feature.natapp.version>
-        <feature.nemo.version>1.2.0-SNAPSHOT</feature.nemo.version>
-        <feature.netconf.version>1.2.0-SNAPSHOT</feature.netconf.version>
-        <feature.netide.version>0.3.0-SNAPSHOT</feature.netide.version>
-        <feature.netvirt.version>1.4.0-SNAPSHOT</feature.netvirt.version>
-        <feature.netvirt.vpnservice.version>0.4.0-SNAPSHOT</feature.netvirt.vpnservice.version>
-        <feature.nic.version>1.3.0-SNAPSHOT</feature.nic.version>
-        <feature.neutron.version>0.8.0-SNAPSHOT</feature.neutron.version>
-        <feature.ocpplugin.version>0.2.0-SNAPSHOT</feature.ocpplugin.version>
-        <feature.odlparent.version>1.8.0-SNAPSHOT</feature.odlparent.version>
-        <feature.of-config.version>1.2.0-SNAPSHOT</feature.of-config.version>
-        <feature.openflowplugin.version>0.4.0-SNAPSHOT</feature.openflowplugin.version>
-        <feature.ovsdb.version>1.4.0-SNAPSHOT</feature.ovsdb.version>
-        <feature.packetcable.version>1.5.0-SNAPSHOT</feature.packetcable.version>
-        <feature.restconf.version>1.5.0-SNAPSHOT</feature.restconf.version>
-        <feature.sdninterfaceapp.version>1.8.0-SNAPSHOT</feature.sdninterfaceapp.version>
-        <feature.sfc.version>0.5.0-SNAPSHOT</feature.sfc.version>
-        <feature.snbi.version>1.4.0-SNAPSHOT</feature.snbi.version>
-        <feature.snmp4sdn.version>0.5.0-SNAPSHOT</feature.snmp4sdn.version>
-        <feature.sxp.version>1.4.0-SNAPSHOT</feature.sxp.version>
-        <feature.topoprocessing.version>0.3.0-SNAPSHOT</feature.topoprocessing.version>
-        <feature.tsdr.version>1.3.0-SNAPSHOT</feature.tsdr.version>
-        <feature.ttp.version>0.4.0-SNAPSHOT</feature.ttp.version>
-        <feature.unimgr.version>0.2.0-SNAPSHOT</feature.unimgr.version>
-        <feature.usc.version>1.3.0-SNAPSHOT</feature.usc.version>
-        <feature.vtn-manager.version>0.6.0-SNAPSHOT</feature.vtn-manager.version>
-        <feature.yangtools.version>1.1.0-SNAPSHOT</feature.yangtools.version>
-        <karaf.branding.version>1.4.0-SNAPSHOT</karaf.branding.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <snmp.plugin.version>1.3.0-SNAPSHOT</snmp.plugin.version>
-        <!-- Keep this list sorted alphabetically please -->
-    </properties>
     <modules>
+        <!-- Keep this list sorted alphabetically please -->
+        <module>artifacts</module>
         <module>distribution-karaf</module>
         <module>features-distribution</module>
         <module>features-index</module>
diff --git a/version/pom.xml b/version/pom.xml
index 6a4236db..c5759267 100644
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2016-2017 Cisco Systems, Inc. and others.  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
+-->
 <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>
@@ -31,19 +39,4 @@
     <properties>
         <feature.odlparent.version>1.8.0-SNAPSHOT</feature.odlparent.version>
     </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                    <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
-- 
2.36.6