Merge "Fix missing log argument"

[controller.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3bfffaa5d468f30444fa88482ac4b63a2a2787f1..f588f3f17c68bca7891f1d2856287104f908a308 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,10 +13,6 @@
   <packaging>pom</packaging>
   <name>controller</name> <!-- Used by Sonar to set project name -->
 
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-
   <modules>
 
     <!-- md-sal -->
@@ -45,10 +41,7 @@
     <module>opendaylight/commons/liblldp</module>
 
     <!-- Karaf Distribution -->
-    <module>opendaylight/karaf-branding</module>
-    <module>opendaylight/distribution/opendaylight-karaf-empty</module>
-    <module>opendaylight/distribution/opendaylight-karaf</module>
-    <module>opendaylight/distribution/opendaylight-karaf-resources</module>
+    <module>karaf</module>
     <module>features</module>
 
     <!-- archetypes -->