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: I2277a42966be78ba2b30c85f03333d81f2fea2fd
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/pom.xml b/pom.xml
index 2410b9c..b0d06cb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
      ============LICENSE_START=======================================================
      org.onap.dmaap
@@ -8,30 +9,29 @@
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
            http://www.apache.org/licenses/LICENSE-2.0
-     
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS 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>
 
        <groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
        <artifactId>dmaapMMAgent</artifactId>
        <version>1.1.0-SNAPSHOT</version>
        <packaging>jar</packaging>
-       
+
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>1.2.0</version>
        </parent>
 
        <name>dmaap-messagerouter-mirroragent</name>
@@ -52,14 +52,14 @@
            <nexusproxy>https://nexus.onap.org</nexusproxy>
            <junit.version>4.11</junit.version>
        </properties>
-       
+
        <distributionManagement>
                <site>
                        <id>ecomp-site</id>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-       
+
        <licenses>
                <license>
                        <name>Apache License Version 2.0</name>
@@ -68,7 +68,7 @@
        <developers>
                <developer>
                        <name>Jackie</name>
-                       <email></email>
+                       <email/>
                        <organization>ATT</organization>
                        <organizationUrl>www.att.com</organizationUrl>
                </developer>