Merge "Use managed guava version"

1 files changed, 5 insertions, 6 deletions

diff --git a/pom.xml b/pom.xml
index 8c8da44..880cc34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,11 @@
     See the License for the specific language governing permissions and

     limitations under the License.

  -->

-<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">

+<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">

   <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>

   <groupId>org.onap.vfc.nfvo.multivimproxy</groupId>

@@ -28,12 +27,12 @@
   <version>1.1.0-SNAPSHOT</version>

   <name>vfc-nfvo-multivimproxy</name>

   <description>vfc nfvo multivimproxy</description>

-  

+

   <properties>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

         <package.name>vfc-nfvo-multivimproxy-service</package.name>

   </properties>

-  

+

   <build>

     <plugins>

             <plugin>

@@ -72,7 +71,7 @@
             </plugin>

         </plugins>

   </build>

-  

+

   <modules>

         <module>service</module>

         <module>deployment</module>