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

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 0f44974..dbbb7fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END====================================================
 -->
-<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>
 
     <groupId>org.onap.logging-analytics.pomba</groupId>
@@ -28,7 +27,7 @@ limitations under the License.
     <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.0</version>
     </parent>
 
     <properties>
@@ -117,7 +116,7 @@ limitations under the License.
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
-- 
cgit 1.2.3-korg