X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=pom.xml;h=67ae2e9833b8b61462a6cc2b21bbba3942840c7d;hp=5ac8087e2ee856c94fa298f0431b3d51a1145803;hb=29bb6776c62775c5dc73789e4a63d1dc12cc8a64;hpb=df4aabedd8d9a63da661845c70042102f36a14b5

diff --git a/pom.xml b/pom.xml
index 5ac8087e2e..67ae2e9833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,64 +2,48 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>opendaylight/commons/parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+  <groupId>org.opendaylight.controller</groupId>
   <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>
-
-    <!-- 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> -->
+  <name>controller</name>
+  <!-- Used by Sonar to set project name -->
 
-    <module>third-party/commons/thirdparty</module>
+  <modules>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>
     <!-- config -->
     <module>opendaylight/config</module>
-    <!-- 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>
+    <module>opendaylight/model</module>
 
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>
     <module>opendaylight/commons/protocol-framework</module>
     <module>opendaylight/commons/checkstyle</module>
     <module>opendaylight/commons/opendaylight</module>
-    <module>opendaylight/commons/parent</module>
     <module>opendaylight/commons/logback_settings</module>
     <module>opendaylight/commons/filter-valve</module>
     <module>opendaylight/commons/liblldp</module>
+    <module>opendaylight/commons/enunciate-parent</module>
+    <module>benchmark</module>
+    <module>opendaylight/commons/jolokia</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 -->
     <module>opendaylight/archetypes</module>
   </modules>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>