From: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Date: Thu, 1 Jul 2021 05:02:58 +0000 (+0530)
Subject: Refactoring for bpmn-infra
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F122383%2F1;p=so.git

Refactoring for bpmn-infra

Issue-ID: SO-3674

Signed-off-by: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Change-Id: Icac20cf1f00ac016a26a8ab1677da21f2d33e84a
---

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaConfig.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaConfig.java
index 16566e71c7..6358524006 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaConfig.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaConfig.java
@@ -7,11 +7,9 @@ import org.camunda.bpm.engine.RepositoryService;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.spring.application.SpringServletProcessApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan
 public class CamundaConfig {
 
     @Bean
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index 0f1499fdba..f94471d4e7 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -326,8 +326,8 @@ spring:
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:3306/camundabpmn
-      username: root
-      password: password
+      username: ${DB_ADMIN_USERNAME}
+      password: ${DB_ADMIN_PASSWORD}
       driver-class-name: org.mariadb.jdbc.Driver
       pool-name: bpmn-pool
       registerMbeans: true