From 9b6efbd93a12c858a0d2643013217ec3d6c3a46d Mon Sep 17 00:00:00 2001
From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" <tn1381@att.com>
Date: Mon, 16 Jul 2018 16:41:20 -0400
Subject: various Updates

Q-api,
triggers,
conductor conditional updates.
Bug fixes

Change-Id: Iec392309787cd90f0a2827a2955399723640e800
Issue-ID: MUSIC-93
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
---
 pom.xml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index b3e0ebb7..7fc4c907 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
     <packaging>war</packaging>
-    <version>2.5.14</version>
+    <version>3.0.3</version>
     <description>
             This is the MUSIC REST interface, packaged as a war file.
     </description>
@@ -115,8 +115,8 @@
                     <source>1.7</source>
                     <target>1.7</target>
                     <excludes>
-			<exclude>jar/**</exclude>
-		    </excludes>
+				     	<exclude>jar/**</exclude>
+				   	</excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -333,6 +333,11 @@
             <artifactId>guava</artifactId>
             <version>19.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.mindrot</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>0.4</version>
+        </dependency>
     </dependencies>
 
     <reporting>
@@ -364,13 +369,6 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <version>0.19.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.github.jnr</groupId>
-                                <artifactId>jnr-unixsocket</artifactId>
-                                <version>0.13</version>
-                            </dependency>
-                        </dependencies>
                         <configuration>
                             <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
@@ -399,8 +397,8 @@
                                     <build>
                                         <cleanup>true</cleanup>
                                         <tags>
-                                            <tag>3.0.0-${timestamp}</tag>
-                                            <tag>3.0.0-latest</tag>
+                                            <tag>3.0-${timestamp}</tag>
+                                            <tag>3.0-latest</tag>
                                         </tags>
                                         <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir>
                                     </build>
-- 
cgit 1.2.3-korg