From 762c8058a55332bf5a862a4606c72ebf04493464 Mon Sep 17 00:00:00 2001
From: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Date: Tue, 24 Oct 2017 16:38:41 +0800
Subject: [PATCH] Fix workflow engine startup error

Change-Id: I545e58dc53457b8855eef3d34156a4409eefdd47
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
---
 activiti-extension/pom.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/activiti-extension/pom.xml b/activiti-extension/pom.xml
index aa0603f..8e958b3 100644
--- a/activiti-extension/pom.xml
+++ b/activiti-extension/pom.xml
@@ -231,17 +231,24 @@
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-core</artifactId>
 			<version>0.8.0</version>
+			<exclusions>  
+			 <exclusion>  
+			   <groupId>org.hibernate</groupId>  
+			   <artifactId>hibernate-validator</artifactId>  
+			  </exclusion>  
+             </exclusions> 
 		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-assets</artifactId>
 			<version>0.8.0</version>
 		</dependency>
+		<!--
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-hibernate</artifactId>
 			<version>0.8.0</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-migrations</artifactId>
@@ -328,12 +335,13 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.23</version>
 		</dependency>
+	
 		<dependency>
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-engine</artifactId>
 			<version>5.22.0</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency> 
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
@@ -344,16 +352,17 @@
 			<artifactId>gson</artifactId>
 			<version>2.7</version>
 		</dependency>
+		<!--
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>3.2.3.RELEASE</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
-                        <groupId>org.onap.msb.java-sdk</groupId>
-                        <artifactId>msb-java-sdk</artifactId>
-                        <version>1.0.0</version>
-                </dependency> 
+			<groupId>org.onap.msb.java-sdk</groupId>
+			<artifactId>msb-java-sdk</artifactId>
+			<version>1.0.0</version>
+        </dependency> 
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-- 
2.16.6