aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2018-09-06 09:50:45 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-06 09:50:45 +0000
commit1ecfeb7adfeadbf0dcebbaa079114cc19935bf7d (patch)
treea9574d939465c2b757f606d09a1ccdedf4a2d512
parent479c51a9cc1f4bc3ce2eb6abff04af55c64b8464 (diff)
parentac83332222e0ffefe5cdec70384dede1179bc53b (diff)
Merge "Use managed guava version"
-rw-r--r--pom.xml4
-rw-r--r--server/pom.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 75de8787..8368e32d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -202,7 +202,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>23.0</version>
+
</dependency>
<dependency>
diff --git a/server/pom.xml b/server/pom.xml
index 51e83ea7..f1316c38 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -209,7 +209,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>23.0</version>
+
</dependency>
<dependency>