Fix workflow engine startup error

Change-Id: I545e58dc53457b8855eef3d34156a4409eefdd47
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>

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