From a3cd1553531d81ca88b4d2f426fe527dd1e909a8 Mon Sep 17 00:00:00 2001
From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" <tn1381@att.com>
Date: Mon, 8 Oct 2018 14:29:46 -0400
Subject: Update to support Encrypted password

 in properties.

 Update duplicate entries in pom file.
 Add dependency
 Fix Version

Change-Id: If427601841c14cb14232452b4ec8236e76075275
Issue-ID: MUSIC-146
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
---
 jar/pom.xml | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'jar/pom.xml')

diff --git a/jar/pom.xml b/jar/pom.xml
index e5b9d802..9fc8ff30 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <!-- 
  ============LICENSE_START==========================================
  org.onap.music
@@ -8,24 +7,25 @@
   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.
   See the License for the specific language governing permissions and
   limitations under the License.
-
+ 
  ============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.7</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>0.1.1</version>
+        <relativePath />
     </parent>
 
     <properties>
@@ -185,6 +185,7 @@
             <scope>provided</scope>
         </dependency>
         <!-- /Development -->
+        
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -214,6 +215,7 @@
             <version>1.0.1-oss</version>
         </dependency>
         <!-- End Logging -->
+        
         <!-- Cassandra -->       
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
@@ -221,6 +223,7 @@
             <version>${cassandra.version}</version>
         </dependency>
         <!-- /Cassandra -->       
+        
         <!-- Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
@@ -234,6 +237,7 @@
             </exclusions>
         </dependency>
         <!-- /Zookeeper -->
+        
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -327,12 +331,26 @@
         <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>
+        <!-- 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>
-- 
cgit 1.2.3-korg