diff options
| author |   Eric Debeau <eric.debeau@orange.com> | 2019-03-19 16:07:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-19 16:07:40 +0000 |
| commit | 8587d7ef29ee305da685d98b396856c0ac115fa4 (patch) | |
| tree | e568a3d77b92c466b118ba0b2f6efe3d5b71d45d | |
| parent | 552ba2cc87a01ec0337e39ffcd819da5b6e05e62 (diff) | |
| parent | d5e7f80b2964b4eee47a226eeb83f89ce1682e0a (diff) | |
Merge "Migrate parent from springboot to oparent"
| -rw-r--r-- | pom.xml | 19 |
1 files changed, 18 insertions, 1 deletions
@@ -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 --> |