Fix loading of ssl keys from external files for dmaap and AAI client4.0.0-ONAP1.1.6dublin

Change-Id: I18a68656ddfc8290e17fb483900c26baf3e25ba6
Issue-ID: DCAEGEN2-1503
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

26 files changed, 149 insertions, 60 deletions

diff --git a/pom.xml b/pom.xml
index 033b19bf..3ca09839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.onap.dcaegen2.services</groupId>
   <artifactId>sdk</artifactId>
-  <version>1.1.5-SNAPSHOT</version>
+  <version>1.1.6-SNAPSHOT</version>
 
   <name>dcaegen2-services-sdk</name>
   <description>Common SDK repo for all DCAE Services (R4)</description>
diff --git a/rest-services/aai-client/pom.xml b/rest-services/aai-client/pom.xml
index 5743d054..6d755c86 100644
--- a/rest-services/aai-client/pom.xml
+++ b/rest-services/aai-client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
index 9c097ef1..21d56c49 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
@@ -61,20 +61,16 @@ public class AaiHttpClientFactory {
     private SslContext createSslContext() {
         if (configuration.enableAaiCertAuth()) {
             final SecurityKeys collectorSecurityKeys = ImmutableSecurityKeys.builder()
-                    .keyStore(ImmutableSecurityKeysStore.of(resource(configuration.keyStorePath()).get()))
-                    .keyStorePassword(Passwords.fromResource(configuration.keyStorePasswordPath()))
-                    .trustStore(ImmutableSecurityKeysStore.of(resource(configuration.trustStorePath()).get()))
-                    .trustStorePassword(Passwords.fromResource(configuration.trustStorePasswordPath()))
+                    .keyStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.keyStorePath())))
+                    .keyStorePassword(Passwords.fromPath(Paths.get(configuration.keyStorePasswordPath())))
+                    .trustStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.trustStorePath())))
+                    .trustStorePassword(Passwords.fromPath(Paths.get(configuration.trustStorePasswordPath())))
                     .build();
             return sslFactory.createSecureClientContext(collectorSecurityKeys);
         }
         return sslFactory.createInsecureClientContext();
     }
 
-    private Try<Path> resource(String resource) {
-        return Try.of(() -> Paths.get(Passwords.class.getResource(resource).toURI()));
-    }
-
     public static RequestDiagnosticContext createRequestDiagnosticContext() {
         return ImmutableRequestDiagnosticContext.builder()
                 .invocationId(UUID.randomUUID()).requestId(UUID.randomUUID()).build();
diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
index f93bfd67..82356034 100644
--- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
+++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
@@ -19,6 +19,8 @@
  */
 package org.onap.dcaegen2.services.sdk.rest.services.aai.client;
 
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
@@ -48,10 +50,10 @@ public final class AaiClientConfigurations {
                 .aaiUserName("sample-username")
                 .aaiUserPassword("sample-password")
                 .aaiIgnoreSslCertificateErrors(false)
-                .trustStorePath("/trust.pkcs12")
-                .trustStorePasswordPath("/trust.pass")
-                .keyStorePath("/server.pkcs12")
-                .keyStorePasswordPath("/server.pass")
+                .trustStorePath(testResourceToPath("/trust.pkcs12"))
+                .trustStorePasswordPath(testResourceToPath("/trust.pass"))
+                .keyStorePath(testResourceToPath("/server.pkcs12"))
+                .keyStorePasswordPath(testResourceToPath("/server.pass"))
                 .enableAaiCertAuth(secure)
                 .aaiHeaders(headers)
                 .aaiProtocol("sample-protocol")
@@ -61,4 +63,12 @@ public final class AaiClientConfigurations {
                 .aaiServiceInstancePath("sample-instance-path")
                 .build();
     }
+
+    private static String testResourceToPath(String resource) {
+        try {
+            return Paths.get(AaiClientConfigurations.class.getResource(resource).toURI()).toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Failed resolving test resource path", e);
+        }
+    }
 }
diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml
index 544224e8..cfe5f757 100644
--- a/rest-services/cbs-client/pom.xml
+++ b/rest-services/cbs-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
         <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/common-dependency/pom.xml b/rest-services/common-dependency/pom.xml
index 9b1bdf2e..ef93e385 100644
--- a/rest-services/common-dependency/pom.xml
+++ b/rest-services/common-dependency/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
         <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml
index c465cef4..be293a2f 100644
--- a/rest-services/dmaap-client/pom.xml
+++ b/rest-services/dmaap-client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java
index 7ee06e9c..d487e19b 100644
--- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java
+++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java
@@ -20,8 +20,6 @@
 
 package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis;
 
-import io.vavr.control.Try;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.jetbrains.annotations.NotNull;
 import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapCustomConfig;
@@ -32,20 +30,17 @@ import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys;
 
 public final class SecurityKeysUtil {
 
-    private SecurityKeysUtil(){
+    private SecurityKeysUtil() {
 
     }
 
     @NotNull
-    public static SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration){
+    public static SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration) {
         return ImmutableSecurityKeys.builder()
-                .keyStore(ImmutableSecurityKeysStore.of(resource(configuration.keyStorePath()).get()))
-                .keyStorePassword(Passwords.fromResource(configuration.keyStorePasswordPath()))
-                .trustStore(ImmutableSecurityKeysStore.of(resource(configuration.trustStorePath()).get()))
-                .trustStorePassword(Passwords.fromResource(configuration.trustStorePasswordPath()))
+                .keyStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.keyStorePath())))
+                .keyStorePassword(Passwords.fromPath(Paths.get(configuration.keyStorePasswordPath())))
+                .trustStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.trustStorePath())))
+                .trustStorePassword(Passwords.fromPath(Paths.get(configuration.trustStorePasswordPath())))
                 .build();
     }
