Fix Acl.getAccessListEntries() NPE

[netvirt.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 982369a80d0971245dcfdcf6b6bd9a465669c5de..95daf2eea870e3e03b8ea5f8d9acbd8c21045b22 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.8</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
     <artifactId>netvirt-aggregator</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <name>netvirt</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
@@ -51,7 +51,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <module>artifacts</module>
         <module>bgpmanager</module>
         <module>cache</module>
-        <module>coe</module>
         <module>commons</module>
         <module>dhcpservice</module>
         <module>elanmanager</module>
@@ -81,6 +80,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <!-- When enabled, this empty profile disables the “sfc” profile above -->
             <id>no-sfc</id>
         </profile>
+        <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>
 
     <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->