Merge branch '2.4.x'

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

@@ -80,13 +80,14 @@ mqreport:
 sftp:
   credentials:
     #username: pemc
+    username: crss_sftp_bcq
     #password: 123qwe
-    username: crss_sftp_rbcq
     password: Pemc1234
     #host: sftp.marathon.l4lb.thisdcos.directory
-    host: 192.168.94.82
+    #host: sftp.marathon.l4lb.thisdcos.directory
+    host: 192.168.94.71
     port: 22
-    workingDirectory: /rbcq
+    workingDirectory: /upload/rbcq
     privateKey:
 
 database:

crss-metering/crss-metering-dev.yml

@@ -1,8 +1,14 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://localhost:5432/crss?currentSchema=metering
-    username: crss_metering
-    password: CrssMetering
+    url: jdbc:postgresql://localhost:5432/stl_crss_metering
+    username: postgres
+    password: postgres
+  http.multipart:
+    enabled: true
+    maxFileSize: 1KB
+    maxRequestSize: 1KB
+    fileSizeThreshold: 1KB
+    resolveLazily: false
 server:
-  port: 8084
+  port: 8084

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

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss?currentSchema=registration
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_nmms
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
@@ -35,4 +35,4 @@ sftp:
     host: pemc-storage.southeastasia.cloudapp.azure.com
     port: 22
     workingDirectory: /home/pemc/upload
-    privateKey:
+    privateKey:

crss-reg/crss-reg-dev.yml

@@ -48,4 +48,4 @@ sftp:
     username: pemc
     password: 123qwe
     host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
+    port: 22

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

@@ -61,7 +61,7 @@ spring:
       port: 6379
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-calculation-addtlcomp-2.3.0.BUILD-SNAPSHOT.jar"
+  resourceLocation: "file:///home/adrian/developer/project-files/exist/crss-p2/parent/settlements/crss-settlement-dataflow/crss-settlement-task/crss-settlement-task-calculation-addtlcomp/target/libs/crss-settlement-task-calculation-addtlcomp-2.3.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 2
   partitionSize:

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

@@ -49,4 +49,4 @@ spring:
         ddl-auto: none
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-calculation-2.4.0.BUILD-SNAPSHOT.jar"
+  resourceLocation: "file:///home/adrian/developer/project-files/exist/crss-p2/parent/settlements/crss-settlement-dataflow/crss-settlement-task/crss-settlement-task-calculation/target/libs/crss-settlement-task-calculation-2.4.0.BUILD-SNAPSHOT.jar"

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

@@ -58,8 +58,8 @@ spring:
     deployer:
       mesos:
         chronos:
-          memory: 1536
-          cpu: 0.5
+          memory: 3072
+          cpu: 1
 
     task:
       initialize:

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

@@ -24,6 +24,7 @@ spring:
       password: postgres
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 10
+
 sftp:
   credentials:
     username: pemc
@@ -34,8 +35,8 @@ sftp:
     privateKey:
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-file-gen-addtlcomp-2.2.0.BUILD-SNAPSHOT.jar"
+  resourceLocation: "file:///home/adrian/developer/project-files/exist/crss-p2/parent/settlements/crss-settlement-dataflow/crss-settlement-task/crss-settlement-task-file-gen-addtlcomp/target/libs/crss-settlement-task-file-gen-addtlcomp-2.3.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 20
   partitionSize:
-    acDataPartitionSize: 30
+    acDataPartitionSize: 30

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

@@ -50,7 +50,7 @@ spring:
         deleteFilesOnExit: false
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.3.0.BUILD-SNAPSHOT.jar"
+  resourceLocation: "file:///home/adrian/developer/project-files/exist/crss-p2/parent/settlements/crss-settlement-dataflow/crss-settlement-task/crss-settlement-task-invoice-generation/target/libs/crss-settlement-task-invoice-generation-2.3.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 2
   partitionSize:

crss-uaa/crss-uaa-ldap.yml

@@ -1,8 +1,8 @@
 crss:
   ldap:
-    protocol: LDAP
+    protocol: LDAPS
     host: "192.168.95.106"
-    port: 389
+    port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crss_user"