From: LiZi <li.zi30@zte.com.cn>
Date: Mon, 26 Mar 2018 11:24:11 +0000 (-0400)
Subject: Upgrade the version of oparent.
X-Git-Tag: v1.1.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=95b5317d2f1d446415ef2b367323c3df8bfce7c0;ds=sidebyside

Upgrade the version of oparent.

Change-Id: Idc553f92d78c586878a2ffd0e8e7ca5b97252c27
Issue-ID: AAI-941
Signed-off-by: LiZi <li.zi30@zte.com.cn>
---

diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml
index 586c6c4..3ef077e 100644
--- a/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -200,18 +200,6 @@
             <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
-        <!-- <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4-rule</artifactId>
-            <version>1.6.5</version>
-            <scope>test</scope>
-        </dependency> -->
         <dependency>
 	        <groupId>org.powermock</groupId>
 	        <artifactId>powermock-module-junit4</artifactId>
@@ -237,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>
diff --git a/pom.xml b/pom.xml
index 017e44f..c8d928a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.1.0</version>
     </parent>
 	
 	<groupId>org.onap.aai.esr-server</groupId>
@@ -72,11 +72,6 @@
 				<artifactId>hibernate-validator</artifactId>
 				<version>5.4.2.Final</version>
 			</dependency>
-			<!--<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>2.8.11</version>
-			</dependency>-->			
 
             <!-- jersey -->
             <dependency>
@@ -120,7 +115,6 @@
             <!-- UT end -->
         </dependencies>
     </dependencyManagement>
-	
     <build>
         <pluginManagement>
             <plugins>
@@ -208,6 +202,4 @@
             </plugins>
         </pluginManagement>
     </build>   
-	
-	
 </project>