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: I14feff4443ccd37bf83b990cb45f78e68a703900
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/pom.xml b/pom.xml
index 8c8da44..880cc34 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,11 @@
     See the License for the specific language governing permissions and\r
     limitations under the License.\r
  -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+<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/maven-v4_0_0.xsd">\r
   <parent>\r
         <groupId>org.onap.oparent</groupId>\r
         <artifactId>oparent</artifactId>\r
-        <version>1.1.0</version>\r
+        <version>1.2.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>org.onap.vfc.nfvo.multivimproxy</groupId>\r
@@ -28,12 +27,12 @@
   <version>1.1.0-SNAPSHOT</version>\r
   <name>vfc-nfvo-multivimproxy</name>\r
   <description>vfc nfvo multivimproxy</description>\r
-  \r
+\r
   <properties>\r
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
         <package.name>vfc-nfvo-multivimproxy-service</package.name>\r
   </properties>\r
-  \r
+\r
   <build>\r
     <plugins>\r
             <plugin>\r
@@ -72,7 +71,7 @@
             </plugin>\r
         </plugins>\r
   </build>\r
-  \r
+\r
   <modules>\r
         <module>service</module>\r
         <module>deployment</module>\r