X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fpom.xml;h=6439e91e7d33f86a5a0de714b7b849d478beada5;hp=8cf19338b30fbff74beef81f5dabd6893a7e90da;hb=69f1d89c1703cfe851b806a1e284d01774c8ee27;hpb=0d6ba27cdb051f6883687ace5d4d5f4b77ff0a85

diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml
index 8cf1933..6439e91 100644
--- a/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2016-2017 ZTE Corporation.
+    Copyright 2016-2018 ZTE Corporation.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@
 	<parent>
 		<groupId>org.onap.aai.esr-server</groupId>
 		<artifactId>aai-esr-server</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>esr-mgr</artifactId>
 	<name>esr-server/esr-mgr</name>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <build>
@@ -129,6 +129,12 @@
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
+			<exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
@@ -141,12 +147,13 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey2-jaxrs</artifactId>
+			<exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+					<artifactId>jackson-dataformat-xml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.9.4</version>
-		</dependency>
         <!-- jersey -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -194,15 +201,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.1</version>
-            <scope>test</scope>
+	        <groupId>org.powermock</groupId>
+	        <artifactId>powermock-module-junit4</artifactId>
+	        <version>1.5.5</version>
+	        <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4-rule</artifactId>
-            <version>1.6.5</version>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.5.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -218,13 +225,12 @@
             <scope>test</scope>
         </dependency>
         <!-- MSB java-sdk -->
-	<dependency>
+		<dependency>
             <groupId>org.onap.msb.java-sdk</groupId>
             <artifactId>msb-java-sdk</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-        </dependency>    
+            <version>1.1.0</version>
+        </dependency>
     </dependencies>
-	
 	<profiles>
         <profile>
             <id>swagger</id>