X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=pom.xml;h=4798184bcfbb3277845e310c8ddf6b51995fe481;hp=d1e5494b44cd6409adc99da6b5daf9e6af2bbc4b;hb=1f69678cc0dd17e1161ed9274cc2aff9b384b8ac;hpb=915a86bcff78e373ae9487e19f5e24828ccc1e9b

diff --git a/pom.xml b/pom.xml
index d1e5494b44..4798184bcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,25 +4,17 @@
   <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>
-  <modules>
-    <module>opendaylight/distribution/opendaylight</module>
+  <name>controller</name>
+  <!-- Used by Sonar to set project name -->
 
-    <!-- third-parties uncomment them if you need snapshot version of it -->
-    <!-- <module>third-party/openflowj</module> -->
-    <!-- <module>third-party/net.sf.jung2</module> -->
-    <!-- <module>third-party/jersey-servlet</module> -->
-    <!-- <module>third-party/org.apache.catalina.filters.CorsFilter</module> -->
-
-    <module>third-party/commons/thirdparty</module>
+  <modules>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>
@@ -31,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>
@@ -48,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 -->
@@ -65,16 +47,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
   </scm>
-
-  <profiles>
-    <profile>
-      <id>integrationtests</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <module>opendaylight/distribution/sanitytest/</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>