From 73001f6a64b3548a9584acc8c4bfe3a7806917e7 Mon Sep 17 00:00:00 2001
From: ToineSiebelink <toine.siebelink@est.tech>
Date: Fri, 17 Sep 2021 15:07:38 +0100
Subject: Fix SonarQube (jacoco) code coverage reporting

- Add report module for aggregating (as per jacocos current recommendation)(
- increased overall (cps-parent) minimum code coverage to 0.97
- set lower minimum in modules that are not at that level (yet)
- add exclude for cps-events generated code
- made xml identing consistentent some pom files

Issue-ID: CPS-475

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: If7b7839d7e03522575bc76a2253b613e63400b6b
---
 cps-parent/pom.xml | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'cps-parent')

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 3de50c3c14..3c2eab5e0f 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -38,24 +38,11 @@
     <properties>
         <app>org.onap.cps.Application</app>
         <java.version>11</java.version>
-        <minimum-coverage>0.9</minimum-coverage>
+        <minimum-coverage>0.97</minimum-coverage>
 
         <jacoco.reportDirectory.aggregate>${project.reporting.outputDirectory}/jacoco-aggregate</jacoco.reportDirectory.aggregate>
         <sonar.coverage.jacoco.xmlReportPaths>
-            ../cps-ri/target/site/jacoco-ut/jacoco.xml,
-            ../cps-ri/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-service/target/site/jacoco-ut/jacoco.xml,
-            ../cps-service/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-rest/target/site/jacoco-ut/jacoco.xml,
-            ../cps-rest/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-ncmp-service/target/site/jacoco-ut/jacoco.xml,
-            ../cps-ncmp-service/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-ncmp-rest/target/site/jacoco-ut/jacoco.xml,
-            ../cps-ncmp-rest/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-path-parser/target/site/jacoco-ut/jacoco.xml,
-            ../cps-path-parser/target/site/jacoco-aggregate/jacoco.xml,
-            ../cps-application/target/site/jacoco-ut/jacoco.xml,
-            ../cps-application/target/site/jacoco-aggregate/jacoco.xml
+            ../jacoco-report/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
@@ -346,10 +333,10 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
+                        <exclude>org/onap/cps/event/model/*</exclude>
                         <exclude>org/onap/cps/rest/model/*</exclude>
                         <exclude>org/onap/cps/cpspath/parser/antlr4/*</exclude>
                         <exclude>org/onap/cps/ncmp/rest/model/*</exclude>
-                        <exclude>org/onap/cps/ncmp/api/models/*</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -380,18 +367,6 @@
                             </rules>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report-aggregate</goal>
-                        </goals>
-                        <phase>verify</phase>
-                        <configuration>
-                            <dataFileIncludes>
-                                <fileInclude>**/code-coverage/jacoco-ut.exec</fileInclude>
-                            </dataFileIncludes>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
-- 
cgit 1.2.3-korg