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

diff --git a/pom.xml b/pom.xml
index 75de878..8368e32 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -202,7 +202,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+
         </dependency>
 
         <dependency>

diff --git a/server/pom.xml b/server/pom.xml
index 51e83ea..f1316c3 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -209,7 +209,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+
         </dependency>
 
         <dependency>