Merge "Use managed guava version"

diff --git a/jar/pom.xml b/jar/pom.xml
index ccd2367..b068aee 100644 (file)
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!-- 
  ============LICENSE_START==========================================
  org.onap.music
@@ -7,20 +8,19 @@
   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.
- 
+
  ============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>
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
@@ -33,8 +33,8 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
-        <relativePath />
+        <version>1.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -185,7 +185,7 @@
             <scope>provided</scope>
         </dependency>
         <!-- /Development -->
-        
+
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -215,7 +215,7 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
-        
+
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -223,7 +223,7 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
-        
+
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -237,7 +237,7 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
-        
+
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -331,7 +331,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>

diff --git a/pom.xml b/pom.xml
index 657973f..15533ef 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!-- 
  ============LICENSE_START==========================================
  org.onap.music
@@ -7,20 +8,19 @@
   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.
- 
+
  ============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>
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
@@ -33,8 +33,8 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
-        <relativePath />
+        <version>1.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -219,7 +219,7 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
-        
+
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -227,7 +227,7 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
-        
+
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -241,7 +241,7 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
-        
+
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -335,7 +335,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>