summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTschaen, Brendan <ctschaen@att.com>2020-04-17 09:53:43 -0400
committerTschaen, Brendan <ctschaen@att.com>2020-05-05 14:11:29 -0400
commitff2ae2627755526cdb58d68ef52b18ba5f02de9f (patch)
tree4d1abc58edba76df82d872d78c74ead9eb29db82
parent24dee700827ad51214e56f51d527749a33efa96f (diff)
Remove key.properties
Issue-ID: MUSIC-582 Signed-off-by: Tschaen, Brendan <ctschaen@att.com> Change-Id: I52cbc8399a27006f70db2f8f4dff4dc09856d9da
-rwxr-xr-xmusic-core/pom.xml4
-rwxr-xr-xmusic-rest/pom.xml6
-rw-r--r--music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java3
-rwxr-xr-xpom.xml2
-rwxr-xr-xversion.properties2
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 @@
<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 4dad5e81..5ffe3499 100755
--- 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 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 @@
<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 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}