Reintroduced the sonar report

Issue-ID: AAI-2552
Change-Id: Ib60b7ff810bcf21ab9aae18e71d3f130842ac6fc
Signed-off-by: fpaquett <francis.paquette@amdocs.com>

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index ea768b8..cde4169 100644 (file)
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -405,23 +405,68 @@
                                <artifactId>sonar-maven-plugin</artifactId>
                                <version>3.2</version>
                        </plugin>
+                        <!-- jacoco-maven-plugin provides the basic report creation during unit testing, such as code-coverage, sonar, etc. -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                               </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>${sonar.jacoco.reportPath}</destFile>
+                                                       <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>${sonar.jacoco.reportPath}</dataFile>
+                                                       <!-- Sets the output directory for the code coverage report. -->
+                                                       <outputDirectory>${jacoco.path}</outputDirectory>
+                                               </configuration>
+                                       </execution>
+                                       <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                                                is passed as VM argument when Maven the Failsafe plugin is executed. -->
                                        <execution>
-                                               <id>jacoco-initialize-unit-tests</id>
+                                               <id>pre-integration-test</id>
+                                               <phase>pre-integration-test</phase>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec
-                                                       </destFile>
-                            <!-- <append>true</append> -->
+                                                       <!-- Sets the path to the file which contains the execution data. -->
+                                                       <destFile>${sonar.jacoco.itReportPath}</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>${sonar.jacoco.itReportPath}/</dataFile>
+                                                       <!-- Sets the output directory for the code coverage report. -->
+                                                       <outputDirectory>${jacoco.itPath}</outputDirectory>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -432,7 +477,7 @@
                                                <configuration>
                                                        <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
                                                        <rules>
-                                <!--  implementation is needed only for Maven 2  -->
+                                                               <!--  implementation is needed only for Maven 2  -->
                                                                <rule implementation="org.jacoco.maven.RuleConfiguration">
                                                                        <element>BUNDLE</element>
                                                                        <limits>
@@ -448,7 +493,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-
             <!-- This plugin adds the generated sources directory to the clean lifecycle
                 so that automatically generated code will get cleaned up properly. -->
                        <plugin>