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

5 files changed, 21 insertions, 23 deletions

diff --git a/.gitreview b/.gitreview
index d0d4f69..fc084ce 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
-[gerrit]

-host=gerrit.onap.org

-port=29418

-project=vnfsdk/functest

+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=vnfsdk/functest.git
+defaultbranch=master
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 82a075d..bb59029 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!--
     Copyright 2017 Huawei Technologies Co., Ltd.
-   
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-   
+
         http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/distribution/standalone/pom.xml b/distribution/standalone/pom.xml
index 0e98bb4..2459e31 100644
--- a/distribution/standalone/pom.xml
+++ b/distribution/standalone/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!--
     Copyright 2017-2018 Huawei Technologies Co., Ltd.
-   
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-   
+
         http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/pom.xml b/pom.xml
index 6bc2a66..bc372fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!--
     Copyright 2017 Huawei Technologies Co., Ltd.
-   
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-   
+
         http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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>
diff --git a/vnf-sdk-function-test/pom.xml b/vnf-sdk-function-test/pom.xml
index 10cb415..dbfefeb 100644
--- a/vnf-sdk-function-test/pom.xml
+++ b/vnf-sdk-function-test/pom.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0"?>
 <!--
     Copyright 2017-2018 Huawei Technologies Co., Ltd.
-   
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-   
+
         http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.onap.vnfsdk.functest</groupId>
@@ -102,10 +101,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.onap.vnfsdk.functest.VnfSdkFuncTestApp</mainClass>
                                 </transformer>
                             </transformers>