Merge branch '2.0.x' into 2.1.x

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

@@ -59,11 +59,21 @@ spring:
         ddl-auto: validate
         hbm2ddl:
           import_files:
+          auto:
 
   batch:
     job:
       enabled: true
 
+batch:
+  resourceLocation: "file:target/libs/crss-settlement-task-validation-2.0.0.RC6.jar"
+  maxWorkers: 2
+  partitionSize:
+    tpBillingId: 10000
+    eps: 10000
+    rps: 10000
+    seinBillingId: 10000
+    
 logging:
   level:
     com.pemc: DEBUG

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

@@ -35,4 +35,37 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 2048
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
 
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+          auto:
+
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.validation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: DEBUG

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

@@ -35,6 +35,43 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+          auto:
 
   redis:
-    database: 4
+    database: 5
+
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.validation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: DEBUG    

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

@@ -81,6 +81,16 @@ spring:
     job:
       enabled: true
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    tpBillingId: 100
+    eps: 100
+    rps: 100
+    seinBillingId: 100
+    stlReadyPartSize: 100
+
 logging:
   level:
     com.pemc: DEBUG