From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Wed, 27 Sep 2017 09:24:14 +0000 (+0000)
Subject: Merge "Fix coverge error for vfc-nfvo-wfengine"
X-Git-Tag: v1.0.0~37
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fc91bab0fe291764e6909512dd66338a5d94e8fe;hp=-c;p=vfc%2Fnfvo%2Fwfengine.git

Merge "Fix coverge error for vfc-nfvo-wfengine"
---

fc91bab0fe291764e6909512dd66338a5d94e8fe
diff --combined activiti-extension/pom.xml
index 16cdcc1,4877375..86a4008
--- a/activiti-extension/pom.xml
+++ b/activiti-extension/pom.xml
@@@ -17,7 -17,7 +17,7 @@@
  	<groupId>org.onap.vfc.nfvo.wfengine</groupId>
  	<modelVersion>4.0.0</modelVersion>
  	<artifactId>activiti-extension</artifactId>
 -	<name>vfc/nfvo/wfengine/activiti-extension</name>
 +	<name>vfc-nfvo-wfengine-activiti-extension</name>
  	<packaging>jar</packaging>
  
  	<properties>
@@@ -251,12 -251,12 +251,12 @@@
  		<dependency>
  			<groupId>org.powermock</groupId>
  			<artifactId>powermock-module-junit4</artifactId>
- 			<version>1.6.1</version>
+ 			<version>1.6.6</version>
  		</dependency>
  		<dependency>
  			<groupId>org.powermock</groupId>
  			<artifactId>powermock-api-mockito</artifactId>
- 			<version>1.6.1</version>
+ 			<version>1.6.6</version>
  		</dependency>
  		<dependency>
  			<groupId>org.mockito</groupId>
diff --combined wfenginemgrservice/pom.xml
index 18acd07,e9dc020..9969270
--- a/wfenginemgrservice/pom.xml
+++ b/wfenginemgrservice/pom.xml
@@@ -17,7 -17,7 +17,7 @@@
  	<groupId>org.onap.vfc.nfvo.wfengine</groupId>
  	<modelVersion>4.0.0</modelVersion>
  	<artifactId>workflow-engine-mgr-service</artifactId>
 -	<name>vfc/nfvo/wfengine/wfenginemgrservice</name>
 +	<name>vfc-nfvo-wfengine-wfenginemgrservice</name>
  	<packaging>jar</packaging>
  
  	<properties>
@@@ -285,12 -285,12 +285,12 @@@
  		<dependency>
  			<groupId>org.powermock</groupId>
  			<artifactId>powermock-module-junit4</artifactId>
- 			<version>1.6.1</version>
+ 			<version>1.6.6</version>
  		</dependency>
  		<dependency>
  			<groupId>org.powermock</groupId>
  			<artifactId>powermock-api-mockito</artifactId>
- 			<version>1.6.1</version>
+ 			<version>1.6.6</version>
  		</dependency>
  		<dependency>
  			<groupId>org.mockito</groupId>