From 40be06f981424b1f85384df45ce96147a741b4d5 Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Sat, 18 Apr 2020 10:36:07 -0400 Subject: Default Cipher to empty string Issue-ID: MUSIC-582 Signed-off-by: Tschaen, Brendan Change-Id: I85a59925a40e196847983a7e60aa6d30b046d7e8 --- music-core/pom.xml | 4 ++-- music-rest/pom.xml | 6 +++--- music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java | 2 +- pom.xml | 2 +- version.properties | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/music-core/pom.xml b/music-core/pom.xml index 2ee2b454..cf7f59e9 100755 --- a/music-core/pom.xml +++ b/music-core/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC-core jar - 3.2.39-SNAPSHOT + 3.2.40-SNAPSHOT This is the MUSIC core interface, packaged as a jar file. @@ -36,7 +36,7 @@ org.onap.music MUSIC - 3.2.39-SNAPSHOT + 3.2.40-SNAPSHOT diff --git a/music-rest/pom.xml b/music-rest/pom.xml index 5ffe3499..9bcfd396 100755 --- a/music-rest/pom.xml +++ b/music-rest/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC-rest jar - 3.2.39-SNAPSHOT + 3.2.40-SNAPSHOT This is the MUSIC Spring-based REST service. @@ -36,7 +36,7 @@ org.onap.music MUSIC - 3.2.39-SNAPSHOT + 3.2.40-SNAPSHOT @@ -127,7 +127,7 @@ org.onap.music MUSIC-core - 3.2.39-SNAPSHOT + 3.2.40-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 e98031d9..11dc51dd 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 @@ -119,7 +119,7 @@ public class PropertiesLoader implements InitializingBean { @Value("${music.aaf.ns}") private String musicAafNs; - @Value("${cipher.enc.key}") + @Value("${cipher.enc.key:}") private String cipherEncKey; @SuppressWarnings("unused") diff --git a/pom.xml b/pom.xml index facfc154..05bdaefb 100755 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.music MUSIC pom - 3.2.39-SNAPSHOT + 3.2.40-SNAPSHOT This is the MUSIC project. diff --git a/version.properties b/version.properties index 11cb9db7..246c08f5 100755 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=2 -patch=39 +patch=40 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg