From d8f0e75afc04c13eeb76c2e4612ed099db89d58a Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 15:33:40 -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: Ia555093ccb59b09de724c63035804a6f53cc6157
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 .gitreview             | 9 +++++----
 csarvalidation/pom.xml | 9 ++++-----
 deployment/pom.xml     | 5 +----
 pom.xml                | 6 +++---
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitreview b/.gitreview
index e6d44b3..891885a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
-[gerrit]
-host=gerrit.onap.org
-port=29418
-project=vnfsdk/validation
+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=vnfsdk/validation.git
+defaultbranch=master
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml
index 831889e..f5844bb 100644
--- a/csarvalidation/pom.xml
+++ b/csarvalidation/pom.xml
@@ -7,15 +7,14 @@
 	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. -->
-<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">
 	<!-- <parent> <groupId>org.onap.csarvalidation</groupId> <artifactId>csarvalidation</artifactId> 
 		<version>1.0.0-SNAPSHOT</version> </parent> -->
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath>oparent</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -88,9 +87,9 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.0-jre</version>
+
 		</dependency>
-		
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/deployment/pom.xml b/deployment/pom.xml
index f32f76a..fd2c99d 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -14,10 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
-<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>
diff --git a/pom.xml b/pom.xml
index 6c4e894..d357734 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath>oparent</relativePath>
 	</parent>
 
-- 
cgit 1.2.3-korg