From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:24:24 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.2.0~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=18463a6698ee3c2a97c1baefa7cb8205043a6c18;p=msb%2Fapigateway.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: Ic904edfd7421d78f05417492fc1766e83f3d7f2d
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/apiroute/pom.xml b/apiroute/pom.xml
index 5f68963..88d5b66 100644
--- a/apiroute/pom.xml
+++ b/apiroute/pom.xml
@@ -7,8 +7,7 @@
 	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.msb.apigateway</groupId>
 		<artifactId>msb-apigateway-parent</artifactId>
@@ -86,7 +85,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>${guava.version}</version>
+
 			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.argparse4j</groupId>
diff --git a/pom.xml b/pom.xml
index afbb219..d0ee26d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     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.
- 
+
 -->
-<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.msb.apigateway</groupId>
   <artifactId>msb-apigateway-parent</artifactId>