From 1c1fc78f9dce0b22fb31647db39349b3fef87a36 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 15:30:22 -0700
Subject: 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: I4da3f582e347da62f9d6fe8d6f20c147d493b8a0
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 073c9c165f..8b9b295064 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
-<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">
+<?xml version="1.0"?>
+<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>
-		<relativePath />
+		<version>1.2.0</version>
+		<relativePath/>
 	</parent>
 	<groupId>org.onap.so</groupId>
 	<artifactId>so</artifactId>
@@ -44,7 +44,7 @@
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
 		<jacoco.version>0.7.5.201505241946</jacoco.version>
-		<org.apache.maven.user-settings></org.apache.maven.user-settings>
+		<org.apache.maven.user-settings/>
 		<openstack.version>1.2.2</openstack.version>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
 		<springboot.version>1.5.13.RELEASE</springboot.version>	
@@ -233,7 +233,7 @@
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
 				<configuration>
-					<skip />
+					<skip/>
 				</configuration>
 			</plugin>
 
@@ -802,7 +802,7 @@
 				</property>
 			</activation>
 			<properties>
-				<originalClassifier></originalClassifier>
+				<originalClassifier/>
 			</properties>
 		</profile>
 	</profiles>
-- 
cgit 1.2.3-korg