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

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 8b67bd5..21f75af 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<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>
 
        <!-- This is the Maven project object model (POM) file for the open-source 
@@ -61,7 +60,7 @@
                                        </systemPropertyVariables>
                                </configuration>
                        </plugin>
-                       
+
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
@@ -121,8 +120,8 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       
-                       
+
+
                        <!-- add version number to manifest -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -373,6 +372,6 @@
                        <version>${jacoco.version}</version>
                        <classifier>runtime</classifier>
                </dependency>
-               
+
        </dependencies>
 </project>

diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index 4f812a9..a88481b 100644 (file)
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
 
        <!-- OParent provides audits etc. -->
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <!-- Portal SDK Maven parent project -->
@@ -143,7 +142,7 @@
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore/>
                                                                        </action>
                                                                </pluginExecution>
                                                        </pluginExecutions>
@@ -222,7 +221,7 @@
                                        </execution>
                                </executions>
                        </plugin>
-                               
+
                        </plugins>
                </pluginManagement>