From: Liam Fallon <liam.fallon@ericsson.com>
Date: Tue, 28 Aug 2018 11:21:03 +0000 (+0000)
Subject: Merge "Upgrade oparent version"
X-Git-Tag: 2.0.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2db050d3960f9b06f34687ea3dea105dc836a9a1;hp=-c;p=policy%2Fparent.git

Merge "Upgrade oparent version"
---

2db050d3960f9b06f34687ea3dea105dc836a9a1
diff --combined integration/pom.xml
index 634d953f,acd32625..523f034d
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@@ -96,24 -96,6 +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>
@@@ -193,12 -175,6 +175,12 @@@
                  <version>1.7.4</version>
                  <scope>test</scope>
              </dependency>
 +            <dependency>
 +                <groupId>com.openpojo</groupId>
 +                <artifactId>openpojo</artifactId>
 +                <version>0.8.10</version>
 +                <scope>test</scope>
 +            </dependency>
          </dependencies>
  
      </dependencyManagement>