From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:13:38 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 2.1.8~37^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3dabe93175f0792f1406db62ff372d7c8c5cb96a;p=aaf%2Fcadi.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: I44a95ff149d7ff86452e4b86e4ca522c306e8499
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index f47a257..ae171b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,9 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
-	
+
 	<properties>
 		<!-- <sonar.skip>true</sonar.skip> -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -374,7 +374,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>