Merge "Read lock promotion"

[music.git] / jar / pom.xml

diff --git a/jar/pom.xml b/jar/pom.xml
old mode 100644 (file)
new mode 100755 (executable)
index b068aee..af4bdb6
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!-- 
+<!--
  ============LICENSE_START==========================================
  org.onap.music
  ===================================================================
@@ -20,12 +19,13 @@
  ============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>jar</packaging>
-    <version>2.5.6</version>
+    <version>2.5.10-SNAPSHOT</version>
     <description>
             This is the MUSIC REST interface, packaged as a war file.
     </description>
@@ -33,8 +33,8 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
+        <version>2.0.0</version>
+        <relativePath />
     </parent>
 
     <properties>
@@ -44,6 +44,7 @@
         <jaxrs.version>2.0.1</jaxrs.version>
         <cassandra.version>3.4.0</cassandra.version>
         <zookeeper.version>3.4.11</zookeeper.version>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -115,8 +116,8 @@
                     <source>1.7</source>
                     <target>1.7</target>
                     <excludes>
-                                       <exclude>jar/**</exclude>
-                                       </excludes>
+                         <exclude>jar/**</exclude>
+                       </excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -185,7 +186,6 @@
             <scope>provided</scope>
         </dependency>
         <!-- /Development -->
-
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -216,13 +216,13 @@
         </dependency>
         <!-- End Logging -->
 
-        <!-- Cassandra -->       
+        <!-- Cassandra -->
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
             <version>${cassandra.version}</version>
         </dependency>
-        <!-- /Cassandra -->       
+        <!-- /Cassandra -->
 
         <!-- Zookeeper -->
         <dependency>
@@ -254,10 +254,10 @@
             <artifactId>jersey-json</artifactId>
             <version>${jersey1.version}</version>
         </dependency>
-        <dependency> 
-            <groupId>com.sun.jersey</groupId> 
-            <artifactId>jersey-servlet</artifactId> 
-            <version>${jersey1.version}</version> 
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+            <version>${jersey1.version}</version>
         </dependency>
         <!-- /Jersey -->
 
@@ -311,7 +311,32 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.0.56.Final</version>
+            <version>4.1.33.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.1.33.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.1.33.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.1.33.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver</artifactId>
+            <version>4.1.33.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.1.33.Final</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -331,13 +356,31 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-
+            <version>19.0</version>
         </dependency>
         <dependency>
+            <groupId>de.svenkubiak</groupId>
+            <artifactId>jBCrypt</artifactId>
+            <version>0.4.1</version>
+        </dependency>
+        <!-- <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
             <version>0.4</version>
+        </dependency>-->
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.0</version>
+        </dependency>
+
     </dependencies>
 
     <reporting>
@@ -404,14 +447,14 @@
                                     </build>
                                 </image>
                                 <!-- Zookeeper -->
-                                <!-- <image> <name>onap/music/zookeeper_music</name> 
-                                    <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag> 
-                                    <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir> 
+                                <!-- <image> <name>onap/music/zookeeper_music</name>
+                                    <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag>
+                                    <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir>
                                     </build> </image> -->
                                 <!-- tomcat 8.5 -->
-                                <!-- <image> <name>onap/music/tomcat_music</name> 
-                                    <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag> 
-                                    <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir> 
+                                <!-- <image> <name>onap/music/tomcat_music</name>
+                                    <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
+                                    <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
                                     </build> </image>\ -->
                             </images>
                         </configuration>