Merge branch '2.0.x-updates' of gitlab.exist.com:pemc/config

crss-admin/crss-admin-top.yml

@@ -15,9 +15,9 @@ spring:
           starttls.enable: true
 crss:
   ldap:
-    protocol: LDAP
+    protocol: LDAPS
     host: "10.176.12.106"
-    port: 389
+    port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: ""
     admin-user: "wesmsys\\crss_user"
@@ -25,4 +25,4 @@ crss:
     username-field: "userPrincipalName"
     domain: "wesmsys.local"
     embedded: false
-    passwordOpEnabled: false
+    passwordOpEnabled: true

crss-meterprocess-app/crss-meterprocess-app-dev2.yml

@@ -29,10 +29,10 @@ spring:
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
         hbm2ddl:

crss-mq-computation/crss-mq-computation-dev2.yml

@@ -45,7 +45,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 3072
     task:
       initialize:
         enable: false
@@ -71,7 +71,7 @@ batch:
   chunkSize: 100
   maxWorkers: 10
   partitionSize:
-    gap: 5000
+    gap: 2000
     mq: 10000
     ssla: 5000
     report: 1

crss-mq-computation/crss-mq-computation-top-sit.yml

@@ -25,9 +25,16 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 2048
 
+  jpa:
+    show-sql: true
+
 batch:
   maxWorkers: 20
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1
+    report: 1
+
+logging:
+  level:
+    com.pemc.crss: DEBUG

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

@@ -7,15 +7,6 @@ spring:
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 20
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -7,15 +7,6 @@ spring:
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 20
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -8,16 +8,6 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-uat-default.yml

@@ -5,13 +5,6 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-uat-sit.yml

@@ -5,13 +5,6 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess

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

@@ -5,12 +5,6 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess

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

@@ -4,11 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
       username: crss_sit_settlement
       password: FEeHqREu
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
-      username: crss_sit_meterprocess
-      password: PmfXsUQp
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess

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

@@ -4,11 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: D9JpfUtT
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess

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

@@ -5,13 +5,6 @@ spring:
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: com.edb.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       driverClassName: com.edb.Driver
@@ -59,6 +52,16 @@ spring:
     job:
       enabled: true
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    ac: 1500
+    acAlloc: 1500
+    vatAc: 1500
+    vatAcAlloc: 1500
+    acGmr: 1500
+
 logging:
   level:
     com.pemc: DEBUG

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

@@ -5,13 +5,6 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -8,16 +8,6 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess

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

@@ -8,16 +8,6 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
@@ -66,6 +56,9 @@ spring:
         hbm2ddl:
           import_files:
 
+  redis:
+    host: localhost
+
   batch:
     job:
       enabled: true

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml

@@ -7,15 +7,6 @@ spring:
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 2
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-sit.yml

@@ -7,15 +7,6 @@ spring:
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 2
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
@@ -76,7 +67,7 @@ spring:
         ddl-auto: validate
         hbm2ddl:
           import_files:
-
+          auto: 
   redis:
     database: 5
 

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

@@ -5,13 +5,6 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess

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

@@ -4,12 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
       username: crss_sit_settlement
       password: FEeHqREu
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
-      username: crss_sit_meterprocess
-      password: PmfXsUQp
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess

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

@@ -4,12 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: D9JpfUtT
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess

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

@@ -5,13 +5,6 @@ spring:
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: com.edb.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       driverClassName: com.edb.Driver
@@ -66,19 +59,19 @@ batch:
   chunkSize: 100
   maxWorkers: 10
   partitionSize:
-    retDat: 1500
-    retBcq: 1500
-    calcEta: 1500
-    disAggBcq: 1500
-    disAggBcqSeller: 1500
-    disAggBcqBuyer: 1500
-    procNss: 1500
-    nss: 1500
-    rta: 1500
-    rprta: 1500
-    rcra: 1500
-    sFactor: 1500
-    runway: 1500
+    retDat: 120
+    retBcq: 120
+    calcEta: 150
+    procNss: 150
+    nss: 150
+    disAggBcq: 120
+    disAggBcqBuyer: 120
+    disAggBcqSeller: 120
+    rta: 150
+    rprta: 150
+    rcra: 150
+    sFactor: 150
+    runway: 150
     spotSeller: 1500
     spotBuyer: 1500
     gmr: 1500

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

@@ -11,13 +11,6 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -11,13 +11,6 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-uat-default.yml

@@ -11,13 +11,6 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-uat-sit.yml

@@ -11,13 +11,6 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess

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

@@ -11,13 +11,6 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess

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

@@ -9,12 +9,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
       username: crss_sit_dataflow
       password: uYgE8bqG
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
-      username: crss_sit_meterprocess
-      password: PmfXsUQp
-      connectionTimeout: 10000
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess

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

@@ -9,11 +9,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: D9JpfUtT
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess

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

@@ -11,13 +11,6 @@ spring:
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: com.edb.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       driverClassName: com.edb.Driver
@@ -45,7 +38,7 @@ spring:
     initializer:
       enabled: false
     job:
-      enabled: false
+      enabled: true
 
 logging:
   level:

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

@@ -11,13 +11,6 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -11,16 +11,9 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
+      driverClassName: org.postgresql.Driver

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-default.yml

@@ -11,13 +11,6 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-sit.yml

@@ -11,13 +11,6 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess

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

@@ -11,13 +11,6 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess

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

@@ -9,12 +9,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
       username: crss_sit_dataflow
       password: uYgE8bqG
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
-      username: crss_sit_meterprocess
-      password: PmfXsUQp
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess

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

@@ -9,12 +9,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: D9JpfUtT
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess

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

@@ -11,13 +11,6 @@ spring:
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: com.edb.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       driverClassName: com.edb.Driver
@@ -45,7 +38,7 @@ spring:
     initializer:
       enabled: false
     job:
-      enabled: false
+      enabled: true
 
 logging:
   level:

crss-settlement-task-validation/application-pemc-uat-sit.yml

@@ -16,15 +16,6 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement

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

@@ -16,15 +16,6 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess

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

@@ -11,12 +11,6 @@ spring:
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess

crss-settlement-task-validation/crss-settlement-task-validation-pemc-uat-default.yml

@@ -11,12 +11,6 @@ spring:
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess

crss-settlement-task-validation/crss-settlement-task-validation-pemc-uat-sit.yml

@@ -11,12 +11,6 @@ spring:
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess

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

@@ -11,13 +11,6 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/stl_crss_meterprocess

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

@@ -11,13 +11,6 @@ spring:
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: com.edb.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       driverClassName: com.edb.Driver
@@ -62,7 +55,7 @@ spring:
     initializer:
       enabled: false
     job:
-      enabled: false
+      enabled: true
 
 logging:
   level: