Sonar Cloud migration changes

Issue-ID: DMAAP-1407
Change-Id: I6c1516a2b5c8c213122d893a6cc7525bdc336874
Signed-off-by: su622b <su622b@att.com>

diff --git a/pom.xml b/pom.xml
index 842b11c..faf8e05 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,15 +33,11 @@
                <version.jackson.core>2.6.7.1</version.jackson.core>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-               <!-- SONAR -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
+               <sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/dmaapclient/${project.artifactId}/${project.version}</sitePath>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -287,82 +283,28 @@
                                        <target>1.7</target>
                                </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>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                </plugins>
        </build>