summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Debeau <eric.debeau@orange.com>2019-03-19 16:07:40 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-19 16:07:40 +0000
commit8587d7ef29ee305da685d98b396856c0ac115fa4 (patch)
treee568a3d77b92c466b118ba0b2f6efe3d5b71d45d
parent552ba2cc87a01ec0337e39ffcd819da5b6e05e62 (diff)
parentd5e7f80b2964b4eee47a226eeb83f89ce1682e0a (diff)
Merge "Migrate parent from springboot to oparent"
-rw-r--r--pom.xml19
1 files changed, 18 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 6b18e58..30d19d5 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>
@@ -188,6 +188,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 -->
@@ -278,6 +284,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 -->