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

diff --git a/example-spring-boot/pom.xml b/example-spring-boot/pom.xml
index 2f5f7b0..96ed664 100644
--- a/example-spring-boot/pom.xml
+++ b/example-spring-boot/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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-SNAPSHOT</version>
+		<version>1.2.0</version>
     </parent>
 
 	<groupId>org.onap.msb.sdk</groupId>
diff --git a/pom.xml b/pom.xml
index b126708..c8386d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
   </parent>
   <groupId>org.onap.msb.java-sdk</groupId>
   <artifactId>msb-java-sdk</artifactId>
@@ -63,7 +63,7 @@
     <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>24.0-jre</version>
+
     </dependency>
   </dependencies>
   <build>