From fb1af89c67f614dc7d3df74e7fb0aebf7ff524b3 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Mon, 27 Aug 2018 13:51:57 -0400
Subject: [PATCH] Upgrade oparent version

Working with the Integration team, we are using oparent to set
the versions for a small number of java dependencies across all
projects. This upgrade is for google/guava.

Issue-ID: INT-619
Change-Id: Ide5828442a9f9a9888a2b0a6f817811cb49889a9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 integration/pom.xml | 18 ------------------
 pom.xml             |  6 +++---
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index e668d9a7..acd32625 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -96,24 +96,6 @@
                 <version>4.4.9</version>
             </dependency>
 
-            <!-- utility classes, google's collections, io classes -->
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>25.1-jre</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.checkerframework</groupId>
-                        <artifactId>checker-qual</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.checkerframework</groupId>
-                <artifactId>checker-qual</artifactId>
-                <version>2.5.3</version>
-            </dependency>
-
             <!-- JSON marshalling and unmarshalling -->
             <dependency>
                 <groupId>com.google.code.gson</groupId>
diff --git a/pom.xml b/pom.xml
index fb5b940e..61109558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
     </parent>
     <groupId>org.onap.policy.parent</groupId>
     <artifactId>policy-parent</artifactId>
@@ -31,10 +31,10 @@
     <packaging>pom</packaging>
 
     <properties>
-        <oparent.version>1.1.0</oparent.version>
+        <oparent.version>1.2.0</oparent.version>
     </properties>
 
     <modules>
         <module>integration</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
-- 
2.16.6