X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=pom.xml;h=a0a00871c87a0dbe486c2f2fd1881e9ddedd2eb8;hp=822d29ac46b1395aed02c1ae1b5565759ce99438;hb=8da08c9f008d371c491cf6b35494ca36c2ebdcb9;hpb=a0d094b300bad73ef53a56891efd6ce055156a4b

diff --git a/pom.xml b/pom.xml
index 822d29ac46..a0a00871c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <artifactId>odlparent-lite</artifactId>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>releasepom</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>controller</name>
   <!-- Used by Sonar to set project name -->
@@ -23,15 +23,11 @@
 
     <module>opendaylight/model</module>
 
+    <module>opendaylight/blueprint</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/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>karaf</module>
@@ -39,7 +35,55 @@
 
     <!-- archetypes -->
     <module>opendaylight/archetypes</module>
+
+    <!-- documentation -->
+    <module>docs</module>
   </modules>
+
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>sonar-jacoco-aggregate</id>
+      <activation>
+        <property>
+          <name>odl.jacoco.aggregateFile</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>merge</id>
+                <goals>
+                    <goal>merge</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <destFile>${odl.jacoco.aggregateFile}</destFile>
+                  <fileSets>
+                    <fileSet>
+                      <directory>${project.basedir}</directory>
+                      <includes>
+                        <include>**/target/code-coverage/*.exec</include>
+                      </includes>
+                    </fileSet>
+                  </fileSets>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>