Improve code coverage for aaf authz modules

Issue-ID: AAF-79
Change-Id: I617ad210ccc174db32bf8bf9471720b3fdde5f6b
Signed-off-by: sg481n <sg481n@att.com>
diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml
index b8134c7..091d93e 100644
--- a/authz-batch/pom.xml
+++ b/authz-batch/pom.xml
@@ -215,91 +215,56 @@
 				</configuration>
 			</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>
 
 				
 		
diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml
index cc0400b..6e41ddc 100644
--- a/authz-cass/pom.xml
+++ b/authz-cass/pom.xml
@@ -162,91 +162,56 @@
 				</configuration>

 			</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>

diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml
index aee32f5..39628cb 100644
--- a/authz-certman/pom.xml
+++ b/authz-certman/pom.xml
@@ -160,91 +160,56 @@
 				</configuration>

 			</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>

diff --git a/authz-client/pom.xml b/authz-client/pom.xml
index 6f37eaf..2ef0c58 100644
--- a/authz-client/pom.xml
+++ b/authz-client/pom.xml
@@ -191,91 +191,56 @@
 				</configuration>

 			</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>

diff --git a/authz-cmd/pom.xml b/authz-cmd/pom.xml
index 2bdca1b..3696094 100644
--- a/authz-cmd/pom.xml
+++ b/authz-cmd/pom.xml
@@ -167,91 +167,56 @@
 				</configuration>

 			</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>

diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index 9507792..ef361b4 100644
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -151,92 +151,56 @@
 				</configuration>

 			</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>

 		</pluginManagement>

diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml
index cd4c4e1..dc682ea 100644
--- a/authz-defOrg/pom.xml
+++ b/authz-defOrg/pom.xml
@@ -121,91 +121,56 @@
 				</configuration>

 			</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>

 		</pluginManagement>

diff --git a/authz-fs/pom.xml b/authz-fs/pom.xml
index c0a1713..51c01ee 100644
--- a/authz-fs/pom.xml
+++ b/authz-fs/pom.xml
@@ -143,91 +143,56 @@
 				</configuration>

 			</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>

 

diff --git a/authz-gui/pom.xml b/authz-gui/pom.xml
index 3eb3795..39b9ddb 100644
--- a/authz-gui/pom.xml
+++ b/authz-gui/pom.xml
@@ -209,91 +209,56 @@
 				</configuration>
 			</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>
diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml
index 4617ea7..67d8cf2 100644
--- a/authz-gw/pom.xml
+++ b/authz-gw/pom.xml
@@ -153,91 +153,56 @@
 				</configuration>

 			</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>

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index 88d91bc..0dd465d 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -491,91 +491,56 @@
 				</configuration>

 			</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>

diff --git a/authz-test/pom.xml b/authz-test/pom.xml
index 6b8b588..755d396 100644
--- a/authz-test/pom.xml
+++ b/authz-test/pom.xml
@@ -183,91 +183,56 @@
 				</configuration>

 			</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>

diff --git a/pom.xml b/pom.xml
index 1edac1b..9a718b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,92 +261,57 @@
 					<serverId>ecomp-staging</serverId>
 				</configuration>
 			</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>                    
+		<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>