From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:30:32 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.3.0~5^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4dd36cd6c73d62d1ec6c8cdc6e147020f5188d3f;p=so%2Flibs.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: Ibc5d00b4999bab9ad527986cfdb3af8fa075b523
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index 6e492ec..676584c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
-<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>
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath/>
 	</parent>
 
@@ -197,7 +197,7 @@
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8</version>
 				<configuration>
-					<skip />
+					<skip/>
 				</configuration>
 			</plugin>
 			<plugin>