From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 24 Jan 2020 12:49:49 +0000 (+0100)
Subject: Fix sonar
X-Git-Tag: 5.0.0~74
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f332e2e4ce3d8de200fd90076f6d4da8bdade2d6;p=clamp.git

Fix sonar

Fix sonar due to sonarcloud migration

Issue-ID: CLAMP-626
Change-Id: I8fb9eb3857c1b9649cc6231d3789b39887687152
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---

diff --git a/pom.xml b/pom.xml
index 9bc86439..33bcf15a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/coverage-reports/jacoco-xml</sonar.coverage.jacoco.xmlReportPaths>
+		<!-- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath> -->
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco</sonar.coverage.jacoco.xmlReportPaths>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<!-- Enable language to disable javascript analysis -->
@@ -1111,20 +1111,18 @@
 									</includes>
 								</fileSet>
 							</fileSets>
-							<destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+							<destFile>${project.build.directory}/jacoco.exec</destFile>
 						</configuration>
 					</execution>
 					<execution>
-						<id>post-integration-xml</id>
+						<id>report-xml</id>
 						<goals>
 							<goal>report</goal>
 						</goals>
-						<phase>post-integration-test</phase>
 						<configuration>
-							<dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
-							<outputDirectory>
-								${project.build.directory}/coverage-reports/jacoco-xml
-							</outputDirectory>
+							<includes>
+								<include>org.onap.clamp.*</include>
+							</includes>
 						</configuration>
 					</execution>
 				</executions>