From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:21:58 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.0.0~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F62605%2F2;p=dcaegen2%2Fservices%2Fmapper.git

Use managed guava version

Use centrally managed guava version specified in
oparent.  Includes upgrade to oparent 1.2.0.

This change was submitted by script and may include
additional whitespace or formatting changes.

Change-Id: I4ea5f4a22233ab1eef5d7f266e7ecdefc95711fc
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index e3fa7e6..cd5e489 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -10,9 +10,7 @@
 	OR CONDITIONS OF ANY KIND, either express or implied. * See the License for 
 	the specific language governing permissions and * limitations under the License. 
 	* ============LICENSE_END========================================================= -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
@@ -30,7 +28,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.1-jre</version>
+
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 829dea3..f2c805f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,13 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
       <relativePath/>
     </parent>
 
@@ -58,7 +55,7 @@
 
         <slf4j.version>1.7.25</slf4j.version>
         <jackson.json.version>2.9.4</jackson.json.version>
-		
+
         <netty.http.version>0.16.0</netty.http.version>
         <gson.version>2.2.4</gson.version>
         <guava.version>13.0.1</guava.version>
@@ -200,7 +197,7 @@
             </dependency>
 
         </dependencies>
-        
+
     </dependencyManagement>