Bug 2358 - Resources for tests json to nn

[controller.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 87a69e00c983bd5da9a232b7a2ace8327bfea792..4798184bcfbb3277845e310c8ddf6b51995fe481 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,16 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>opendaylight/commons/parent</relativePath>
   </parent>
+
   <artifactId>releasepom</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
+  <name>controller</name>
+  <!-- Used by Sonar to set project name -->
+
   <modules>
 
     <!-- md-sal -->
@@ -22,14 +23,6 @@
     <!-- netconf -->
     <module>opendaylight/netconf</module>
 
-    <!-- adsal -->
-    <module>opendaylight/adsal</module>
-
-    <!--  Neutron -->
-    <module>opendaylight/networkconfiguration/neutron</module>
-    <module>opendaylight/networkconfiguration/neutron/implementation</module>
-    <module>opendaylight/networkconfiguration/neutron/northbound</module>
-
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>
     <module>opendaylight/commons/protocol-framework</module>
@@ -39,12 +32,10 @@
     <module>opendaylight/commons/logback_settings</module>
     <module>opendaylight/commons/filter-valve</module>
     <module>opendaylight/commons/liblldp</module>
+    <module>opendaylight/commons/enunciate-parent</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 -->