From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Fri, 7 Sep 2018 11:55:59 +0000 (+0000)
Subject: Merge "Use managed guava version"
X-Git-Tag: 2.1.8~37
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b6f0af4b5497212f8e5e6a3f2fe7f77554f81700;hp=-c;p=aaf%2Fcadi.git

Merge "Use managed guava version"
---

b6f0af4b5497212f8e5e6a3f2fe7f77554f81700
diff --combined pom.xml
index da16ab6,ae171b4..72ad5b3
--- a/pom.xml
+++ b/pom.xml
@@@ -24,15 -24,15 +24,15 @@@
  	<groupId>org.onap.aaf.cadi</groupId>
  	<artifactId>cadimiscparent</artifactId>
  	<version>2.1.2-SNAPSHOT</version>
 -	<name>CADI Misc Modules</name>
 +	<name>aaf-cadi</name>
  	<packaging>pom</packaging>
  
  	<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 +374,7 @@@
  										</goals>
  									</pluginExecutionFilter>
  									<action>
- 										<ignore />
+ 										<ignore/>
  									</action>
  								</pluginExecution>
  							</pluginExecutions>