Merge "Use managed guava version"

diff --combined pom.xml
index da16ab6,ae171b4..72ad5b3
--- 1/pom.xml
--- 2/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>