Fix build

Fix catalog-be tests and Integration docker test
this fix is not final as it just avoids concurrency issues on statics
Fix Expired certificates on Vendorsoftwareproduct

Issue-ID: SDC-3467
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I311470b305a29bebffbd74b6f2ad7b13193132e1

36 files changed, 212 insertions, 150 deletions

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 4ddcf10ef2..85674cb8cc 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -805,7 +805,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkCount>1</forkCount>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
index 5585bc0b25..dcf963fc29 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
@@ -21,7 +21,7 @@ if node['basic_auth']
   basic_auth_user = node['basic_auth']['user_name']
   basic_auth_pass = node['basic_auth']['user_pass']
   if basic_auth_enabled
-    basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+    basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
   else
     # set default user configuration file
     basic_auth_config = ""
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
index ffa1fee66b..27b1a7d5b9 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
@@ -14,7 +14,7 @@ if node['basic_auth']
   basic_auth_user = node['basic_auth']['user_name']
   basic_auth_pass = node['basic_auth']['user_pass']
   if basic_auth_enabled
-    basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+    basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
   else
     # set default user configuration file
     basic_auth_config = ""
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
index 04fb25f49e..0abda0d07a 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
@@ -16,7 +16,7 @@ if node['basic_auth']
   basic_auth_user = node['basic_auth']['user_name']
   basic_auth_pass = node['basic_auth']['user_pass']
   if basic_auth_enabled
