Merge "Use managed guava version"

diff --combined pom.xml
index c402ca2,97b56e5..4b03b49
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -1,3 -1,4 +1,4 @@@
+ <?xml version="1.0"?>
  <!-- ============LICENSE_START======================================================= 
        org.onap.dmaap ================================================================================ 
        Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
@@@ -9,14 -10,13 +10,13 @@@
        OF ANY KIND, either express or implied. See the License for the specific 
        language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
        ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
- <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">
+ <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>
        </parent>
  
        <groupId>org.onap.dmaap.kafka</groupId>
@@@ -32,7 -32,7 +32,7 @@@
        <developers>
                <developer>
                        <name>Sunil Unnava</name>
-                       <email></email>
+                       <email/>
                        <organization>ATT</organization>
                        <organizationUrl>www.att.com</organizationUrl>
                </developer>
@@@ -53,8 -53,11 +53,8 @@@
                                </dependencies>
                        </plugin>
  
 -                      <plugin>
 -                              <groupId>org.apache.maven.plugins</groupId>
 -                              <artifactId>maven-jar-plugin</artifactId>
 -                              <version>3.0.2</version>
 -                      </plugin>
 +                      <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
 +                              <version>3.0.2</version> </plugin> -->
  
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@@ -87,33 -90,6 +87,33 @@@
                                </dependencies>
                        </plugin>
  
 +                      <plugin>
 +                              <groupId>org.sonatype.plugins</groupId>
 +                              <artifactId>nexus-staging-maven-plugin</artifactId>
 +                              <extensions>false</extensions>
 +                              <executions>
 +                                      <execution>
 +                                              <id>injected-nexus-deploy</id>
 +                                              <phase>none</phase>
 +                                      </execution>
 +                              </executions>
 +                      </plugin>
 +                      <plugin>
 +                              <artifactId>maven-deploy-plugin</artifactId>
 +                              <version>2.8</version>
 +                              <executions>
 +                                      <execution>
 +                                              <id>default-deploy</id>
 +                                              <phase>none</phase>
 +                                              <configuration>
 +                                                      <skip />
 +                                              </configuration>
 +                                      </execution>
 +                              </executions>
 +                              <configuration>
 +                                      <skip />
 +                              </configuration>
 +                      </plugin>
                        <plugin>
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>