From 99f396136789182931fbded1127856247593d91b Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Fri, 17 Apr 2020 09:53:43 -0400 Subject: [PATCH] Remove key.properties Issue-ID: MUSIC-582 Signed-off-by: Tschaen, Brendan Change-Id: I52cbc8399a27006f70db2f8f4dff4dc09856d9da --- music-core/pom.xml | 4 ++-- music-rest/pom.xml | 6 +++--- music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java | 3 ++- pom.xml | 2 +- version.properties | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/music-core/pom.xml b/music-core/pom.xml index 20018484..2ee2b454 100755 --- a/music-core/pom.xml +++ b/music-core/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC-core jar - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT This is the MUSIC core interface, packaged as a jar file. @@ -36,7 +36,7 @@ org.onap.music MUSIC - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT diff --git a/music-rest/pom.xml b/music-rest/pom.xml index 4dad5e81..5ffe3499 100755 --- a/music-rest/pom.xml +++ b/music-rest/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC-rest jar - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT This is the MUSIC Spring-based REST service. @@ -36,7 +36,7 @@ org.onap.music MUSIC - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT @@ -127,7 +127,7 @@ org.onap.music MUSIC-core - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT diff --git a/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java b/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java index 3017b6d3..e98031d9 100644 --- a/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java +++ b/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java @@ -33,7 +33,8 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.stereotype.Component; -@PropertySource(value = {"file:/opt/app/music/etc/music.properties", "classpath:/project.properties","file:/opt/app/music/etc/key.properties"}) +@PropertySource(value = {"file:/opt/app/music/etc/music.properties", "classpath:/project.properties"}) +//"file:/opt/app/music/etc/key.properties" @Component public class PropertiesLoader implements InitializingBean { diff --git a/pom.xml b/pom.xml index 2faeef98..facfc154 100755 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC pom - 3.2.38-SNAPSHOT + 3.2.39-SNAPSHOT This is the MUSIC project. diff --git a/version.properties b/version.properties index 842b137d..11cb9db7 100755 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=2 -patch=38 +patch=39 base_version=${major}.${minor}.${patch} -- 2.16.6