From 6bafbf4a7a568a9ed8f1d4d4fca830c28b575886 Mon Sep 17 00:00:00 2001
From: Priyadharshini <priyadharshini.b96@wipro.com>
Date: Tue, 18 Feb 2020 10:52:20 +0000
Subject: Fix Sonar cloud migration coverage issue

Issue-ID: SO-2663
Signed-off-by: Priyadharshini <priyadharshini.b96@wipro.com>
Change-Id: Ia5c91ed109d5b31f86a3b903123a083bc08733b9
---
 pom.xml | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 049ee3e74b..0955338a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,12 +42,12 @@
     <sonar.language>java</sonar.language>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-    <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+    <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <!--sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath -->
     <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
     <sonar.projectVersion>${project.version}</sonar.projectVersion>
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
-    <jacoco.version>0.7.5.201505241946</jacoco.version>
+    <jacoco.version>0.8.5</jacoco.version>
     <org.apache.maven.user-settings />
     <openstack.version>1.5.1</openstack.version>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
@@ -337,24 +337,28 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>${jacoco.version}</version>
-        <executions>
-          <execution>
-            <id>default-prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-report</id>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+	<groupId>org.jacoco</groupId>
+	<artifactId>jacoco-maven-plugin</artifactId>
+	<version>${jacoco.version}</version>
+	<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> 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-- 
cgit 1.2.3-korg