Merge "Sonar Fixes - MusicHealthCheck.java"

[music.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 15533ef..01db830 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,8 @@
  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.
@@ -16,7 +18,7 @@
   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=============================================
  ====================================================================
 -->
@@ -25,12 +27,12 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
     <packaging>war</packaging>
-    <version>3.0.13-SNAPSHOT</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>1.2.0</version>
@@ -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>
@@ -172,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>
@@ -190,6 +187,7 @@
                        <artifactId>hazelcast-client</artifactId>
                        <version>3.7.1</version>
                </dependency> -->
+               
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -219,7 +217,6 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
-
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -227,7 +224,6 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
-
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -241,7 +237,6 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
-
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -315,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>
@@ -335,17 +330,22 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
             <version>0.4</version>
         </dependency>
-        <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>
@@ -402,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>