-
-    private static Try<Path> resource(String resource) {
-        return Try.of(() -> Paths.get(Passwords.class.getResource(resource).toURI()));
-    }}
+}
\ No newline at end of file
diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java
index 9d670c65..e6d96a7e 100644
--- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java
+++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java
@@ -36,16 +36,19 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis.SecurityK
 import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys;
 import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory;
 
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
 
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 7/5/18
  */
 class DMaaPReactiveWebClientFactoryTest {
 
-    private static final String KEY_STORE_RESOURCE_PATH = "/org.onap.dcae.jks";
-    private static final String KEY_STORE_PASS_RESOURCE_PATH = "/keystore.password";
-    private static final String TRUST_STORE_RESOURCE_PATH = "/org.onap.dcae.trust.jks";
-    private static final String TRUST_STORE_PASS_RESOURCE_PATH = "/truststore.password";
+    private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks");
+    private static final String KEY_STORE_PASS_FILE_PATH = testResourceToPath("/keystore.password");
+    private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks");
+    private static final String TRUST_STORE_PASS_FILE_PATH = testResourceToPath("/truststore.password");
     private SslFactory sslFactory = mock(SslFactory.class);
     private SslContext dummySslContext = mock(SslContext.class);
     private DMaaPReactiveWebClientFactory webClientFactory = new DMaaPReactiveWebClientFactory(sslFactory);
@@ -98,13 +101,21 @@ class DMaaPReactiveWebClientFactoryTest {
         DmaapConsumerConfiguration dmaapConsumerConfiguration = mock(DmaapConsumerConfiguration.class);
 
         when(dmaapConsumerConfiguration.enableDmaapCertAuth()).thenReturn(true);
-        when(dmaapConsumerConfiguration.keyStorePath()).thenReturn(KEY_STORE_RESOURCE_PATH);
-        when(dmaapConsumerConfiguration.keyStorePasswordPath()).thenReturn(KEY_STORE_PASS_RESOURCE_PATH);
-        when(dmaapConsumerConfiguration.trustStorePath()).thenReturn(TRUST_STORE_RESOURCE_PATH);
-        when(dmaapConsumerConfiguration.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASS_RESOURCE_PATH);
+        when(dmaapConsumerConfiguration.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH);
+        when(dmaapConsumerConfiguration.keyStorePasswordPath()).thenReturn(KEY_STORE_PASS_FILE_PATH);
+        when(dmaapConsumerConfiguration.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH);
+        when(dmaapConsumerConfiguration.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASS_FILE_PATH);
 
         when(sslFactory.createSecureClientContext(any(SecurityKeys.class))).thenReturn(dummySslContext);
 
         return dmaapConsumerConfiguration;
     }
+
+    private static String testResourceToPath(String resource) {
+        try {
+            return Paths.get(DMaaPReactiveWebClientFactoryTest.class.getResource(resource).toURI()).toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Failed resolving test resource path", e);
+        }
+    }
 }