-    basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+    basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
   else
     # set default user configuration file
     basic_auth_config = ""
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
index 2e62981820..ae8d2948e0 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
@@ -135,7 +135,7 @@ public class AssetsDataServletTest extends JerseyTest {
         Mockito.doReturn(Either.left(resourceAssetMetadata)).when(assetMetadataConverter).convertToSingleAssetMetadata(Mockito.eq(resource), Mockito.anyString(),
                 Mockito.eq(true));
 
-        String appConfigDir = "src/test/resources/config";
+        String appConfigDir = "src/test/resources/config/catalog-be";
         ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
         ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
index 7482c69c05..a7db4ba6c4 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
@@ -346,7 +346,7 @@ public class ExternalRefServletTest extends JerseyTest {
         when(userAdmin.getUser(otherUser.getUserId(), false)).thenReturn(otherUser);
         //========================================================================================================================
 
-        String appConfigDir = "src/test/resources/config";
+        String appConfigDir = "src/test/resources/config/catalog-be";
         ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
         ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
index 009fa82b9e..d879b46439 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
@@ -25,6 +25,7 @@ package org.openecomp.sdc.be.servlets;
 import fj.data.Either;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -330,7 +331,7 @@ public class ArchiveEndpointTest extends JerseyTest {
         when(userAdmin.getUser(otherUser.getUserId(), false)).thenReturn(otherUser);
         //========================================================================================================================
 
-        String appConfigDir = "src/test/resources/config";
+        String appConfigDir = "src/test/resources/config/catalog-be";
         ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
         ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
 
@@ -508,6 +509,7 @@ public class ArchiveEndpointTest extends JerseyTest {
     @Override
     protected Application configure() {
         ApplicationContext context = new AnnotationConfigApplicationContext(TestSpringConfig.class);
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return new ResourceConfig(ArchiveEndpoint.class)
                        .register(DefaultExceptionMapper.class)
                        .register(ComponentExceptionMapper.class)
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentInstanceServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentInstanceServletTest.java
index 0eee7a1238..b49ed1763a 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentInstanceServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentInstanceServletTest.java
@@ -57,6 +57,8 @@ import org.openecomp.sdc.be.components.impl.ComponentNodeFilterBusinessLogic;
 import org.openecomp.sdc.be.components.impl.GroupBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
+import org.openecomp.sdc.be.config.Configuration;
+import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.SpringConfig;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -72,11 +74,15 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.web.context.WebApplicationContext;
 
+
 /**
  * The test suite designed for test functionality of ComponentInstanceServlet class
  */
@@ -97,11 +103,19 @@ public class ComponentInstanceServletTest extends JerseyTest {
     private static ResourceImportManager resourceImportManager;
     private static ServiceBusinessLogic serviceBusinessLogic;
     private static ComponentNodeFilterBusinessLogic componentNodeFilterBusinessLogic;
+    private static ConfigurationManager configurationManager;
 
     @BeforeClass
     public static void setup() {
         createMocks();
         stubMethods();
+        String appConfigDir = "src/test/resources/config/catalog-be";
+        ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
+        configurationManager = new ConfigurationManager(configurationSource);
+        org.openecomp.sdc.be.config.Configuration configuration = new org.openecomp.sdc.be.config.Configuration();
+        configuration.setJanusGraphInMemoryGraph(true);
+        configurationManager.setConfiguration(configuration);
+        ExternalConfiguration.setAppName("catalog-be");
     }
 
     @Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java
index 4109f6222c..7674ea9698 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java
@@ -64,6 +64,8 @@ import org.openecomp.sdc.be.components.impl.ResourceImportManager;
 import org.openecomp.sdc.be.components.impl.exceptions.BusinessLogicException;
 import org.openecomp.sdc.be.components.impl.utils.NodeFilterConstraintAction;
 import org.openecomp.sdc.be.components.validation.UserValidations;
+import org.openecomp.sdc.be.config.Configuration;
+import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.SpringConfig;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.utils.ConstraintConvertor;
@@ -82,6 +84,9 @@ import org.openecomp.sdc.be.ui.model.UIConstraint;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -112,7 +117,7 @@ public class ComponentNodeFilterServletTest extends JerseyTest {
     private static ComponentNodeFilterBusinessLogic componentNodeFilterBusinessLogic;
     private static ResponseFormat responseFormat;
     private static UserValidations userValidations;
-
+    private static ConfigurationManager configurationManager;
     private CINodeFilterDataDefinition ciNodeFilterDataDefinition;
     private UIConstraint uiConstraint;
     private String constraint;
@@ -130,6 +135,13 @@ public class ComponentNodeFilterServletTest extends JerseyTest {
         when(request.getHeader("USER_ID")).thenReturn(USER_ID);
         when(webApplicationContext.getBean(ServletUtils.class)).thenReturn(servletUtils);
         when(servletUtils.getComponentsUtils()).thenReturn(componentsUtils);
+        String appConfigDir = "src/test/resources/config/catalog-be";
+        ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
+        configurationManager = new ConfigurationManager(configurationSource);
+        org.openecomp.sdc.be.config.Configuration configuration = new org.openecomp.sdc.be.config.Configuration();
+        configuration.setJanusGraphInMemoryGraph(true);
+        configurationManager.setConfiguration(configuration);
+        ExternalConfiguration.setAppName("catalog-be");
     }
 
     @BeforeEach
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentServletTest.java
index 0e444fee92..77b90ad1de 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentServletTest.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.be.servlets;
 
 import fj.data.Either;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Before;
@@ -65,6 +66,7 @@ public class ComponentServletTest extends JerseySpringBaseTest{
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         resourceBusinessLogic = mock(ResourceBusinessLogic.class);
         UserBusinessLogic userBusinessLogic = mock(UserBusinessLogic.class);
         ComponentsUtils componentsUtils = mock(ComponentsUtils.class);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServletTest.java
index 2da9efbb6d..bcc0f2eadb 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServletTest.java
@@ -62,6 +62,8 @@ import org.openecomp.sdc.be.components.impl.ComponentSubstitutionFilterBusinessL
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
 import org.openecomp.sdc.be.components.impl.exceptions.BusinessLogicException;
 import org.openecomp.sdc.be.components.validation.UserValidations;
+import org.openecomp.sdc.be.config.Configuration;
+import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.SpringConfig;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.utils.ConstraintConvertor;
@@ -77,6 +79,9 @@ import org.openecomp.sdc.be.ui.model.UIConstraint;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -107,7 +112,7 @@ public class ComponentSubstitutionFilterServletTest extends JerseyTest {
     private static ComponentSubstitutionFilterBusinessLogic componentSubstitutionFilterBusinessLogic;
     private static ResponseFormat responseFormat;
     private static UserValidations userValidations;
-
+    private static ConfigurationManager configurationManager;
     private SubstitutionFilterDataDefinition substitutionFilterDataDefinition;
     private RequirementSubstitutionFilterPropertyDataDefinition requirementSubstitutionFilterPropertyDataDefinition;
     private UIConstraint uiConstraint;
@@ -128,6 +133,13 @@ public class ComponentSubstitutionFilterServletTest extends JerseyTest {
         when(request.getHeader("USER_ID")).thenReturn(USER_ID);
         when(webApplicationContext.getBean(ServletUtils.class)).thenReturn(servletUtils);
         when(servletUtils.getComponentsUtils()).thenReturn(componentsUtils);
+        String appConfigDir = "src/test/resources/config/catalog-be";
+        ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
+        configurationManager = new ConfigurationManager(configurationSource);
+        org.openecomp.sdc.be.config.Configuration configuration = new org.openecomp.sdc.be.config.Configuration();
+        configuration.setJanusGraphInMemoryGraph(true);
+        configurationManager.setConfiguration(configuration);
+        ExternalConfiguration.setAppName("catalog-be");
     }
 
     @BeforeEach
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
index 974f286098..af7199c9e6 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
@@ -28,6 +28,7 @@ import org.apache.http.HttpStatus;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -171,7 +172,7 @@ public class ElementServletTest extends JerseyTest {
 
 		when(userAdmin.getUser(designerUser.getUserId(), false)).thenReturn(designerUser);
 
-		String appConfigDir = "src/test/resources/config";
+		String appConfigDir = "src/test/resources/config/catalog-be";
 		ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
 		configurationManager = new ConfigurationManager(configurationSource);
 
@@ -1051,6 +1052,7 @@ public class ElementServletTest extends JerseyTest {
 	@Override
 	protected Application configure() {
 		ApplicationContext context = new AnnotationConfigApplicationContext(SpringConfig.class);
+		forceSet(TestProperties.CONTAINER_PORT, "0");
 		return new ResourceConfig(ElementServlet.class)
 				.register(new AbstractBinder() {
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ExceptionHandlerEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ExceptionHandlerEndpointTest.java
index 07435c4e03..34ff686323 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ExceptionHandlerEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ExceptionHandlerEndpointTest.java
@@ -26,6 +26,7 @@ import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Test;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -62,6 +63,7 @@ public class ExceptionHandlerEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         componentUtils = mock(ComponentsUtils.class);
 
         return super.configure(ExceptionHandlerConfig.class)
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupEndpointTest.java
index 742382155a..957fba244e 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupEndpointTest.java
@@ -28,6 +28,7 @@ import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonP
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -141,6 +142,7 @@ public class GroupEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return super.configure(GroupEndpointTestConfig.class)
                 .register(GroupEndpoint.class)
                 .property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, "WARNING");
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupTypesEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupTypesEndpointTest.java
index 286c1a0656..00e7768ce8 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupTypesEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/GroupTypesEndpointTest.java
@@ -28,6 +28,7 @@ import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -142,6 +143,7 @@ public class GroupTypesEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return super.configure(GroupTypesTestConfig.class)
                 .register(GroupTypesEndpoint.class);
     }
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/InputsServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/InputsServletTest.java
index 0974bd5dd4..9b8b984e30 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/InputsServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/InputsServletTest.java
@@ -25,6 +25,7 @@ import org.glassfish.grizzly.http.util.HttpStatus;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -168,6 +169,7 @@ public class InputsServletTest extends JerseyTest {
         InputsServlet inputsServlet = new InputsServlet(userBusinessLogic, inputsBusinessLogic,
             componentInstanceBL, componentsUtils,
             servletUtils, resourceImportManager, dataTypeBusinessLogic);
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         ResourceConfig resourceConfig = new ResourceConfig()
             .register(inputsServlet)
             .register(new ComponentExceptionMapper(componentsUtils))
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/JerseySpringBaseTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/JerseySpringBaseTest.java
index af5c421078..38eef3c877 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/JerseySpringBaseTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/JerseySpringBaseTest.java
@@ -77,6 +77,7 @@ public abstract class JerseySpringBaseTest extends JerseyTest {
     }
 
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return configure(BaseTestConfig.class);
     }
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
index 1ba2c44a24..4d1b611465 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyServletTest.java
@@ -27,6 +27,7 @@ import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.json.simple.JSONObject;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -489,6 +490,7 @@ public class PolicyServletTest extends JerseySpringBaseTest{
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return super.configure()
                 .register(new PolicyServlet(null, null, componentsUtils,
                     servletUtils, null, businessLogic));
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
index d9f00f4f36..d84ac902fe 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.be.servlets;
 
 import org.apache.http.HttpStatus;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Test;
 import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
 import org.openecomp.sdc.be.components.utils.PolicyTypeBuilder;
@@ -51,6 +52,7 @@ public class PolicyTypesEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         policyTypeBusinessLogic = mock(PolicyTypeBusinessLogic.class);
         componentUtils = mock(ComponentsUtils.class);
         UserBusinessLogic userBusinessLogic = mock(UserBusinessLogic.class);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadEndpointTest.java
index 825b4d8883..c649f71f00 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadEndpointTest.java
@@ -33,6 +33,7 @@ import org.glassfish.jersey.media.multipart.MultiPart;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -129,6 +130,7 @@ public class TypesUploadEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return super.configure(TypesUploadEndpointTest.TypesUploadTestConfig.class)
                 .register(TypesUploadEndpoint.class)
                 .property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, "WARNING");
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadServletTest.java
index a247bd4b35..5c6b7c9f74 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/TypesUploadServletTest.java
@@ -31,6 +31,7 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -123,7 +124,7 @@ public class TypesUploadServletTest extends JerseyTest {
     protected ResourceConfig configure() {
 
 
-
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         TypesUploadServlet typesUploadServlet = new TypesUploadServlet(null, null, componentUtils,
             servletUtils, null, importManager, null,
             null, null,
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/UserEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/UserEndpointTest.java
index fc18459608..3e83199a4c 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/UserEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/UserEndpointTest.java
@@ -29,6 +29,7 @@ import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvi
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.TestProperties;
 import org.janusgraph.graphdb.types.system.EmptyVertex;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -149,6 +150,7 @@ public class UserEndpointTest extends JerseySpringBaseTest {
 
     @Override
     protected ResourceConfig configure() {
+        forceSet(TestProperties.CONTAINER_PORT, "0");
         return super.configure(UserEndpointTest.UserTestConfig.class)
                 .register(UserAdminServlet.class)
                 .property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, "WARNING");
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationTest.java b/catalog-be/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationTest.java
index 0abcf9eb4d..540a2affcf 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationTest.java
@@ -27,7 +27,6 @@ import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.components.BeConfDependentTest;
 
 // TODO - investigate NPE
-@Ignore
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "classpath:cucumber/tenantIsolation.feature", glue = "org.openecomp.sdc.be.components.distribution.engine")
 public class RunTenantIsolationTest  extends BeConfDependentTest {
diff --git a/catalog-be/src/test/resources/cucumber.properties b/catalog-be/src/test/resources/cucumber.properties
new file mode 100644
index 0000000000..aa51b352be
--- /dev/null
+++ b/catalog-be/src/test/resources/cucumber.properties
@@ -0,0 +1 @@
+cucumber.publish.quiet=true
\ No newline at end of file
diff --git a/catalog-ui/package.json b/catalog-ui/package.json
index c303494703..05748e9a38 100644
--- a/catalog-ui/package.json
+++ b/catalog-ui/package.json
@@ -169,5 +169,8 @@
     "webpack-dev-server": "^2.4.1",
     "webpack-merge": "^4.0.0",
     "zone.js": "0.8.5"
+  },
+  "resolutions": {
+    "cypress": "3.8.0"
   }
 }
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
index 4ebacffa0e..f5006ddbc2 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
@@ -145,7 +145,7 @@ public class Configuration extends BasicConfiguration {
 
     private CadiFilterParams cadiFilterParams;
 
-    private Boolean aafAuthNeeded;
+    private Boolean aafAuthNeeded = false;
     private String autoHealingOwner;
     private boolean enableAutoHealing;
     private Map<String, List<String>> resourcesForUpgrade;
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
new file mode 100755
index 0000000000..1caf5ed28e
--- /dev/null
+++ b/csit/run-project-csit.sh
@@ -0,0 +1,2 @@
+# placeholder for scripted csit test execution, needed by jjb template, not used in sdc as we have integrated to our build
+echo OK
\ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java
index 306bc322dc..3b24c4feb6 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java
@@ -110,7 +110,7 @@ public class SecurityManagerTest {
 
     @Test
     public void verifySignedDataTestCertIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException {
-        PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert");
+        PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert");
         byte[] signature = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.cms");
         byte[] archive = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.csar");
         assertTrue(securityManager.verifySignedData(signature, null, archive));
@@ -129,7 +129,7 @@ public class SecurityManagerTest {
 
     @Test
     public void verifySignedDataTestCertNotIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException {
-        PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert");
+        PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert");
         byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms");
         byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar");
         byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cert");
@@ -138,11 +138,11 @@ public class SecurityManagerTest {
 
     @Test
     public void verifySignedDataTestCertIntermediateNotIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException {
-        PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert");
-        PrepareCertFiles("/cert/signing-ca2.crt", cerDirPath + "signing-ca2.crt");
+        PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert");
+        PrepareCertFiles("/cert/package2.cert", cerDirPath + "signing-ca2.crt");
         byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms");
         byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar");
-        byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4-no-intermediate.cert");
+        byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cert");
         assertTrue(securityManager.verifySignedData(signature, cert, archive));
     }
 
@@ -161,7 +161,7 @@ public class SecurityManagerTest {
 
     @Test
     public void verifySignedDataTestCertIncludedIntoSignatureWithWrongIntermediateInDirectory() throws IOException, URISyntaxException, SecurityManagerException {
-        PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert");
+        PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert");
         PrepareCertFiles("/cert/signing-ca1.crt", cerDirPath + "signing-ca1.crt");
         byte[] signature = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.cms");
         byte[] archive = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.csar");
@@ -170,7 +170,7 @@ public class SecurityManagerTest {
 
     @Test
     public void verifySignedDataTestCertWrongIntermediateInDirectory() throws IOException, URISyntaxException, SecurityManagerException {
-        PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert");
+        PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert");
         PrepareCertFiles("/cert/signing-ca1.crt", cerDirPath + "signing-ca1.crt");
         byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms");
         byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar");
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/2-file-signed-package/dummyPnfv4.cms b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/2-file-signed-package/dummyPnfv4.cms
index 6098f22593..28d323bd88 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/2-file-signed-package/dummyPnfv4.cms
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/2-file-signed-package/dummyPnfv4.cms
@@ -1,56 +1,34 @@
 -----BEGIN CMS-----
-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
-Lg==
+MIIF2gYJKoZIhvcNAQcCoIIFyzCCBccCAQExDTALBglghkgBZQMEAgEwCwYJKoZI
+hvcNAQcBoIIDKTCCAyUwggINAhRUrsLad7PxH+qgd8dwnVATh3AwMDANBgkqhkiG
+9w0BAQsFADBPMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTmV3WW9yazELMAkGA1UE
+BwwCTkoxDTALBgNVBAoMBE9OQVAxEjAQBgNVBAMMCU9OQVAgUm9vdDAeFw0yMTAy
+MTUxNjI4MzNaFw0yOTExMjAxNjI4MzNaME8xCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+DAdOZXdZb3JrMQswCQYDVQQHDAJOSjENMAsGA1UECgwET05BUDESMBAGA1UEAwwJ
+T05BUCBTSUdOMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8+9kBQBA
+5EC9Tt22JOzUXSUUbVFzIKVhyl1uu8wUAfu2WVLTS4Wgt5+SFvppSfJckqthfYSc
+z0XpxmHPjJDUpR4WquBLpsIjjUUKYkEnEme9wLijESWCgoB6Xlm5spWx4mJ2VU91
+NWYI0xvaqi7pwzgMqvDWMo4kfwOh+Wx0mihYFSCdbq2LCv4/BeW+QXTWqKhzPqRQ
+zpq/UZY08k0ZDo2omnNFR0snevjrXncRiW9ECvlBUoSN0hdHDP5h6+htthZVB1y1
+/UzHB56wGxPP0CIeFgKjzR72b9H5T7+mtvSz/b6xgDQvWiYmfaCpurgmPMoKokw3
+AVB7RFu5pxVLaQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBawcakZZokwNA9WBIM
+BolrVRAkiRCMnZSZxjoHIMPc+lfRF8+M1gx9DaukIJu3ry+jruJwazByPhQmBIgQ
+WCwp+/faCujwl+ISWfMx15QXdmCPTSzCUAh4EPzfudibvGvwbl2fUk1aCdt+5mpq
+b1j830W8vjHu54DkUTRXoQWMd7ELQUhCMdRl/1XjYoUvPZKDH2P/kQEZi6Q7KrOK
+fl69RddTS3XTx3rjTM9Seo+gxaFXs3Yz03HxFhpzF45g4sOxxiHubArJi52OciPk
+lTdujQ/5+azuV+uxH6jtmL4qjJ5EEiVRxh9cvSw1lmra9y0XHN9IDvTUCoD2Kbb4
+yMV4MYICdzCCAnMCAQEwZzBPMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTmV3WW9y
+azELMAkGA1UEBwwCTkoxDTALBgNVBAoMBE9OQVAxEjAQBgNVBAMMCU9OQVAgUm9v
+dAIUVK7C2nez8R/qoHfHcJ1QE4dwMDAwCwYJYIZIAWUDBAIBoIHkMBgGCSqGSIb3
+DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIxMDIxNTE2MjkxNVow
+LwYJKoZIhvcNAQkEMSIEIPcmukHF/Seoafs3ytYHHqC5aQKafdpn8RqF93mdXTFM
+MHkGCSqGSIb3DQEJDzFsMGowCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBFjALBglg
+hkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMC
+AgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAFCG
+4yedNBOmKNCxMi7oGBbb1qJuD7dQ4zpgvKMDewyv1AuLqoeVu5+xZnjKsKnwjNmN
+kVJg+NR6J7PGNC1g2iiByXMKPpdQ8VxHSC9jIEF8PGoAqeivAmZKZRAQTgYXHg51
+UJFN15EyIc48YELdUqUPGKXMG+69GoAtjkgKZUV0FiGnOAKxtwVIHrAiIr9zGuOw
+lXQqP7NnCrtUjXUq/NXwqLFO4jZ36jys3PuKaYtzOI7oxo/GmJ1I3tfIs64KTTD3
+Orlhh7lInPsMfIn/G36GemBjnd7enWeZuVL231p/u4RRJAgIgvKNx/JgBdggSoou
+hmqxIyu1w8hDHpgLDg0=
 -----END CMS-----
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cert b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cert
index 7d03a59add..13cf353198 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cert
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cert
@@ -1,43 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDOTCCAiECFFqXkiZIzIdNPTG62Jbr3Ub37ZuTMA0GCSqGSIb3DQEBCwUAMHox
-EzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZzaW1wbGUxEzAR
-BgNVBAoMClNpbXBsZSBJbmMxGjAYBgNVBAsMEVNpbXBsZSBTaWduaW5nIENBMRow
-GAYDVQQDDBFTaW1wbGUgU2lnbmluZyBDQTAeFw0yMTAxMTQxMTMxMDhaFw0yMTAy
-MTMxMTMxMDhaMDgxCzAJBgNVBAYTAlBMMQwwCgYDVQQIDANTSUwxDDAKBgNVBAcM
-A1dSTzENMAsGA1UECgwETk9LMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALbulTgLmez9BZHSjMhUNaZURHe12RRAR9JoTTDUJkLr1WVMZRieFUC74PQP
-w51qVy/KAKs7uBUCkpVARcH3sRbdrTDmc3LanUy9hZqzeJdupi+Zp/RlvP+kXTji
-BX4E2hg2a3QBD/zNoBmvLWPTsYsNSxR5mxkm9pL6qFGI84D0l/FWs9jAa60UCBRM
-gIU70JGgU7jx99E6bPUU4Ruuywi8MZpCdW61apVQK1l2rLPSumLm13Ho4l2aI3L+
-bvTy7wzgtURnpHEnOvZUx7pSMwymPOjRvs58sgfQ6FZ0KMkixeHFKdcqwl+msTbN
-a/3nmqCYURmHsYXxaORCBlD3PHcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdBZd
-inECILJpNkfhU8ocqkh9s17KzGtoG/Ybo2LslD/dCXlbbC4rLJdsVaQXKp/j03xF
-ZftRj+NMjRatj9KJ1sibN7YNJDo7u3rk0oKSuMRx4FmI+IzKF8I9usg+CFgA1S+P
-4ndH+3THd9VPjIpuH8yjZ0lXDvqBubnKM11JmW2ljPS7UKPdTasFiIQkV8swVn6d
-3tHBsns/juvGUEDLTdO3lYDK0WEr8pKr+Cj0hcmOZoV8YxBnw402X0g35tzNTAH7
-BhUuGhjRsUksSRPdYjZRjLm/ieIf5huAcWLtEyPDmiHFyNTEDIbSLYncfNDcTsQZ
-NSqYN8Ixin+/mpN86g==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIBBDANBgkqhkiG9w0BAQUFADB0MRMwEQYKCZImiZPyLGQB
-GRYDb3JnMRYwFAYKCZImiZPyLGQBGRYGc2ltcGxlMRMwEQYDVQQKDApTaW1wbGUg
-SW5jMRcwFQYDVQQLDA5TaW1wbGUgUm9vdCBDQTEXMBUGA1UEAwwOU2ltcGxlIFJv
-b3QgQ0EwHhcNMjEwMTE0MTEyOTM4WhcNMzEwMTE0MTEyOTM4WjB6MRMwEQYKCZIm
-iZPyLGQBGRYDb3JnMRYwFAYKCZImiZPyLGQBGRYGc2ltcGxlMRMwEQYDVQQKDApT
-aW1wbGUgSW5jMRowGAYDVQQLDBFTaW1wbGUgU2lnbmluZyBDQTEaMBgGA1UEAwwR
-U2ltcGxlIFNpZ25pbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3pEswhtivkFvXovmrNB3dCkC1ETozigHRJBheCq2k0s23D0YWWrVc3dkQz7Vq
-FOgjwzX3hS+CE34DdijBfd3tO3izTrisuIeXLCFn41t0wYfRvLoe85iO6xaQCU/6
-u9KS/Hd5dJ7eQU4+/cxcCDPUWPdEXIZixI1wwaHnhwoLahYH2mb/uxu+Gw4UJaA2
-1OVjsqX9COdPxE7Ud9soXVnNwAVVwgCdRJS0950y0jz5G6TKgIXCFDYk8l9QszM+
-7J5YcZTVPdGX973MpaoRajg7xv+rooGrZ/IQzUN5dQnDkyIQW1g0u9QX7CuQonob
-aKveJTRwSBkpV+7k+C52B1blAgMBAAGjZjBkMA4GA1UdDwEB/wQEAwIBBjASBgNV
-HRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQlwJ5evFvKOiIAbDQoMd3mGKu2vjAf
-BgNVHSMEGDAWgBQIDNDlUVum5+kHx2k+uqs2o4vTSzANBgkqhkiG9w0BAQUFAAOC
-AQEAQBZLEeLU8u3nsgRvOg5mLUVLPpUnRw41fRTHQL/Onf0lYAONT32KfB8R+Ewn
-4QxyPD/vFaw8t5zTgelYf77mjproExJoLC6mdUXVkew6P5VgK1k2b+pojAFLlq0c
-RSD+Ydv9DMNqhHJHjvVgdpiQACehZRWVaaMcqUhrlk4Tk1Sn+1yTS8aUl58JNnC2
-esy2HY0eDbNUEal6q+yAdukU4qiZy09/WO9l5/72tTFFnmnH9k2oM9kV1+Eck/8D
-db5TjKkC8ufDCwb2coMyVdqsj1ytPQ2g4ofSu2+wBwruvStaCRCcORpmboa+MM55
-3EAieMqi+0Q7+VugRZ19mT9mPg==
+MIIDJTCCAg0CFFSuwtp3s/Ef6qB3x3CdUBOHcDAwMA0GCSqGSIb3DQEBCwUAME8x
+CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdOZXdZb3JrMQswCQYDVQQHDAJOSjENMAsG
+A1UECgwET05BUDESMBAGA1UEAwwJT05BUCBSb290MB4XDTIxMDIxNTE2MjgzM1oX
+DTI5MTEyMDE2MjgzM1owTzELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB05ld1lvcmsx
+CzAJBgNVBAcMAk5KMQ0wCwYDVQQKDARPTkFQMRIwEAYDVQQDDAlPTkFQIFNJR04w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDz72QFAEDkQL1O3bYk7NRd
+JRRtUXMgpWHKXW67zBQB+7ZZUtNLhaC3n5IW+mlJ8lySq2F9hJzPRenGYc+MkNSl
+Hhaq4EumwiONRQpiQScSZ73AuKMRJYKCgHpeWbmylbHiYnZVT3U1ZgjTG9qqLunD
+OAyq8NYyjiR/A6H5bHSaKFgVIJ1urYsK/j8F5b5BdNaoqHM+pFDOmr9RljTyTRkO
+jaiac0VHSyd6+OtedxGJb0QK+UFShI3SF0cM/mHr6G22FlUHXLX9TMcHnrAbE8/Q
+Ih4WAqPNHvZv0flPv6a29LP9vrGANC9aJiZ9oKm6uCY8ygqiTDcBUHtEW7mnFUtp
+AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFrBxqRlmiTA0D1YEgwGiWtVECSJEIyd
+lJnGOgcgw9z6V9EXz4zWDH0Nq6Qgm7evL6Ou4nBrMHI+FCYEiBBYLCn799oK6PCX
+4hJZ8zHXlBd2YI9NLMJQCHgQ/N+52Ju8a/BuXZ9STVoJ237mampvWPzfRby+Me7n
+gORRNFehBYx3sQtBSEIx1GX/VeNihS89koMfY/+RARmLpDsqs4p+Xr1F11NLddPH
+euNMz1J6j6DFoVezdjPTcfEWGnMXjmDiw7HGIe5sCsmLnY5yI+SVN26ND/n5rO5X
+67EfqO2YviqMnkQSJVHGH1y9LDWWatr3LRcc30gO9NQKgPYptvjIxXg=
 -----END CERTIFICATE-----
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cms b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cms
index 5c0239a84d..187ec7f547 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cms
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/3-file-signed-package/dummyPnfv4.cms
@@ -1,18 +1,17 @@
 -----BEGIN CMS-----
-MIIC2QYJKoZIhvcNAQcCoIICyjCCAsYCAQExDTALBglghkgBZQMEAgEwCwYJKoZI
-hvcNAQcBMYICozCCAp8CAQEwgZIwejETMBEGCgmSJomT8ixkARkWA29yZzEWMBQG
-CgmSJomT8ixkARkWBnNpbXBsZTETMBEGA1UECgwKU2ltcGxlIEluYzEaMBgGA1UE
-CwwRU2ltcGxlIFNpZ25pbmcgQ0ExGjAYBgNVBAMMEVNpbXBsZSBTaWduaW5nIENB
-AhRal5ImSMyHTT0xutiW691G9+2bkzALBglghkgBZQMEAgGggeQwGAYJKoZIhvcN
-AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjEwMTE0MTIxOTU4WjAv
-BgkqhkiG9w0BCQQxIgQg9ya6QcX9J6hp+zfK1gceoLlpApp92mfxGoX3eZ1dMUww
-eQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsGCWCG
-SAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwIC
-AUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEggEAdOCW
-TAQvGstVNgytaVTikXWUmqFC5dNq96cDKCfyNYLeaXg2ZqSmzyhyfFz4pChmaG2P
-hO9kP/6LilD2+wJj4tvhRB5eLmO6Sl13aPwx5VtJme1gvITjP7/z92ttbljhW1GT
-8ElGawnF9XjkqXI+S1S9YWdqR/SzSc4SVFcAoq7QEtg8l1XPQqsShOP8vmL0oc/D
-TXnxEtmVyxGjPnqrWFYsJTrzhKTpQ/ITsaz++lULrFInUsOeQ/MhncJXfisxbWGA
-qUekLoGiDqaFDqd4wgH0p6CHtay/F5JIgpYD7raFBsODXDzpzE/GUhmOXN0R9sPo
-Da6b0nclWuKmkHdI1A==
+MIICrQYJKoZIhvcNAQcCoIICnjCCApoCAQExDTALBglghkgBZQMEAgEwCwYJKoZI
+hvcNAQcBMYICdzCCAnMCAQEwZzBPMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTmV3
+WW9yazELMAkGA1UEBwwCTkoxDTALBgNVBAoMBE9OQVAxEjAQBgNVBAMMCU9OQVAg
+Um9vdAIUVK7C2nez8R/qoHfHcJ1QE4dwMDAwCwYJYIZIAWUDBAIBoIHkMBgGCSqG
+SIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIxMDIxNTE2Mzcx
+NVowLwYJKoZIhvcNAQkEMSIEIPcmukHF/Seoafs3ytYHHqC5aQKafdpn8RqF93md
+XTFMMHkGCSqGSIb3DQEJDzFsMGowCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBFjAL
+BglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3
+DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIB
+AA9ATW9lFVXJ8JPZnATh2EMexCg78PCf31GivE+cBzaDCjSa8r9+FkzxMpsnh7dc
+X/4IOLDIiAaAjLUMjkjaUwMOEubipNJqfd3Rf9o8dF1a+UTVhsKVAY8bKmHhbAdL
+H0h6SaxaXWFmnyPDf0OEx7aX7eJqjn8iyRAm5BE/FgF0HghZpBHpDOXe7QJg6lJn
+3RarDB1Ho+czKtlROJeSb7UoxDnsxJI12uQQD021thuDJy6HlZ8fRXb0PcjwBv+C
+jJKragmEegWMf2EVIPIM2V0CblmCrdkCzwV1MnvKCF67eLaMzZzrDKdeiRz2SR5Z
+YtmMuKpXw3U9OU6L+8syBbY=
 -----END CMS-----
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package.cert b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package.cert
new file mode 100644
index 0000000000..13cf353198
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package.cert
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDJTCCAg0CFFSuwtp3s/Ef6qB3x3CdUBOHcDAwMA0GCSqGSIb3DQEBCwUAME8x
+CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdOZXdZb3JrMQswCQYDVQQHDAJOSjENMAsG
+A1UECgwET05BUDESMBAGA1UEAwwJT05BUCBSb290MB4XDTIxMDIxNTE2MjgzM1oX
+DTI5MTEyMDE2MjgzM1owTzELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB05ld1lvcmsx
+CzAJBgNVBAcMAk5KMQ0wCwYDVQQKDARPTkFQMRIwEAYDVQQDDAlPTkFQIFNJR04w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDz72QFAEDkQL1O3bYk7NRd
+JRRtUXMgpWHKXW67zBQB+7ZZUtNLhaC3n5IW+mlJ8lySq2F9hJzPRenGYc+MkNSl
+Hhaq4EumwiONRQpiQScSZ73AuKMRJYKCgHpeWbmylbHiYnZVT3U1ZgjTG9qqLunD
+OAyq8NYyjiR/A6H5bHSaKFgVIJ1urYsK/j8F5b5BdNaoqHM+pFDOmr9RljTyTRkO
+jaiac0VHSyd6+OtedxGJb0QK+UFShI3SF0cM/mHr6G22FlUHXLX9TMcHnrAbE8/Q
+Ih4WAqPNHvZv0flPv6a29LP9vrGANC9aJiZ9oKm6uCY8ygqiTDcBUHtEW7mnFUtp
+AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFrBxqRlmiTA0D1YEgwGiWtVECSJEIyd
+lJnGOgcgw9z6V9EXz4zWDH0Nq6Qgm7evL6Ou4nBrMHI+FCYEiBBYLCn799oK6PCX
+4hJZ8zHXlBd2YI9NLMJQCHgQ/N+52Ju8a/BuXZ9STVoJ237mampvWPzfRby+Me7n
+gORRNFehBYx3sQtBSEIx1GX/VeNihS89koMfY/+RARmLpDsqs4p+Xr1F11NLddPH
+euNMz1J6j6DFoVezdjPTcfEWGnMXjmDiw7HGIe5sCsmLnY5yI+SVN26ND/n5rO5X
+67EfqO2YviqMnkQSJVHGH1y9LDWWatr3LRcc30gO9NQKgPYptvjIxXg=
+-----END CERTIFICATE-----
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package2.cert b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package2.cert
index f45f6720f0..1b5c9e05db 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package2.cert
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/package2.cert
@@ -1,20 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDOTCCAiECFFqXkiZIzIdNPTG62Jbr3Ub37ZuTMA0GCSqGSIb3DQEBCwUAMHox
-EzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZzaW1wbGUxEzAR
-BgNVBAoMClNpbXBsZSBJbmMxGjAYBgNVBAsMEVNpbXBsZSBTaWduaW5nIENBMRow
-GAYDVQQDDBFTaW1wbGUgU2lnbmluZyBDQTAeFw0yMTAxMTQxMTMxMDhaFw0yMTAy
-MTMxMTMxMDhaMDgxCzAJBgNVBAYTAlBMMQwwCgYDVQQIDANTSUwxDDAKBgNVBAcM
-A1dSTzENMAsGA1UECgwETk9LMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALbulTgLmez9BZHSjMhUNaZURHe12RRAR9JoTTDUJkLr1WVMZRieFUC74PQP
-w51qVy/KAKs7uBUCkpVARcH3sRbdrTDmc3LanUy9hZqzeJdupi+Zp/RlvP+kXTji
-BX4E2hg2a3QBD/zNoBmvLWPTsYsNSxR5mxkm9pL6qFGI84D0l/FWs9jAa60UCBRM
-gIU70JGgU7jx99E6bPUU4Ruuywi8MZpCdW61apVQK1l2rLPSumLm13Ho4l2aI3L+
-bvTy7wzgtURnpHEnOvZUx7pSMwymPOjRvs58sgfQ6FZ0KMkixeHFKdcqwl+msTbN
-a/3nmqCYURmHsYXxaORCBlD3PHcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdBZd
-inECILJpNkfhU8ocqkh9s17KzGtoG/Ybo2LslD/dCXlbbC4rLJdsVaQXKp/j03xF
-ZftRj+NMjRatj9KJ1sibN7YNJDo7u3rk0oKSuMRx4FmI+IzKF8I9usg+CFgA1S+P
-4ndH+3THd9VPjIpuH8yjZ0lXDvqBubnKM11JmW2ljPS7UKPdTasFiIQkV8swVn6d
-3tHBsns/juvGUEDLTdO3lYDK0WEr8pKr+Cj0hcmOZoV8YxBnw402X0g35tzNTAH7
-BhUuGhjRsUksSRPdYjZRjLm/ieIf5huAcWLtEyPDmiHFyNTEDIbSLYncfNDcTsQZ
-NSqYN8Ixin+/mpN86g==
+MIIDKTCCAhECFFSuwtp3s/Ef6qB3x3CdUBOHcDAxMA0GCSqGSIb3DQEBCwUAME8x
+CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdOZXdZb3JrMQswCQYDVQQHDAJOSjENMAsG
+A1UECgwET05BUDESMBAGA1UEAwwJT05BUCBSb290MB4XDTIxMDIxNTE2NDIwMloX
+DTI5MTEyMDE2NDIwMlowUzELMAkGA1UEBhMCSlAxCzAJBgNVBAgMAkpQMQ4wDAYD
+VQQHDAVUb2t5bzETMBEGA1UECgwKT05BUCBUb2t5bzESMBAGA1UEAwwJT05BUFRP
+S1lPMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwU1wXzTJK1/Qkvdv
+9P9/g9PrOFEQuNVGweuswB96oXnWn+jZybaHtfbNqJXPuASGnj+XLeEV3y7etGBt
+ImMmwfT56DuFcsK77DpmDBtw7BiUEUkHTrwZ2+CqU3ViBEaos2jtguuKxX8ViXxw
+5GTzsQ0aL1tEGT9vggpXZJYBZXmWaPoJvacpVWfx3YsltmDYItxoPyk+tU/D5rjk
+qfjfNuOsbYWwFN4cWy8P77WaWoDp9Zo7krHAfrmHx36um+mN22Ga8AX+0kZ6xdKh
+CuVnCgnwOaqFHv0paxPxKCpvyHGy/9Wbd1Cmqc6nDGHRgNcfOWyIfRTaD1kbUCPy
+Zwim8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBquNm74ZbGE3DCYKIOT3ergsXL
+IejvdCdC2NfHZLsiMcdKkZOZFFSL8S93LUvlOCLlFmiU7V7XSQJneIJrjN75M7GN
+DTQhtmbNf16O49pOePr3uJVn7eF/xEUQo8hwIjPgqLUREDjbqDdD/cBGqL0yrOOl
+HWyutEhdNh5TuTYyIE8uOnj7qQ2DdnAp0wbZ6/4PZdh3ZGzFvN1xtxD51bC6iJDB
+seoDc1v9/nOAo7+kauq0A5qLKWZYmL1uYIv6gPFwytlEk98PzdyjJcN7eVBrZklX
+XQT7YmYpyBAHhA5jPEY2+W4VabAksYjAZIIwQTeY+ihrsg7VO8Nq0j26nE0w
 -----END CERTIFICATE-----
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/readme.md b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/readme.md
new file mode 100644
index 0000000000..8a0d30d2a6
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/readme.md
@@ -0,0 +1,2 @@
+To update tests with new certificates see
+https://wiki.onap.org/display/DW/SDC%3A+Sign+a+package
\ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/rootCA.cert b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/rootCA.cert
new file mode 100644
index 0000000000..c070c021df
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/cert/rootCA.cert
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfzCCAmegAwIBAgIUJC7SPSFmyqEtKN9nhbBEKTXQGIMwDQYJKoZIhvcNAQEL
+BQAwTzELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB05ld1lvcmsxCzAJBgNVBAcMAk5K
+MQ0wCwYDVQQKDARPTkFQMRIwEAYDVQQDDAlPTkFQIFJvb3QwHhcNMjEwMjE1MTYy
+NzM4WhcNMjkxMTIwMTYyNzM4WjBPMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTmV3
+WW9yazELMAkGA1UEBwwCTkoxDTALBgNVBAoMBE9OQVAxEjAQBgNVBAMMCU9OQVAg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALR34fcoYCIMvG8f
+vbYsVAgFmU7aTC4gqlvF3kPENeuCXrIm99/sHa90Yzypo/qMeB36RFGi9lp2U2IT
+w9MHffp6+Gdtfnn2kRczCf00AmxAC+2o/rkwA7y/08rNq7cTPVKQgjj4InuVglFb
+/nPWVu3nv7gnOWFRUdTAwb2G73T6kcTYD+sTBh9Nb+Gd4kyTLt4mCdYuY0SE0blQ
+GmNIFIuoRiR03y/1BFaZzfNroJRfHjQl0CKFEh5TDDJRGxs1zTiT3/Fh1O48tOAw
+T/nhqYdoTy2+/wQPGmt/nJiI+aUd64rwfjyKsKGrJP1it6Zl55nGYFDdbylhFUSb
+QVcPqBECAwEAAaNTMFEwHQYDVR0OBBYEFNkjXcPWHOmTyBd+veqmsVYR0sR9MB8G
+A1UdIwQYMBaAFNkjXcPWHOmTyBd+veqmsVYR0sR9MA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAI3ZQfqiyYLwTRvoc+NJkzNYi+kIvqRot296BRD1
+oT5K3EqcFV88N1RPpC31l3Ab0HQiDJXtpvmHfkc0Wul5gdncsKObn4q0AEqLlsvh
+jwrZu4NrdDkl9V+AB69Kw3L79hsAo44V6563QNKXTea9FVpz7psqNH6TcQtoTnsv
+NKohAeuP3xZz5IFecMu7H/7ULbAHWZ8fjHxHWiJHxWisXskaQMhkpImW0lDBfIs9
++ktBMYbCEsv+WodsoPL+tmOkYShoStjY/ZKXSbsGjF2fhH8KrXmf/W3m2LZ3AsuF
+HeJqVKkvsH+5orYrttAp11qaE9xdn1bbw90r7O5QvDmAjZQ=
+-----END CERTIFICATE-----
diff --git a/pom.xml b/pom.xml
index e7a4f08bb9..3aadb7f735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <junitJupiter.version>5.6.0</junitJupiter.version>
         <assertj.version>3.16.0</assertj.version>
         <testng.version>7.3.0</testng.version>
-        <cucumber.version>5.6.0</cucumber.version>
+        <cucumber.version>6.8.1</cucumber.version>
         <bean-matchers.version>0.11</bean-matchers.version>
         <hamcrest.version>2.1</hamcrest.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>