X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=pom.xml;h=2b93ad99fd678539c110e7484cb6820ceed27195;hp=26c99151e2059d32ed2b43af78856da8b2a2d51f;hb=b65e66f7b1bafb0d0c5fbe1c569835eb890f672a;hpb=85d4c434b528287861e1c99d594d585570740d65

diff --git a/pom.xml b/pom.xml
index 26c99151e2..2b93ad99fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,24 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>releasepom</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>2.0.4-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>
@@ -26,10 +33,6 @@
     <module>opendaylight/blueprint</module>
 
     <!-- Parents -->
-    <module>opendaylight/commons/protocol-framework</module>
-    <module>opendaylight/commons/logback_settings</module>
-    <module>opendaylight/commons/filter-valve</module>
-    <module>opendaylight/commons/liblldp</module>
     <module>benchmark</module>
     <module>opendaylight/commons/jolokia</module>
 
@@ -37,35 +40,53 @@
     <module>karaf</module>
     <module>features</module>
 
-    <!-- archetypes -->
-    <module>opendaylight/archetypes</module>
+    <!-- documentation -->
+    <module>docs</module>
   </modules>
-  <scm>
-    <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>
-  </scm>
 
   <profiles>
-    <!-- Turn off doclint on aggregated API javadoc build. -->
     <profile>
-      <id>jdk8</id>
+      <id>sonar-jacoco-aggregate</id>
       <activation>
-        <jdk>[1.8,)</jdk>
+        <property>
+          <name>odl.jacoco.aggregateFile</name>
+        </property>
       </activation>
-
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
+            <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>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>