\ No newline at end of file
diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java
index 80cf2243..2a891dcd 100644
--- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java
+++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java
@@ -26,13 +26,16 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration;
 
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
 
 class DmaaPRestTemplateFactoryTest {
 
-    private static final String KEY_STORE_RESOURCE_PATH = "/org.onap.dcae.jks";
-    private static final String KEYSTORE_PASSWORD_RESOURCE_PATH = "/keystore.password";
-    private static final String TRUSTSTORE_PASSWORD_RESOURCE_PATH = "/truststore.password";
-    private static final String TRUST_STORE_RESOURCE_PATH = "/org.onap.dcae.trust.jks";
+    private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks");
+    private static final String KEYSTORE_PASSWORD_FILE_PATH = testResourceToPath("/keystore.password");
+    private static final String TRUSTSTORE_PASSWORD_FILE_PATH = testResourceToPath("/truststore.password");
+    private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks");
     private DmaapPublisherConfiguration publisherConfiguration = mock(DmaapPublisherConfiguration.class);
     private DmaaPRestTemplateFactory factory = new DmaaPRestTemplateFactory();
 
@@ -46,13 +49,21 @@ class DmaaPRestTemplateFactoryTest {
     @Test
     void build_shouldCreateRestTemplateWithSslConfiguration() {
         when(publisherConfiguration.enableDmaapCertAuth()).thenReturn(true);
-        when(publisherConfiguration.keyStorePath()).thenReturn(KEY_STORE_RESOURCE_PATH);
+        when(publisherConfiguration.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH);
         when(publisherConfiguration.keyStorePasswordPath()).thenReturn(
-                KEYSTORE_PASSWORD_RESOURCE_PATH);
-        when(publisherConfiguration.trustStorePath()).thenReturn(TRUST_STORE_RESOURCE_PATH);
+                KEYSTORE_PASSWORD_FILE_PATH);
+        when(publisherConfiguration.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH);
         when(publisherConfiguration.trustStorePasswordPath()).thenReturn(
-                TRUSTSTORE_PASSWORD_RESOURCE_PATH);
+                TRUSTSTORE_PASSWORD_FILE_PATH);
 
         Assertions.assertNotNull(factory.build(publisherConfiguration));
     }
+
+    private static String testResourceToPath(String resource) {
+        try {
+            return Paths.get(DmaaPRestTemplateFactoryTest.class.getResource(resource).toURI()).toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Failed resolving test resource path", e);
+        }
+    }
 }
