From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:31:48 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.2.0~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9c72cfaf39966f61b01380b50b126eb4717af136;p=vfc%2Fnfvo%2Fdriver%2Fems.git

Use managed guava version

Use centrally managed guava version specified in
oparent.  Includes upgrade to oparent 1.2.0.

This change was submitted by script and may include
additional whitespace or formatting changes.

Change-Id: Id616c3a0bab89354ffc6c835a2d305bb87fb9d77
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/ems/boco/pom.xml b/ems/boco/pom.xml
index f7ebf5b..f2c3bed 100644
--- a/ems/boco/pom.xml
+++ b/ems/boco/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
     Copyright (c) 2017, CMCC Technologies Co., Ltd.
 
@@ -13,27 +14,26 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
         <groupId>org.onap.vfc.nfvo.driver.ems.ems</groupId>
         <artifactId>ems-driver-boco-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>boco-driver</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>vfc-nfvo-driver-ems-ems-boco</name>
-  
+
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jersey.version>2.16</jersey.version>
     <swagger.version>1.5.3</swagger.version>
   </properties>
-  
+
    <build>
     <!--pluginManagement--> 
         <plugins>
@@ -113,7 +113,7 @@
             </plugin>
         </plugins>
        <!--  /pluginManagement--> 
-        
+
     </build>
 
   <dependencies>
@@ -147,7 +147,7 @@
 		<artifactId>commons-net</artifactId>
 		<version>3.6</version>
 	</dependency>
-		
+
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-context</artifactId>
@@ -202,7 +202,7 @@
             <artifactId>jersey-container-servlet-core</artifactId>
             <version>${jersey.version}</version>
         </dependency>
-		
+
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
@@ -252,7 +252,7 @@
   		<version>1.0.4</version>
   	</dependency>
   	<!-- https://mvnrepository.com/artifact/org.mockftpserver/MockFtpServer -->
-	
+
 	<dependency>
 	    <groupId>org.mockftpserver</groupId>
 	    <artifactId>MockFtpServer</artifactId>
@@ -313,7 +313,7 @@
 	<dependency>
 		<groupId>com.google.guava</groupId>
 	    <artifactId>guava</artifactId>
-	    <version>23.5-jre</version>
+
 	</dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e0f723e..bf317ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.ems</groupId>