From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 22 Jan 2020 16:10:01 +0000 (-0500)
Subject: Finish sonar config update
X-Git-Tag: 2.3.0~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=34efd97cdb8c964b6207da965a2f70622e091ab5;p=policy%2Fdistribution.git

Finish sonar config update

Now that JDK11 upgrade done, policy/parent has the right
parameters defined. Cleaned up and made sure only one
.exec file being generated.

Issue-ID: POLICY-2321
Change-Id: I058119982e56bc5c111ba3f2fe44079be97fd889
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/plugins/pom.xml b/plugins/pom.xml
index a9225f70..d8de5629 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,11 +27,15 @@
     </parent>
 
     <artifactId>plugins</artifactId>
-    
+
     <name>${project.artifactId}</name>
     <description>The module of Policy Distribution that holds plugins for custom policy reception and forwarding.</description>
     <packaging>pom</packaging>
-    
+
+    <properties>
+        <jacoco.dataFile>${project.basedir}/../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
+    </properties>
+
     <modules>
         <module>forwarding-plugins</module>
         <module>reception-plugins</module>
diff --git a/pom.xml b/pom.xml
index 58faf41f..b9df971c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <properties>
         <!-- Default Sonar configuration -->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
 
         <policy.common.version>1.6.2-SNAPSHOT</policy.common.version>
         <policy.engine.version>1.6.0-SNAPSHOT</policy.engine.version>