From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:22:35 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 3.0.1-ONAP~20^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F62621%2F2;p=dmaap%2Fkafka11aaf.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: I44081e5193b5876a6f619f41d573bc2e3837e418
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index a4c985a..97b56e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!-- ============LICENSE_START======================================================= 
 	org.onap.dmaap ================================================================================ 
 	Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
@@ -9,14 +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 @@
 	<developers>
 		<developer>
 			<name>Sunil Unnava</name>
-			<email></email>
+			<email/>
 			<organization>ATT</organization>
 			<organizationUrl>www.att.com</organizationUrl>
 		</developer>