From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:21:30 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 3.0.4~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fc939b4b2f9394488128fcf7ebb584dc036276d6;p=dcaegen2%2Fplatform%2Finventory-api.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: I9750d5c21f0fa1748f5698a12e9e331a9a3a5df9
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index eb99140..e74dc68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 ================================================================================
 Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -23,7 +24,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.platform</groupId>
@@ -183,7 +184,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>