From: yangyan <yangyanyj@chinamobile.com>
Date: Mon, 10 Feb 2020 02:23:01 +0000 (+0800)
Subject: Upgrade ems oparent to 3.0.0
X-Git-Tag: 1.3.1~6^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fe5698f732e20e5e88e8cd9ad50833dabd38fa08;p=vfc%2Fnfvo%2Fdriver%2Fems.git

Upgrade ems oparent to 3.0.0

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

diff --git a/ems/boco/pom.xml b/ems/boco/pom.xml
index 991b793..dd16ab3 100644
--- a/ems/boco/pom.xml
+++ b/ems/boco/pom.xml
@@ -32,6 +32,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jersey.version>2.16</jersey.version>
     <swagger.version>1.5.3</swagger.version>
+    <sonar.language>java</sonar.language>
+    <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>
@@ -111,6 +117,28 @@
                     </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--> 
 
diff --git a/ems/microservice-standalone/src/main/assembly/run.sh b/ems/microservice-standalone/src/main/assembly/run.sh
index 93992f9..0ba1fc7 100755
--- a/ems/microservice-standalone/src/main/assembly/run.sh
+++ b/ems/microservice-standalone/src/main/assembly/run.sh
@@ -1,4 +1,3 @@
-#
 # Copyright (C) 2015 CMCC, Inc. and others. All rights reserved. (CMCC)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");