Default Cipher to empty string

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

diff --git a/music-core/pom.xml b/music-core/pom.xml
index 2ee2b45..cf7f59e 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.39-SNAPSHOT</version>
+    <version>3.2.40-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.39-SNAPSHOT</version>
+        <version>3.2.40-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 5ffe349..9bcfd39 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.39-SNAPSHOT</version>
+    <version>3.2.40-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.39-SNAPSHOT</version>
+        <version>3.2.40-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -127,7 +127,7 @@
         <dependency>
           <groupId>org.onap.music</groupId>
           <artifactId>MUSIC-core</artifactId>
-          <version>3.2.39-SNAPSHOT</version>
+          <version>3.2.40-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 e98031d..11dc51d 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
@@ -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 facfc15..05bdaef 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.39-SNAPSHOT</version>
+    <version>3.2.40-SNAPSHOT</version>
     <description>
             This is the MUSIC project.
     </description>

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