Remove key.properties

Issue-ID: MUSIC-582
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I52cbc8399a27006f70db2f8f4dff4dc09856d9da

diff --git a/music-core/pom.xml b/music-core/pom.xml
index 2001848..2ee2b45 100755 (executable)
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC-core</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.38-SNAPSHOT</version>
+    <version>3.2.39-SNAPSHOT</version>
     <description>
             This is the MUSIC core interface, packaged as a jar file.
     </description>
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.onap.music</groupId>
         <artifactId>MUSIC</artifactId>
-        <version>3.2.38-SNAPSHOT</version>
+        <version>3.2.39-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 4dad5e8..5ffe349 100755 (executable)
--- a/music-rest/pom.xml
+++ b/music-rest/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC-rest</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.38-SNAPSHOT</version>
+    <version>3.2.39-SNAPSHOT</version>
     <description>
             This is the MUSIC Spring-based REST service.
     </description>
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.onap.music</groupId>
         <artifactId>MUSIC</artifactId>
-        <version>3.2.38-SNAPSHOT</version>
+        <version>3.2.39-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -127,7 +127,7 @@
         <dependency>
           <groupId>org.onap.music</groupId>
           <artifactId>MUSIC-core</artifactId>
-          <version>3.2.38-SNAPSHOT</version>
+          <version>3.2.39-SNAPSHOT</version>
         </dependency>
         <!-- Jersey -->
         <dependency>

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 3017b6d..e98031d 100644 (file)
--- 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 2faeef9..facfc15 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
     <packaging>pom</packaging>
-    <version>3.2.38-SNAPSHOT</version>
+    <version>3.2.39-SNAPSHOT</version>
     <description>
             This is the MUSIC project.
     </description>

diff --git a/version.properties b/version.properties
index 842b137..11cb9db 100755 (executable)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=3
 minor=2
-patch=38
+patch=39
 
 base_version=${major}.${minor}.${patch}