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: I1fa46d6fd3856d1b55fa187aed61e502b949fe06
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/pom.xml b/pom.xml
index 0628f72..cdd9f48 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<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/maven-v4_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/maven-v4_0_0.xsd">

 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>


@@ -16,7 +15,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>

-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.2.0</version>

     </parent>
 
 
     </parent>