From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:20:31 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.0.2~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F62571%2F2;p=dcaegen2%2Fcollectors%2Fdatafile.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: I7f31e35cf9c332d5fe02919e9cb9ad14ffc94294
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index 7feaa6b9..accfee74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,15 +18,13 @@
   ~ limitations under the License.
   ~ ============LICENSE_END=========================================================
   -->
-<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">
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>0.1.1</version>
+    <version>1.2.0</version>
     <relativePath/>
   </parent>
   <groupId>org.onap.dcaegen2.collectors</groupId>
@@ -681,4 +679,3 @@
     <module>datafile-commons</module>
   </modules>
 </project>
-