summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:13:43 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-27 10:24:04 -0700
commit97ed31921482fc57f14d9bfdf10e3d59f093f238 (patch)
tree3ca39783173bfa87bcb0ea8a1493e16d33e969b6
parentb6879f150535d21509c6cc7af4a8831384a7ed64 (diff)
Use managed guava versionHEADmaster
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: I05e2a407655f9a49be76a158d284b8fffbee7953 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--pom.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/pom.xml b/pom.xml
index 9431d35..9b5bccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
/*******************************************************************************
* ============LICENSE_START====================================================
@@ -22,8 +23,7 @@
* *
******************************************************************************/
-->
-<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.aaf.inno</groupId>
<artifactId>parent</artifactId>
@@ -42,19 +42,19 @@
<developers>
<developer>
<name>Jonathan Gathman</name>
- <email></email>
+ <email/>
<organization>ATT</organization>
- <organizationUrl></organizationUrl>
+ <organizationUrl/>
</developer>
</developers>
-
+
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</parent>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
@@ -92,7 +92,7 @@
<outputDirectory>target</outputDirectory>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -102,10 +102,10 @@
<includes>
<include>**/JU*.java</include>
</includes>
-
+
</configuration>
</plugin>
-
+
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,7 +129,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>