Revert "update settlement task configurations regarding including mesos profile"

This reverts commit bd66bf53c2898bcdb1fb64cf36be600e18466e18.

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-azure.yml

@@ -34,6 +34,9 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       maximumPoolSize: 5
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev.yml

@@ -40,9 +40,6 @@ spring:
       connectionTimeout: 10000
       maxPoolSize: 20
 
-  profiles:
-    include:
-
   jpa:
     show-sql: false
     generate-ddl: true

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml

@@ -44,6 +44,8 @@ spring:
       maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
+  profiles:
+      include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-dev.yml

@@ -44,6 +44,8 @@ spring:
       maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
+  profiles:
+      include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp.yml

@@ -61,9 +61,6 @@ spring:
         hbm2ddl:
           import_files:
 
-  profiles:
-    include: mesos
-
   cloud:
     task:
       initialize:

crss-settlement-task-calculation/crss-settlement-task-calculation-azure.yml

@@ -35,6 +35,9 @@ spring:
       password: crss_dataflow
       maximumPoolSize: 5
       connectionTimeout: 300000
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation/crss-settlement-task-calculation-dev.yml

@@ -36,9 +36,6 @@ spring:
       password: postgres
       driverClassName: org.postgresql.Driver
 
-  profiles:
-    include:
-
   redis:
     host: localhost
     port: 6379

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml

@@ -54,6 +54,8 @@ spring:
       connectionTimeout: 60000
       driverClassName: org.postgresql.Driver
 
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-dev.yml

@@ -51,6 +51,9 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -73,9 +73,6 @@ spring:
         jdbc:
           batch_size: 1000
 
-  profiles:
-    include: mesos
-
   cloud:
     task:
       initialize:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-azure.yml

@@ -34,6 +34,9 @@ spring:
         ddl-auto: none
         hbm2ddl:
           import_files:
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev.yml

@@ -24,9 +24,6 @@ spring:
       password: postgres
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 10
-
-  profiles:
-    include:
 sftp:
   credentials:
     username: pemc

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev2.yml

@@ -37,6 +37,9 @@ spring:
         ddl-auto: none
         hbm2ddl:
           import_files:
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-dev.yml

@@ -24,6 +24,9 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp.yml

@@ -50,9 +50,6 @@ spring:
         hbm2ddl:
           import_files:
 
-  profiles:
-    include: mesos
-
   cloud:
     task:
       initialize:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-azure.yml

@@ -24,6 +24,9 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml

@@ -28,9 +28,6 @@ spring:
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 10
 
-  profiles:
-    include:
-
   batch:
     job:
       enabled: true

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml

@@ -26,6 +26,9 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-dev.yml

@@ -24,6 +24,9 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
   cloud:
     deployer:
       mesos:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -40,9 +40,6 @@ spring:
       test-on-borrow: true
       validation-query: SELECT 1
 
-  profiles:
-    include: mesos
-
   jpa:
     show-sql: false
     generate-ddl: false

crss-settlement-task-validation/crss-settlement-task-validation-azure.yml

@@ -36,6 +36,8 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       maximumPoolSize: 5
+  profiles:
+    include: mesos
 
   cloud:
     deployer:

crss-settlement-task-validation/crss-settlement-task-validation-dev.yml

@@ -49,9 +49,6 @@ spring:
       connectionTimeout: 10000
       maxPoolSize: 20
 
-  profiles:
-    include:
-
   jpa:
     show-sql: false
     generate-ddl: true

crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml

@@ -36,6 +36,8 @@ spring:
       password: crss_dataflow
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
+  profiles:
+    include: mesos
     
   cloud:
     deployer:

crss-settlement-task-validation/crss-settlement-task-validation-pemc-dev.yml

@@ -36,6 +36,8 @@ spring:
       password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
+  profiles:
+    include: mesos
 
   cloud:
     deployer:

crss-settlement-task-validation/crss-settlement-task-validation.yml

@@ -60,9 +60,6 @@ spring:
       test-on-borrow: true
       validation-query: SELECT 1
 
-  profiles:
-    include: mesos
-
   jpa:
     show-sql: false
     generate-ddl: false