Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: I1db3ce73fd7733372caab5a13c981e62a8d58074
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/aaf/pom.xml b/aaf/pom.xml
index 6e96587..a611575 100644 (file)
--- a/aaf/pom.xml
+++ b/aaf/pom.xml
@@ -42,7 +42,7 @@
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
-               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>\r
+               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
                <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
@@ -209,91 +209,56 @@
                        </plugin> \r
                        \r
                        <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <!-- Note: This exclusion list should match <sonar.exclusions>\r
-         property above -->\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-            <!--\r
-        Prepares the property pointing to the JaCoCo runtime agent which\r
-        is passed as VM argument when Maven the Surefire plugin is executed.\r
-        -->\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for unit tests is created after\r
-        unit tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for integration tests after\r
-        integration tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>                    \r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin>      \r
 \r
                </plugins>\r
        </build>\r

diff --git a/cass/pom.xml b/cass/pom.xml
index 3a04181..f217a22 100644 (file)
--- a/cass/pom.xml
+++ b/cass/pom.xml
@@ -42,7 +42,7 @@
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
-               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>\r
+               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
                <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
@@ -130,91 +130,56 @@
                                </configuration>\r
                        </plugin> \r
                        <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <!-- Note: This exclusion list should match <sonar.exclusions>\r
-         property above -->\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-            <!--\r
-        Prepares the property pointing to the JaCoCo runtime agent which\r
-        is passed as VM argument when Maven the Surefire plugin is executed.\r
-        -->\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for unit tests is created after\r
-        unit tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for integration tests after\r
-        integration tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>                    \r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin>   \r
 \r
                </plugins>\r
        </build>\r

diff --git a/client/pom.xml b/client/pom.xml
index 67adf37..765a110 100644 (file)
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -42,7 +42,7 @@
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
-               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>\r
+               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
                <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
@@ -123,91 +123,56 @@
                        </plugin>\r
 \r
 <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <!-- Note: This exclusion list should match <sonar.exclusions>\r
-         property above -->\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-            <!--\r
-        Prepares the property pointing to the JaCoCo runtime agent which\r
-        is passed as VM argument when Maven the Surefire plugin is executed.\r
-        -->\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for unit tests is created after\r
-        unit tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for integration tests after\r
-        integration tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>                    \r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin>          \r
 \r
                </plugins>\r
        </build>\r

diff --git a/core/pom.xml b/core/pom.xml
index 32ad054..6979663 100644 (file)
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -144,93 +144,57 @@
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\r
                        </plugin> \r
-                       \r
                        <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <!-- Note: This exclusion list should match <sonar.exclusions>\r
-         property above -->\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-            <!--\r
-        Prepares the property pointing to the JaCoCo runtime agent which\r
-        is passed as VM argument when Maven the Surefire plugin is executed.\r
-        -->\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for unit tests is created after\r
-        unit tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for integration tests after\r
-        integration tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>                    \r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin>\r
 \r
                </plugins>\r
        </build>\r

diff --git a/pom.xml b/pom.xml
index 97d1204..bd51850 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
+               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
@@ -461,91 +461,56 @@
                        </plugin> 
                        
                        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-          <configuration>
-            <!-- Note: This exclusion list should match <sonar.exclusions>
-         property above -->
-            <excludes>
-              <exclude>**/gen/**</exclude>
-              <exclude>**/generated-sources/**</exclude>
-              <exclude>**/yang-gen/**</exclude>
-              <exclude>**/pax/**</exclude>
-            </excludes>
-          </configuration>
-          <executions>
-            <!--
-        Prepares the property pointing to the JaCoCo runtime agent which
-        is passed as VM argument when Maven the Surefire plugin is executed.
-        -->
-            <execution>
-              <id>pre-unit-test</id>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
-                <propertyName>surefireArgLine</propertyName>
-              </configuration>
-            </execution>
-            <!--
-        Ensures that the code coverage report for unit tests is created after
-        unit tests have been run.
-        -->
-            <execution>
-              <id>post-unit-test</id>
-              <phase>test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-              </configuration>
-            </execution>
-            <execution>
-              <id>pre-integration-test</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
-                <propertyName>failsafeArgLine</propertyName>
-              </configuration>
-            </execution>
-            <!--
-        Ensures that the code coverage report for integration tests after
-        integration tests have been run.
-        -->
-            <execution>
-              <id>post-integration-test</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>                    
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>0.7.7.201606060606</version>
+                               <configuration>
+                                       <dumpOnExit>true</dumpOnExit>
+                                       <includes>
+                                               <include>org.onap.aaf.*</include>
+                                       </includes>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>pre-unit-test</id>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                                       <!-- <append>true</append> -->
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>pre-integration-test</phase>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                                                       <!-- <append>true</append> -->
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                        </configuration>
+                    </execution>
+                               </executions>
+                       </plugin>
 
                        </plugins>                      
        </build>