X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=features%2Fpom.xml;h=f5e33eb59f6a357d366789ff4847efe99b83682c;hp=185b0263bd4ae4bf83b34184053ec752c011bf04;hb=fb07b65fda9672f38f9c995853d6c77504fa9755;hpb=2b61b9f35adcd877cfc5cec01eac6f9ca0c3a854

diff --git a/features/pom.xml b/features/pom.xml
index 185b0263bd..f5e33eb59f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,13 +11,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>1.15.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -26,30 +26,33 @@
   </properties>
 
   <modules>
-    <!-- Single features, to be cleaned up -->
-    <module>odl-benchmark-api</module>
+    <!-- Common infra to cut down definitions -->
+    <module>single-feature-parent</module>
+
+    <!-- Production features -->
+    <module>features-controller</module>
+
+    <!-- Experimental features -->
+    <module>features-controller-experimental</module>
+    <module>odl-controller-exp-netty-config</module>
+    <module>odl-controller-exp-messagebus</module>
+
+    <!-- CSIT features -->
+    <module>features-controller-testing</module>
     <module>odl-clustering-test-app</module>
-    <module>odl-config-netty</module>
+    <module>odl-mdsal-benchmark</module>
+
+    <!-- Single features, to be cleaned up -->
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
     <module>odl-controller-model-topology</module>
-    <module>odl-dsbenchmark</module>
     <module>odl-jolokia</module>
-    <module>odl-mdsal-benchmark</module>
     <module>odl-mdsal-broker-local</module>
     <module>odl-mdsal-broker</module>
     <module>odl-mdsal-clustering-commons</module>
     <module>odl-mdsal-distributed-datastore</module>
     <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>
-    <module>odl-message-bus-collector</module>
-    <module>odl-ntfbenchmark</module>
     <module>odl-toaster</module>
-
-    <!-- Repositories, to be cleaned up -->
-    <module>features-config-netty</module>
-    <module>features-extras</module>
-    <module>features-mdsal</module>
-    <module>features-mdsal-benchmark</module>
   </modules>
 </project>