From 59c3ad4c571f30b51c06812c5241c6275ff9898b Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 15:14:42 -0700
Subject: [PATCH] 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: Ib597071257343b887afe1cdb7e54bb47928809ad
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0bb3832..27247ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,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>
@@ -36,11 +36,11 @@
 		<module>integration</module>	
 		<module>distribution</module>		
     </modules>
-	
+
 	<properties>
         <tomcat.version>8.5.23</tomcat.version>
     </properties>
-	
+
 	<dependencyManagement>
         <dependencies>
             <dependency>
@@ -51,7 +51,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-	
+
 	<build>
 		<pluginManagement>
 			<plugins>
-- 
2.16.6