From 95af4009b19a16a949d9e5b2ba782119f8ff41b5 Mon Sep 17 00:00:00 2001
From: "Lo, WEI-TING(wl849v)" <wl849v@att.com>
Date: Fri, 4 May 2018 15:39:37 -0400
Subject: Music version upgrade

Issue-ID: PORTAL-210

Music version upgrade

Change-Id: I78e2091d132922413c704c015aad81d70e244a64
Signed-off-by: Lo, WEI-TING(wl849v) <wl849v@att.com>
---
 ecomp-sdk/epsdk-app-os/src/main/resources/music.properties          | 2 +-
 ecomp-sdk/epsdk-music/pom.xml                                       | 2 +-
 .../src/main/java/org/onap/portalapp/music/util/MusicUtil.java      | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
index fdf6e499..9645a777 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
@@ -4,7 +4,7 @@ music.session.meta.tables = spring_session
 #music.cache = false
 music.serialize.compress = true
 music.session.max.inactive.interval.seconds = 1800
-music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume
+music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume,/auxapi/.*
 #By default it's eventual
 music.atomic.get = false
 music.atomic.put = false
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 44970e13..5ef0d469 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -125,7 +125,7 @@
 		<dependency>
 			<groupId>org.onap.music</groupId>
 			<artifactId>MUSIC</artifactId>
-			<version>2.5.3</version>
+			<version>2.5.4</version>
 		</dependency>
 		
 		<!-- Mapper -->
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
index ff1edb74..d7de16bd 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
@@ -144,7 +144,11 @@ public class MusicUtil {
 	
 	public static boolean isExcludedApi(String api){
 		Set<String> excludedApiSet = getMusicExcludedAPI();
-		return excludedApiSet.contains(api);
+		for(String str: excludedApiSet){
+			if(api.matches(str))
+				return true;
+		}
+		return false;
 	}
 
 	public static boolean isMusicSerializeCompress(){
-- 
cgit 1.2.3-korg