From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:23:55 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.3.2~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=773d1eb190d1645567032c1d037f3780358dc933;p=logging-analytics%2Fpomba%2Fpomba-context-aggregator.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: I059d2259668c80674d7837d5ae0d03cda2ae4a54
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index c8d25c2..39de0a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
-<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">
+<?xml version="1.0"?>
+<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>
 
@@ -11,8 +10,8 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.1</version>
-		<relativePath />
+		<version>1.2.0</version>
+		<relativePath/>
 	</parent>
 
 	<properties>
@@ -284,4 +283,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>