Merge branch '2.0.x' into 2.1.x

  + fix conflicts

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

crss-dataflow-app/crss-dataflow-app.yml

@@ -3,8 +3,8 @@ spring:
   crss-dataflow:
     datasource:
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow

crss-datainterface-task-ingest/crss-datainterface-task-ingest.yml

@@ -12,8 +12,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -22,8 +22,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -32,8 +32,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:

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

@@ -6,8 +6,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -16,8 +16,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -26,8 +26,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink.yml

@@ -5,8 +5,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -15,8 +15,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -25,8 +25,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper.yml

@@ -5,8 +5,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -15,8 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate.yml

@@ -5,8 +5,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -15,8 +15,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -25,8 +25,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw.yml

@@ -6,7 +6,8 @@ spring:
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver
-    maxPoolSize: 2
+    connectionTimeout: 150000
+    maximumPoolSize: 3
     test-on-borrow: true
     validation-query: SELECT 1
   cloud:
@@ -37,7 +38,7 @@ spring:
     username: crss_metering
     password: Fh7UcXpWs
     driver-class-name: com.edb.Driver
-    maxPoolSize: 2
+    maximumPoolSize: 2
     test-on-borrow: true
     validation-query: SELECT 1
   cloud:
@@ -68,7 +69,7 @@ spring:
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver
-    maxPoolSize: 2
+    maximumPoolSize: 2
     test-on-borrow: true
     validation-query: SELECT 1
   cloud:

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready.yml

@@ -5,7 +5,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 1
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -14,7 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 1
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -23,7 +25,8 @@ spring:
         username: crss_nmms
         password: lbgg1i2Y
         driverClassName: com.edb.Driver
-        maxPoolSize: 1
+        connectionTimeout: 150000
+        maximumPoolSize: 3
         test-on-borrow: true
         validation-query: SELECT 1
   jpa:

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

@@ -5,7 +5,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 1
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -14,7 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 1
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -23,7 +25,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      maxPoolSize: 1
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-mtr/crss-mtr.yml

@@ -5,7 +5,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -14,7 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -23,7 +25,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

crss-settlement-app/crss-settlement-app.yml

@@ -6,7 +6,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

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

@@ -31,4 +31,17 @@ spring:
       driverClassName: org.postgresql.Driver
 
   redis:
-    database: 4
+    database: 4
+
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+    task:
+      initialize:
+        enable: false

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

@@ -5,7 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -14,7 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -23,7 +25,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -32,7 +35,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -41,7 +45,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

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

@@ -5,7 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -14,7 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -23,7 +25,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -32,7 +35,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -41,7 +45,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

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

@@ -5,7 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -14,7 +15,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -23,7 +25,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 

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

@@ -18,6 +18,21 @@ spring:
       password: postgres
       driverClassName: org.postgresql.Driver
 
+  batch:
+    job:
+      enabled: true
+
+  redis:
+      host: localhost
+      port: 6379
+
+batch:
+  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.0.0.RC6.jar"
+  chunkSize: 100
+  maxWorkers: 2
+  partitionSize:
+    amsSp: 15
+
 sftp:
   credentials:
     username: pemc

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

@@ -21,4 +21,15 @@ spring:
   redis:
     database: 4
 
-
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+    task:
+      initialize:
+        enable: false

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

@@ -5,7 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -14,7 +15,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -23,7 +25,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
 
@@ -49,6 +52,12 @@ spring:
     job:
       enabled: true
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    amsSp: 1500
+
 logging:
   level:
     com.pemc: DEBUG

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

@@ -5,7 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -14,7 +15,8 @@ spring:
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -23,7 +25,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -32,7 +35,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -41,7 +45,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -50,7 +55,8 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      maxPoolSize: 2
+      connectionTimeout: 150000
+      maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1