Include aggregate xml report on sonar coverage

Issue-ID: CPS-87
Signed-off-by: Claudio David Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: I50de5df1bc79ff22c90a5cbe2f1b143164c8abea

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 50cca04..b426751 100755 (executable)
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -26,6 +26,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <repository.name>nexus3.onap.org:10001/onap/cps-service</repository.name>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
         <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
         <spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
         <spotbugs.slf4j.version>1.8.0-beta4</spotbugs.slf4j.version>

diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index f2f643a..4d4e091 100755 (executable)
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -11,6 +11,10 @@
 \r
     <artifactId>cps-rest</artifactId>\r
 \r
+    <properties>\r
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>\r
+    </properties>\r
+\r
     <dependencies>\r
         <dependency>\r
             <groupId>${project.groupId}</groupId>\r

diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index 89b19d5..a43e0cb 100644 (file)
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -8,8 +8,13 @@
         <version>0.0.1-SNAPSHOT</version>\r
         <relativePath>../cps-parent/pom.xml</relativePath>\r
     </parent>\r
+\r
     <artifactId>cps-ri</artifactId>\r
 \r
+    <properties>\r
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>\r
+    </properties>\r
+\r
     <dependencies>\r
         <dependency>\r
             <groupId>${project.groupId}</groupId>\r

diff --git a/cps-service/pom.xml b/cps-service/pom.xml
index 642d764..287e2a7 100644 (file)
--- a/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@ -11,6 +11,10 @@
 \r
   <artifactId>cps-service</artifactId>\r
 \r
+  <properties>\r
+    <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>\r
+  </properties>\r
+\r
   <dependencies>\r
     <dependency>\r
       <groupId>org.opendaylight.yangtools</groupId>\r