X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=01db83057ac5b5025f15af85b9c72ee0c2c12a08;hb=29ab308002a02d6225b893b8305c808c91639707;hp=1d3f87e7a59a9be4d7750d4ad00e3fac79a9e3e4;hpb=e0a891de60058eab2b92082f7cc2dde59f0f42be;p=music.git

diff --git a/pom.xml b/pom.xml
index 1d3f87e7..01db8305 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,18 @@
+<?xml version="1.0"?>
 <!-- 
  ============LICENSE_START==========================================
  org.onap.music
  ===================================================================
   Copyright (c) 2017 AT&T Intellectual Property
+ ===================================================================
+  Modifications Copyright (c) 2019 IBM.
  ===================================================================
   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,22 +22,21 @@
  ============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>2.4.20</version>
+    <version>3.0.24</version>
     <description>
             This is the MUSIC REST interface, packaged as a war file.
     </description>
 
-    <parent>
+     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
-        <relativePath />
+        <version>1.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -42,7 +44,7 @@
         <jersey1.version>1.19</jersey1.version>
         <jersey2.version>2.25.1</jersey2.version>
         <jaxrs.version>2.0.1</jaxrs.version>
-        <cassandra.version>3.4.0</cassandra.version>
+        <cassandra.version>3.6.0</cassandra.version>
         <zookeeper.version>3.4.11</zookeeper.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -114,6 +116,9 @@
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
+                    <excludes>
+				     	<exclude>jar/**</exclude>
+				   	</excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -169,12 +174,7 @@
 
     <dependencies>
         <!-- Development -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
+       
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -182,7 +182,12 @@
             <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>
@@ -212,7 +217,6 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
-        
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -220,7 +224,6 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
-        
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -234,7 +237,6 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
-        
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -308,7 +310,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.0.56.Final</version>
+            <version>4.1.30.Final</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -328,8 +330,24 @@
         <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> -->
+        <!-- Added to fix MUSIC-157 License Issue -->
+	<dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+
     </dependencies>
 
     <reporting>
@@ -384,17 +402,30 @@
                                 </image>
                                 <!-- Cassandra -->
                                 <image>
-                                    <name>onap/music/cassandra_music</name>
-                                    <alias>docker_cassandra</alias>
+                                    <name>onap/music/cassandra_3_11</name>
+                                    <alias>docker_cassandra_sec</alias>
                                     <build>
                                         <cleanup>true</cleanup>
                                         <tags>
-                                            <tag>3.0-${timestamp}</tag>
-                                            <tag>3.0-latest</tag>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</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>