From d5e7f80b2964b4eee47a226eeb83f89ce1682e0a Mon Sep 17 00:00:00 2001
From: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
Date: Mon, 18 Mar 2019 12:38:51 +0100
Subject: [PATCH] Migrate parent from springboot to oparent

Update to latest oparent
Force latest guava from oparent, exclude one from sdc and msb

Change-Id: Ie8971b4a7f0e647bedc96b76affa59a32dc49ea2
Issue-ID: EXTAPI-193
Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
---
 pom.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 258e968..2d9ed7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.0</version>
   </parent>
 
   <properties>
@@ -181,6 +181,12 @@
       <groupId>org.onap.sdc.sdc-tosca</groupId>
       <artifactId>sdc-tosca</artifactId>
       <version>1.4.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>     
     </dependency>
 
     <!-- jolt -->
@@ -271,6 +277,17 @@
       <groupId>org.onap.msb.java-sdk</groupId>
       <artifactId>msb-java-sdk</artifactId>
       <version>1.2.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>        
+    </dependency>
+    
+    <dependency>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
     </dependency>
 
     <!-- karate -->
-- 
2.16.6