summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@ericsson.com>2018-08-28 11:21:03 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-28 11:21:03 +0000
commit2db050d3960f9b06f34687ea3dea105dc836a9a1 (patch)
treee91e25976dd81e2a09841a2dfa7cebd49f428ed3
parent5ce052fe40b6c3c3a655f7f26530e3b8c54f6990 (diff)
parentfb1af89c67f614dc7d3df74e7fb0aebf7ff524b3 (diff)
Merge "Upgrade oparent version"
-rw-r--r--integration/pom.xml18
-rw-r--r--pom.xml6
2 files changed, 3 insertions, 21 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
index 634d953f..523f034d 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>