Use managed guava version

Change-Id: Ia3bd1b8443749f623956350cab52f7fc4c0a17a1
Issue-ID: INT-619
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>

diff --git a/pom.xml b/pom.xml
index 9444477..2ba98dc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
   </parent>
   
   <groupId>org.onap.msb.discovery</groupId>

diff --git a/sdclient/discovery-service/pom.xml b/sdclient/discovery-service/pom.xml
index 1937773..a3eb85c 100644 (file)
--- a/sdclient/discovery-service/pom.xml
+++ b/sdclient/discovery-service/pom.xml
@@ -73,7 +73,6 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
        </dependencies>
        <build>

diff --git a/sdclient/pom.xml b/sdclient/pom.xml
index a0e439d..3c2f96d 100644 (file)
--- a/sdclient/pom.xml
+++ b/sdclient/pom.xml
@@ -33,7 +33,6 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <dropwizard.version>1.2.2</dropwizard.version>
-               <guava.version>23.5-jre</guava.version>
                <jersey.version>2.25.1</jersey.version>
                <jackson.version>2.9.4</jackson.version>
                <jetty.version>9.4.11.v20180605</jetty.version>
@@ -57,11 +56,6 @@
                                <artifactId>commons-lang3</artifactId>
                                <version>3.6</version>
                        </dependency>
-                       <dependency>
-                               <groupId>com.google.guava</groupId>
-                               <artifactId>guava</artifactId>
-                               <version>${guava.version}</version>
-                       </dependency>
                        <dependency>
                                <groupId>net.sourceforge.argparse4j</groupId>
                                <artifactId>argparse4j</artifactId>