resolve issues due to conflict
Resolve the issues due to the conflicts and rework the Sdc startup
Issue-ID: CLAMP-81
Change-Id: I3f6fa5268140e902b445c316bc40f326256d17c0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index ad03552..55666e5 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -62,7 +62,7 @@
server.contextPath=/
#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-spring-authentication
+spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller
#The max number of active threads in this pool
server.tomcat.max-threads=200