summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali-P <murali.p@huawei.com>2018-04-25 11:11:17 +0530
committerMurali-P <murali.p@huawei.com>2018-04-25 11:11:17 +0530
commit14d306c32897f4064d58c5bf0dad5ec60cd0a78e (patch)
tree224c230ddf5acbbcd53c200cb3d02bcaf693f1eb
parent60b0af415861ca71cf84738cf6d00cc0a6bfa673 (diff)
Conflict between ggogle and guava
Remove google collection Issue-ID: VNFSDK-157 Change-Id: Ib170e364889e057996a219ccb654cfb7b3a7c38b Signed-off-by: Murali-P <murali.p@huawei.com>
-rw-r--r--csarvalidation/pom.xml12
1 files changed, 4 insertions, 8 deletions
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml
index e5152e7..bfa1210 100644
--- a/csarvalidation/pom.xml
+++ b/csarvalidation/pom.xml
@@ -83,18 +83,14 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.4</version>
+ <version>2.8.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0.2</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0-rc1</version>
+ <version>20.0</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -104,7 +100,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>