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.

Issue-ID: INT-619
Change-Id: I5f6faab8e08dcd0b960e8f04f3f26580133e5dc5
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index 25867d3..5fe7d3c 100644 (file)
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -84,7 +84,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>26.0-jre</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml
index 8a1ffc3..21d1971 100644 (file)
--- a/nokiav2/generatedapis/pom.xml
+++ b/nokiav2/generatedapis/pom.xml
@@ -367,7 +367,6 @@ Release AAI
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>26.0-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
index b4aa4c7..e2f69cd 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>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>