\ No newline at end of file
diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java
new file mode 100644
index 00000000..09c6de2b
--- /dev/null
+++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java
@@ -0,0 +1,66 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis;
+
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapCustomConfig;
+import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys;
+
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+class SecurityKeysUtilTest {
+
+    private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks");
+    private static final String KEY_STORE_PASSWORD_FILE_PATH = testResourceToPath("/keystore.password");
+    private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks");
+    private static final String TRUST_STORE_PASSWORD_FILE_PATH = testResourceToPath("/truststore.password");
+
+    private DmaapCustomConfig dmaapConfig = mock(DmaapCustomConfig.class);
+
+    @Test
+    void shouldLoadSecurityKeysUsingSpecifiedFilePaths() {
+        when(dmaapConfig.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH);
+        when(dmaapConfig.keyStorePasswordPath()).thenReturn(KEY_STORE_PASSWORD_FILE_PATH);
+        when(dmaapConfig.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH);
+        when(dmaapConfig.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASSWORD_FILE_PATH);
+
+        SecurityKeys securityKeys = SecurityKeysUtil.fromDmappCustomConfig(dmaapConfig);
+
+        assertEquals("mYHC98!qX}7h?W}jRv}MIXTJ", securityKeys.keyStorePassword().use(String::new));
+        assertEquals(Paths.get(KEY_STORE_FILE_PATH), securityKeys.keyStore().path());
+        assertEquals("*TQH?Lnszprs4LmlAj38yds(", securityKeys.trustStorePassword().use(String::new));
+        assertEquals(Paths.get(TRUST_STORE_FILE_PATH), securityKeys.trustStore().path());
+    }
+
+    private static String testResourceToPath(String resource) {
+        try {
+            return Paths.get(SecurityKeysUtilTest.class.getResource(resource).toURI()).toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Failed resolving test resource path", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/rest-services/model/pom.xml b/rest-services/model/pom.xml
index 187a9b66..e18d1e9e 100644
--- a/rest-services/model/pom.xml
+++ b/rest-services/model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
         <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/pom.xml b/rest-services/pom.xml
index 148b0fa4..7c2fe174 100644
--- a/rest-services/pom.xml
+++ b/rest-services/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk</groupId>
diff --git a/security/crypt-password/pom.xml b/security/crypt-password/pom.xml
index d3b4415c..21d3dddd 100644
--- a/security/crypt-password/pom.xml
+++ b/security/crypt-password/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk.security</groupId>
     <artifactId>dcaegen2-services-sdk-security</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/security/pom.xml b/security/pom.xml
index e8e1397a..d9f83caf 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk.security</groupId>
diff --git a/security/ssl/pom.xml b/security/ssl/pom.xml
index 84f3d65d..8d76ffb5 100644
--- a/security/ssl/pom.xml
+++ b/security/ssl/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk.security</groupId>
     <artifactId>dcaegen2-services-sdk-security</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>ssl</artifactId>
diff --git a/services/hv-ves-client/pom.xml b/services/hv-ves-client/pom.xml
index ac6fb9ea..c9ed9eec 100644
--- a/services/hv-ves-client/pom.xml
+++ b/services/hv-ves-client/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-services</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
diff --git a/services/hv-ves-client/producer/api/pom.xml b/services/hv-ves-client/producer/api/pom.xml
index dfb41904..56f678ce 100644
--- a/services/hv-ves-client/producer/api/pom.xml
+++ b/services/hv-ves-client/producer/api/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
         <artifactId>hvvesclient-producer</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>hvvesclient-producer-api</artifactId>
diff --git a/services/hv-ves-client/producer/ct/pom.xml b/services/hv-ves-client/producer/ct/pom.xml
index ca098bd7..fe679aff 100644
--- a/services/hv-ves-client/producer/ct/pom.xml
+++ b/services/hv-ves-client/producer/ct/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
         <artifactId>hvvesclient-producer</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>hvvesclient-producer-ct</artifactId>
diff --git a/services/hv-ves-client/producer/impl/pom.xml b/services/hv-ves-client/producer/impl/pom.xml
index 49a67e73..050d96e8 100644
--- a/services/hv-ves-client/producer/impl/pom.xml
+++ b/services/hv-ves-client/producer/impl/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>hvvesclient-producer</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>hvvesclient-producer-impl</artifactId>
diff --git a/services/hv-ves-client/producer/pom.xml b/services/hv-ves-client/producer/pom.xml
index 9a644d55..87658334 100644
--- a/services/hv-ves-client/producer/pom.xml
+++ b/services/hv-ves-client/producer/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>hvvesclient-producer</artifactId>
diff --git a/services/hv-ves-client/protobuf/pom.xml b/services/hv-ves-client/protobuf/pom.xml
index 6c338d6e..b4835bde 100644
--- a/services/hv-ves-client/protobuf/pom.xml
+++ b/services/hv-ves-client/protobuf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
         <groupId>org.onap.dcaegen2.services.sdk</groupId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <name>High Volume VES Collector Client :: Protobuf</name>
diff --git a/services/pom.xml b/services/pom.xml
index b703afdd..e564dd8e 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk</groupId>
diff --git a/standardization/api-custom-header/pom.xml b/standardization/api-custom-header/pom.xml
index b6da940b..94f56228 100644
--- a/standardization/api-custom-header/pom.xml
+++ b/standardization/api-custom-header/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-standardization</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   
diff --git a/standardization/pom.xml b/standardization/pom.xml
index d75329e9..3a5a2658 100644
--- a/standardization/pom.xml
+++ b/standardization/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/version.properties b/version.properties
index dba81ff4..17ddbd49 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1

 minor=1

-patch=5

+patch=6

 base_version=${major}.${minor}.${patch}

 release_version=${base_version}

 snapshot_version=${base_version}-SNAPSHOT