X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fpom.xml;h=bf4f405613c0016cec1a438448fd932c006fa572;hb=797cb70db891a314b16929d0800d17bb5d61ae5a;hp=ad73a9809c4bfc72a4e433429b2b8e085f5db65d;hpb=7b14be335e2b0b0aaad8f6f4a4cd438d0c96dcf3;p=controller.git

diff --git a/features/pom.xml b/features/pom.xml
index ad73a9809c..bf4f405613 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>12.0.5</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>1.15.0-SNAPSHOT</version>
+  <version>7.0.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -29,6 +29,9 @@
     <!-- 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>
@@ -38,22 +41,19 @@
     <module>odl-clustering-test-app</module>
     <module>odl-mdsal-benchmark</module>
 
+    <!-- Scala/Akka features -->
+    <module>odl-controller-scala</module>
+    <module>odl-controller-akka</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-jolokia</module>
-    <module>odl-mdsal-broker-local</module>
+    <module>odl-controller-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-toaster</module>
-
-    <!-- Repositories, to be cleaned up -->
-    <module>features-extras</module>
-    <module>features-mdsal</module>
   </modules>
 </project>