X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=pom.xml;h=83e352261850f0d12474971c7491b62b3ef649b9;hp=49259ea2d330e882bf8dd64b09c34b5fc1bbd345;hb=3a46849076d34a2543a1445d885ea2634f961646;hpb=72def9b51c0f073acdd4cf8f71ee567cbd78cf06

diff --git a/pom.xml b/pom.xml
index 49259ea2d3..83e3522618 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,24 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>releasepom</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>1.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>controller</name>
   <!-- Used by Sonar to set project name -->
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
+    <module>artifacts</module>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>
@@ -23,15 +30,9 @@
 
     <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>
 
@@ -39,9 +40,49 @@
     <module>karaf</module>
     <module>features</module>
 
-    <!-- archetypes -->
-    <module>opendaylight/archetypes</module>
+    <!-- documentation -->
+    <module>docs</module>
   </modules>
+
+  <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>