diff options
| author |   Tschaen, Brendan <ctschaen@att.com> | 2020-04-18 10:36:07 -0400 |
|---|---|---|
| committer | Tschaen, Brendan <ctschaen@att.com> | 2020-05-05 14:11:46 -0400 |
| commit | 40be06f981424b1f85384df45ce96147a741b4d5 (patch) | |
| tree | 6797af2036ccf225f4651d17c860ba92bde25786 | |
| parent | ff2ae2627755526cdb58d68ef52b18ba5f02de9f (diff) | |
Default Cipher to empty string
Issue-ID: MUSIC-582
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I85a59925a40e196847983a7e60aa6d30b046d7e8
| -rwxr-xr-x | music-core/pom.xml | 4 | ||||
| -rwxr-xr-x | music-rest/pom.xml | 6 | ||||
| -rw-r--r-- | music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java | 2 | ||||
| -rwxr-xr-x | pom.xml | 2 | ||||
| -rwxr-xr-x | 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 @@ <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 5ffe3499..9bcfd396 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.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 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") @@ -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 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} |