From: yangyan <yangyanyj@chinamobile.com>
Date: Thu, 20 Feb 2020 03:39:36 +0000 (+0800)
Subject: Fix error about coverage
X-Git-Tag: 1.3.3~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=bc470293e272cfe9381f42b162eea7cfc9f90f23;p=vfc%2Fnfvo%2Fwfengine.git

Fix error about coverage

Change-Id: Ib69dad0e7d9bbf3c1e30d96b42346a247c4b3525
Issue-ID: VFC-1619
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/activiti-extension/pom.xml b/activiti-extension/pom.xml
index 3eb0723..bea0c38 100644
--- a/activiti-extension/pom.xml
+++ b/activiti-extension/pom.xml
@@ -25,6 +25,11 @@
 		<ant.version>1.9.6</ant.version>
 		<apache-velocity.version>1.6.2</apache-velocity.version>
 		<jgrapht.version>0.9.1</jgrapht.version>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 	</properties>
     <repositories>
       <repository>
@@ -185,6 +190,29 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>prepare-agent</id>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
+                  </execution>
+                  <execution>
+                     <id>report</id>
+                     <goals>
+                       <goal>report</goal>
+                     </goals>
+                     <configuration>
+                        <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                        <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/wfenginemgrservice/pom.xml b/wfenginemgrservice/pom.xml
index 076749d..5cd3540 100644
--- a/wfenginemgrservice/pom.xml
+++ b/wfenginemgrservice/pom.xml
@@ -25,6 +25,11 @@
 		<ant.version>1.9.6</ant.version>
 		<apache-velocity.version>1.6.2</apache-velocity.version>
 		<jgrapht.version>0.9.1</jgrapht.version>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 	</properties>
     <repositories>
       <repository>
@@ -190,6 +195,29 @@
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<version>2.8</version>
 			</plugin>
+			<plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>prepare-agent</id>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
+                  </execution>
+                  <execution>
+                     <id>report</id>
+                     <goals>
+                       <goal>report</goal>
+                     </goals>
+                     <configuration>
+                        <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                        <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+
 		</plugins>
 		<pluginManagement>
 			<plugins>