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

diff --git a/pom.xml b/pom.xml
index 3ed13c3..73d2f00 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 ============LICENSE_START=======================================================
 org.onap.aai
@@ -18,21 +19,19 @@ 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>
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>1.2.0</version>
        </parent>
 
        <groupId>org.onap.aai</groupId>
        <artifactId>rest-client</artifactId>
        <version>1.3.0-SNAPSHOT</version>
        <name>aai-rest-client</name>
-        
+
        <properties>
               <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
               <!-- Sonar Properties -->
@@ -56,35 +55,35 @@ limitations under the License.
                        <artifactId>common-logging</artifactId>
                        <version>1.2.2</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
                        <version>1.10.19</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-javaagent</artifactId>
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4-rule-agent</artifactId>