From 86df28153493d0b5a558f91c49f2823e415f96a1 Mon Sep 17 00:00:00 2001
From: yangyan <yangyanyj@chinamobile.com>
Date: Thu, 20 Feb 2020 14:33:38 +0800
Subject: Fix error about coverage

Change-Id: I613f27e0f356a34d5144bf9da4c2e6f532c68821
Issue-ID: VFC-1619
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---
 huawei/vnfmadapter/pom.xml    | 31 +++++++++++++++++++++++++++++++
 nokiav2/generatedapis/pom.xml | 27 +++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml
index 7824513c..f3f82b44 100644
--- a/huawei/vnfmadapter/pom.xml
+++ b/huawei/vnfmadapter/pom.xml
@@ -27,6 +27,14 @@
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm</name>
     <description>nfvo vnfmadapter</description>
+    <properties>
+    <packagename>VnfmadapterService</packagename>
+    <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>
     <modules>
         <module>VnfmadapterService</module>
     </modules>
@@ -67,6 +75,29 @@
                     </instrumentation>
                 </configuration>
             </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>
     </build>
 
diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml
index 909fefd8..4d089cae 100644
--- a/nokiav2/generatedapis/pom.xml
+++ b/nokiav2/generatedapis/pom.xml
@@ -33,6 +33,11 @@
     <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
     <swagger-core-version>1.5.15</swagger-core-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>
   <build>
     <plugins>
@@ -309,6 +314,28 @@ Release AAI
           <target>1.8</target>
         </configuration>
       </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>
   </build>
   <dependencies>
-- 
cgit 1.2.3-korg