Move Jacoco to xml

Change-Id: Ie6e8ebee68f6f94a487a56ad70f33f5e93e34898
Issue-ID: SDC-2740
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

diff --git a/pom.xml b/pom.xml
index a3c1709..9a8e844 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -37,21 +37,22 @@
     <!-- Global project version -->
 
     <!-- Dependencies projects version -->
-    <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
     <nexus.proxy>https://nexus.onap.org</nexus.proxy>
     <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
     <snapshots.path>snapshots</snapshots.path>
     <releases.path>releases</releases.path>
-
+       
     <!-- Sonar properties -->
-    <sonar.language>java</sonar.language>
+       <sonar.language>java</sonar.language>
+       <sonar.coverage.jacoco.xmlReportPaths>
+               ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+       </sonar.coverage.jacoco.xmlReportPaths>
     <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
     <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
     <sonar.sources>.</sonar.sources>
     <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
     <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-    <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java
-    </sonar.inclusions>
+    <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
 
   </properties>
 

diff --git a/sdc-tosca/pom.xml b/sdc-tosca/pom.xml
index 80b4182..c6ecc3f 100644 (file)
--- a/sdc-tosca/pom.xml
+++ b/sdc-tosca/pom.xml
@@ -109,7 +109,7 @@
               <goal>prepare-agent</goal>
             </goals>
             <configuration>
-              <destFile>target/jacoco.exec</destFile>
+              <destFile>${sonar.jacoco.reportPath}</destFile>
             </configuration>
           </execution>
         </executions>