Include Cassandra locking

Change-Id: I085acf8336d5f27782ee12768846a5befd3ee60d
Issue-ID: MUSIC-148
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>

1 files changed, 18 insertions, 43 deletions

diff --git a/pom.xml b/pom.xml
index 22a17245..dff48dcf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <!-- 
  ============LICENSE_START==========================================
  org.onap.music
@@ -8,9 +7,9 @@
   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,30 +18,24 @@
  
  ============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>
     <packaging>war</packaging>
-    <version>3.0.22</version>
+    <version>3.0.2</version>
     <description>
             This is the MUSIC REST interface, packaged as a war file.
     </description>
 
-     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jersey1.version>1.19</jersey1.version>
         <jersey2.version>2.25.1</jersey2.version>
         <jaxrs.version>2.0.1</jaxrs.version>
-        <cassandra.version>3.6.0</cassandra.version>
+        <cassandra.version>3.4.0</cassandra.version>
         <zookeeper.version>3.4.11</zookeeper.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -185,11 +178,7 @@
             <scope>provided</scope>
         </dependency>
         <!-- /Development -->
-        <!-- <dependency>
-		  	<groupId>com.hazelcast</groupId>
-	  		<artifactId>hazelcast-client</artifactId>
-	  		<version>3.7.1</version>
-  		</dependency> -->
+        
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -219,6 +208,7 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
+        
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -226,6 +216,7 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
+        
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -239,6 +230,7 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
+        
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -286,6 +278,7 @@
             <version>3.3.0.2</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
@@ -312,7 +305,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.1.30.Final</version>
+            <version>4.0.56.Final</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -332,18 +325,13 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>19.0</version>
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
             <version>0.4</version>
         </dependency>
-        <dependency>
-		   <groupId>com.owlike</groupId>
-		   <artifactId>genson</artifactId>
-		   <version>1.3</version>
-        </dependency>
-
     </dependencies>
 
     <reporting>
@@ -398,30 +386,17 @@
                                 </image>
                                 <!-- Cassandra -->
                                 <image>
-                                    <name>onap/music/cassandra_3_11</name>
-                                    <alias>docker_cassandra_sec</alias>
+                                    <name>onap/music/cassandra_music</name>
+                                    <alias>docker_cassandra</alias>
                                     <build>
                                         <cleanup>true</cleanup>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
+                                            <tag>3.0-${timestamp}</tag>
+                                            <tag>3.0-latest</tag>
                                         </tags>
                                         <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir>
                                     </build>
                                 </image>
-                                <!-- Cassandra Job -->
-                                <image>
-                                    <name>onap/music/cassandra_job</name>
-                                    <alias>docker_cassandra_job</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
-                                    </build>
-                                </image>
                                 <!-- Zookeeper -->
                                 <!-- <image> <name>onap/music/zookeeper_music</name> 
                                     <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag>