X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=a4c684d60f2f1dd601e25b4baecb64564a6b16bc;hb=79dec27f1dd72f1a6cf257385c4cf9b723f8ecd6;hp=c890579548e26bacd1cce0d6d25dbe64b693886b;hpb=4e8f02472777bc2ed0461f799089cbcb48f25a4c;p=netvirt.git

diff --git a/pom.xml b/pom.xml
index c890579548..a4c684d60f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.2</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
     <artifactId>netvirt-aggregator</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ODL :: netvirt :: ${project.artifactId}</name>
+    <version>0.10.0-SNAPSHOT</version>
+    <name>netvirt</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,14 +45,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
     </scm>
 
+    <properties>
+        <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+
+    </properties>
+
     <modules>
         <module>aclservice</module>
         <module>alarm</module>
         <module>artifacts</module>
         <module>bgpmanager</module>
         <module>cache</module>
-        <module>cloud-servicechain</module>
-        <module>coe</module>
         <module>commons</module>
         <module>dhcpservice</module>
         <module>elanmanager</module>
@@ -68,39 +73,55 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <module>vpnmanager</module>
     </modules>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <!-- Downgrade javadoc plugin, as 3.1.0+ breaks with maven.compiler.release=11 + javadoc:aggregate -->
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <profiles>
         <profile>
-            <id>sfc</id>
+            <id>sonar-jacoco-aggregate</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>odl.jacoco.aggregateFile</name>
+                </property>
             </activation>
-            <modules>
-                <module>sfc</module>
-            </modules>
-        </profile>
-        <profile>
-            <!-- When enabled, this empty profile disables the “sfc” profile above -->
-            <id>no-sfc</id>
+            <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>
 
-    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>