aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio David Gasparini <claudio.gasparini@pantheon.tech>2021-01-13 13:28:07 +0100
committerClaudio David Gasparini <claudio.gasparini@pantheon.tech>2021-01-14 12:47:12 +0100
commitd45b2dc0ec3bb7d56ef1eee784a887459f609832 (patch)
tree7847917be4cdd4ae5f8f6439f525c68c355b665b
parentdc6f81cf4ce3c42e711f1cd0c6f50000d4e0101d (diff)
Fix code coverage for sonar
The get the multi module aggregate report to be consumed by sonar we are enforced to use full path to all reports. - 90.4 % coverage detected by sonar achieved Issue-ID: CPS-87 Signed-off-by: Claudio David Gasparini <claudio.gasparini@pantheon.tech> Change-Id: I91d81063e7234327cb4458c31fa27601ec22e9cd
-rw-r--r--checkstyle/pom.xml1
-rw-r--r--cps-bom/pom.xml1
-rwxr-xr-xcps-dependencies/pom.xml1
-rwxr-xr-xcps-parent/pom.xml11
-rwxr-xr-xcps-rest/pom.xml4
-rw-r--r--cps-ri/pom.xml4
-rw-r--r--cps-service/pom.xml4
7 files changed, 13 insertions, 13 deletions
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index d0cf7c3614..83d1808909 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -10,6 +10,7 @@
<properties>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+ <sonar.skip>true</sonar.skip>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
</properties>
diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml
index 7d023a5912..ab904c5593 100644
--- a/cps-bom/pom.xml
+++ b/cps-bom/pom.xml
@@ -13,6 +13,7 @@
<properties>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+ <sonar.skip>true</sonar.skip>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
</properties>
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index cf744e8890..237dd7ca95 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -21,6 +21,7 @@
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<modelmapper.version>2.3.8</modelmapper.version>
+ <sonar.skip>true</sonar.skip>
<spock-core.version>2.0-M2-groovy-3.0</spock-core.version>
<spock-spring.version>1.3-groovy-2.5</spock-spring.version>
<spotbugs.version>4.2.0</spotbugs.version>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index b42675199b..125c843114 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -26,7 +26,6 @@
<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>
@@ -35,6 +34,16 @@
<swagger-codegen-maven-plugin.version>3.0.18</swagger-codegen-maven-plugin.version>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<tag.version>${project.version}</tag.version>
+
+ <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,
+ </sonar.coverage.jacoco.xmlReportPaths>
</properties>
<distributionManagement>
diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 4d4e091e07..f2f643ac23 100755
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -11,10 +11,6 @@
<artifactId>cps-rest</artifactId>
- <properties>
- <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index a43e0cb0ec..1805986c7b 100644
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -11,10 +11,6 @@
<artifactId>cps-ri</artifactId>
- <properties>
- <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/cps-service/pom.xml b/cps-service/pom.xml
index 287e2a74e3..642d76451d 100644
--- a/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@ -11,10 +11,6 @@
<artifactId>cps-service</artifactId>
- <properties>
- <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-aggregate/jacoco.xml,${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>