refactored configs

crss-audit/application-dev2.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
-      username: crss_audit
-      password: crss_audit
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-devlocal.yml

@@ -1,37 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_audit
-      username: crss_audit
-      password: crss_audit
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: localhost
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-pemc-uat.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-pemc-uat2.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-qa.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_audit
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/crss-audit-dev2.yml

@@ -0,0 +1,16 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
+      username: crss_audit
+      password: crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-pemc-uat-sit.yml

@@ -0,0 +1,17 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=audit
+      username: crss_audit
+      password: crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    database: 4
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-pemc-uat.yml

@@ -0,0 +1,14 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-pemc-uat2.yml

@@ -0,0 +1,14 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-qa.yml

@@ -0,0 +1,16 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_audit
+      username: admin
+      password: password
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user

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

@@ -4,82 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
-
-
 security:
   basic:
     enabled: false

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

@@ -4,44 +4,14 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -54,26 +24,4 @@ security:
 
 logging:
   level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
-    org.hibernate.type: trace
-    org.hibernate.stat: debug
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-
+    org.hibernate.type: trace

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

@@ -1,76 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
-
-dataflow:
-  url: http://localhost:9393
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2

crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml

@@ -4,42 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     database: 5
 
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -49,25 +26,10 @@ security:
     resource:
       userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

crss-dataflow-app/crss-dataflow-app-pemc-uat-sit.yml

@@ -4,42 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     database: 4
 
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -49,25 +26,10 @@ security:
     resource:
       userInfoUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

crss-dataflow-app/crss-dataflow-app-pemc-uat.yml

@@ -4,43 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -50,25 +26,10 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

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

@@ -4,43 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
       maxPoolSize: 5
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -50,25 +27,10 @@ security:
     resource:
       userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

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

@@ -25,6 +25,10 @@ spring:
     job:
       enabled: false
 
+  redis:
+    host: localhost
+    port: 6379
+
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 

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

@@ -1,20 +1,9 @@
 spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -22,8 +11,6 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_nmms
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -31,71 +18,6 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        generate_statistics: true
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -1,20 +1,9 @@
 spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -22,89 +11,18 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_nmms
       username: todi_crss_nmms
       password: todi_crss_nmms
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_reg
-        username: todi_crss_reg
-        password: todi_crss_reg
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  crss-settlements:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
-        username: crss_settlement
-        password: crss_settlement
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        generate_statistics: true
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_reg
+      username: todi_crss_reg
+      password: todi_crss_reg
+crss-settlements:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      username: crss_settlement
+      password: crss_settlement
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"
+    host: redis.marathon.l4lb.thisdcos.directory

crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-default.yml

@@ -4,94 +4,30 @@ spring:
       jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
       username: emdb
       password: emdb
-      driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: true
     properties:
       hibernate:
-        #generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
     database: 5
 
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
 config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"
+  dispatch-interval: 5

crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-sit.yml

@@ -4,94 +4,27 @@ spring:
       jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
       username: emdb
       password: emdb
-      driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema?nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: true
     properties:
       hibernate:
-        #generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
     database: 4
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

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

@@ -4,95 +4,27 @@ spring:
       jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
       username: emdb
       password: emdb
-      driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/todi_crss_nmms
       username: todi_crss_nmms
       password: todi_crss_nmms
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/todi_crss_reg
       username: todi_crss_reg
       password: todi_crss_reg
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: true
     properties:
       hibernate:
-        #generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -1,98 +1,25 @@
 spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/todi_crss_nmms
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/todi_crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: true
     properties:
       hibernate:
-        #generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

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

@@ -46,6 +46,10 @@ spring:
     initializer:
       enabled: false
 
+  redis:
+    host: localhost
+    port: 6379
+
 logging:
   level:
     com.pemc: debug

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

@@ -4,85 +4,27 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 security:
   ignored: /**
 
@@ -92,9 +34,5 @@ management:
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

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

@@ -4,58 +4,22 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -65,24 +29,10 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

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

@@ -9,57 +9,15 @@ spring:
       maxPoolSize: 20
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 20
 
   jpa:
-    show-sql: false
     generate-ddl: true
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: update
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-default.yml

@@ -6,58 +6,23 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
     show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -67,24 +32,10 @@ security:
     resource:
       userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 dataflow:
   url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-sit.yml

@@ -6,58 +6,22 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -67,24 +31,10 @@ security:
     resource:
       userInfoUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 dataflow:
   url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

crss-meterprocess-app/crss-meterprocess-app-pemc-uat.yml

@@ -4,58 +4,22 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -65,24 +29,10 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

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

@@ -4,58 +4,22 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 eureka:
   instance:
@@ -64,13 +28,6 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://crss-discovery.marathon.l4lb.thisdcos.directory:8761/eureka/
-#          healthcheck:
-#            enabled: true
-#    lease:
-#      duration: 5
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
 
 security:
   oauth2:
@@ -80,24 +37,10 @@ security:
     resource:
       userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

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

@@ -9,60 +9,21 @@ spring:
       connectionTimeout: 10000
       maxPoolSize: 20
   crss-registration:
-      datasource:
-        jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-        #jdbcUrl: jdbc:oracle:thin:@pemc-storage.southeastasia.cloudapp.azure.com:1521:XE
-        username: crss_reg
-        password: crss_reg
-        driverClassName: oracle.jdbc.driver.OracleDriver
-        connectionTimeout: 10000
-        maxPoolSize: 20
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
+      #jdbcUrl: jdbc:oracle:thin:@pemc-storage.southeastasia.cloudapp.azure.com:1521:XE
+      username: crss_reg
+      password: crss_reg
+      driverClassName: oracle.jdbc.driver.OracleDriver
+      connectionTimeout: 10000
+      maxPoolSize: 20
 
   jpa:
-    show-sql: false
     generate-ddl: true
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: update
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG

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

@@ -4,40 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+      password: password

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

@@ -4,40 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+      password: crss_reg2

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

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,7 +13,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -22,19 +20,7 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+        dialect: org.hibernate.dialect.Oracle10gDialect

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-default.yml

@@ -4,42 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+
   redis:
-      database: 5
-logging:
-  level:
-    com.pemc: debug
+      database: 5

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-sit.yml

@@ -4,42 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+
   redis:
-    database: 4
-logging:
-  level:
-    com.pemc: debug
+    database: 4

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

@@ -4,40 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+      password: crss_reg2

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

@@ -4,40 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+      password: password

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

@@ -6,7 +6,6 @@ spring:
       password: crss_meterprocess
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,7 +13,6 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -22,19 +20,7 @@ spring:
       password: crss_reg
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+        dialect: org.hibernate.dialect.Oracle10gDialect

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

@@ -28,6 +28,16 @@ spring:
       validation-query: SELECT 1
   jpa:
     show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        hbm2ddl:
+          auto: none
+        temp:
+          use_jdbc_metadata_defaults: false
 logging:
   level:
     com.pemc: debug

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

@@ -1,43 +1,19 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        hbm2ddl:
+          auto: none
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,43 +1,19 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      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_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        hbm2ddl:
+          auto: none
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-logging:
-  level:
-    com.pemc: debug

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

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,7 +13,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -22,21 +20,9 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
-
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.Oracle10gDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-
-logging:
-  level:
-    com.pemc: debug
+        dialect: org.hibernate.dialect.Oracle10gDialect
+        hbm2ddl:
+          auto: none

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-default.yml

@@ -1,43 +1,20 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        hbm2ddl:
+          auto: none
 
   redis:
-    database: 5
-logging:
-  level:
-    com.pemc: debug
+    database: 5

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-sit.yml

@@ -1,43 +1,20 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        hbm2ddl:
+          auto: none
 
   redis:
     database: 4
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,44 +1,19 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
   jpa:
-      show-sql: false
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        hbm2ddl:
+          auto: none
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,44 +1,14 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-logging:
-  level:
-    com.pemc: debug
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -1,39 +1,22 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
-      dataSource:
-        jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-        username: crss_reg
-        password: crss_reg
-        driverClassName: oracle.jdbc.driver.OracleDriver
-        connectionTimeout: 10000
-        maxPoolSize: 5
+    dataSource:
+      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
+      username: crss_reg
+      password: crss_reg
+      driverClassName: oracle.jdbc.driver.OracleDriver
+      connectionTimeout: 10000
   crss-main:
-      datasource:
-        jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-        username: crss_meterprocess
-        password: crss_meterprocess
-        driverClassName: oracle.jdbc.driver.OracleDriver
-        connectionTimeout: 10000
-        maxPoolSize: 5
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: oracle.jdbc.driver.OracleDriver
+      connectionTimeout: 10000
 
   jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
         hbm2ddl:
           auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-logging:
-  level:
-    com.pemc: debug

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

@@ -24,16 +24,19 @@ spring:
       validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          temp:
-            use_jdbc_metadata_defaults: false
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        temp:
+          use_jdbc_metadata_defaults: false
 
+  redis:
+    host: localhost
+    port: 6379
 logging:
   level:
     com.pemc: debug

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

@@ -4,48 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+      password: password

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

@@ -4,48 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+      password: crss_reg2

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

@@ -6,30 +6,17 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
       username: crss_meterprocess_metering
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
+      connectionTimeout: 1000
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
       username: crss_meterprocess_reg
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
-  jpa:
-    show-sql: false
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-logging:
-  level:
-    com.pemc: debug
+      connectionTimeout: 10000

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-default.yml

@@ -4,51 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 
   redis:
-      database: 5
-
-logging:
-  level:
-    com.pemc: debug
+      database: 5

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-sit.yml

@@ -4,51 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 
   redis:
-    database: 4
-
-logging:
-  level:
-    com.pemc: debug
+    database: 4

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

@@ -4,48 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+      password: crss_reg2

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

@@ -4,48 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+      password: password

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

@@ -6,7 +6,6 @@ spring:
       password: crss_meterprocess
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,17 +13,10 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
       username: crss_reg
       password: crss_reg
       driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
-  jpa:
-    show-sql: false
-logging:
-  level:
-    com.pemc: debug
+      connectionTimeout: 10000

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

@@ -28,6 +28,17 @@ spring:
       validation-query: SELECT 1
   jpa:
     show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        hbm2ddl:
+          auto: none
+        temp:
+          use_jdbc_metadata_defaults: false
+
   cloud:
     stream:
       bindings:

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

@@ -2,29 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: password
     username: admin
     url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
@@ -32,55 +12,15 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: password
     username: admin
     url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: password
     username: admin
     url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -2,29 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
@@ -32,55 +12,15 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -6,11 +6,6 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
@@ -40,11 +35,6 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
@@ -68,11 +58,7 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-default.yml

@@ -2,89 +2,40 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+
   redis:
       database: 5
 jdbc:
   query: "select * from metering.txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
 ---
 
 #Monthly extract
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+
   redis:
     database: 5
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-sit.yml

@@ -2,87 +2,39 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 2
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   redis:
     database: 4
 jdbc:
   query: "select * from metering.txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
 ---
 
 #Monthly extract
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 2
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+  redis:
+    database: 4
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-    maxPoolSize: 2
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -2,29 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
@@ -32,55 +12,15 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: crss_metering2
     username: crss_metering2
     url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -6,25 +6,6 @@ spring:
     password: password
     username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
@@ -36,51 +17,12 @@ spring:
     password: password
     username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
     password: password
     username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -6,11 +6,6 @@ spring:
     password: crss_metering
     username: crss_metering
     url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
@@ -40,11 +35,7 @@ spring:
     password: crss_metering
     username: crss_metering
     url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"

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

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
         username: admin
         password: password
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -52,23 +32,5 @@ spring:
     initializer:
       enabled: false
 
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.type: trace
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      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_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
         username: crss_nmms
         password: crss_nmms
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -52,23 +32,5 @@ spring:
     initializer:
       enabled: false
 
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.type: trace
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-default.yml

@@ -4,39 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
-    show-sql: false
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -52,21 +31,5 @@ spring:
     initializer:
       enabled: false
 
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
     database: 5
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-sit.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 2
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -52,21 +32,6 @@ spring:
     initializer:
       enabled: false
 
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
     database: 4
 
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000

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

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_nmms
         username: crss_nmms
         password: crss_nmms
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -52,22 +32,5 @@ spring:
     initializer:
       enabled: false
 
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000

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

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
         username: admin
         password: password
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -51,23 +31,5 @@ spring:
   batch:
     initializer:
       enabled: false
-
-  cache:
-      jcache:
-        config: ehcache3.xml
-
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    stl: 10000
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -49,6 +49,10 @@ spring:
       jcache:
         config: ehcache3.xml
 
+  redis:
+    host: localhost
+    port: 6379
+
 logging:
   level:
     com.pemc: debug

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

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -54,35 +34,14 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

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

@@ -4,39 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      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_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     # show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
+
   profiles:
     include: mesos
   cloud:
@@ -54,35 +35,14 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/mq
-    privateKey:
+    workingDirectory: /upload/mq

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

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-main:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,11 +13,9 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
@@ -31,7 +28,4 @@ spring:
         enable: false
   batch:
     initializer:
-      enabled: false
-logging:
-  level:
-    com.pemc: debug
+      enabled: false

crss-mq-computation/crss-mq-computation-pemc-uat-default.yml

@@ -4,39 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     # show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
+
   profiles:
     include: mesos
   cloud:
@@ -55,33 +36,14 @@ spring:
   redis:
     database: 5
 
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
   maxWorkers: 20
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/mq
-    privateKey:
+    workingDirectory: /upload/mq

crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     # show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -55,33 +35,14 @@ spring:
   redis:
     database: 4
 
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
-
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
   maxWorkers: 20
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/mq
-    privateKey:
+    workingDirectory: /upload/mq

crss-mq-computation/crss-mq-computation-pemc-uat.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     # show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -54,35 +34,15 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
   maxWorkers: 20
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/mq
-    privateKey:
+    workingDirectory: /upload/mq

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

@@ -4,39 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        # generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
+
   profiles:
     include: mesos
   cloud:
@@ -54,35 +35,14 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-  cache:
-    jcache:
-      config: ehcache3.xml
-
-logging:
-  level:
-    com.pemc: debug
-    # org.hibernate.stat: debug
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 100
-  maxWorkers: 10
   partitionSize:
-    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
-mqreport:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

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

@@ -6,7 +6,6 @@ spring:
       password: crss_dataflow
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-main:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,17 +13,12 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: update
         hbm2ddl:
-          import_files:
-logging:
-  level:
-    com.pemc: debug
+          import_files:

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

@@ -49,6 +49,10 @@ spring:
     jcache:
       config: ehcache3.xml
 
+  redis:
+    host: localhost
+    port: 6379
+
 logging:
   level:
     com.pemc: debug

crss-mtr/crss-mtr-dev.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -54,27 +34,8 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
-  partitionSize:
-    mtr: 1000
-
-mtr:
-  directory: /tmp/
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-dev2.yml

@@ -4,39 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      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_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
+
   profiles:
     include: mesos
   cloud:
@@ -54,27 +35,11 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
 
 batch:
   # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
-  partitionSize:
-    mtr: 1000
-
-mtr:
-  directory: /tmp/
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-devoracle.yml

@@ -5,8 +5,7 @@ spring:
       username: crss_meterprocess_dataflow
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
+      connectionTimeout: 10000`
   crss-main:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,11 +13,9 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
@@ -31,7 +28,4 @@ spring:
         enable: false
   batch:
     initializer:
-      enabled: false
-logging:
-  level:
-    com.pemc: debug
+      enabled: false

crss-mtr/crss-mtr-pemc-uat-default.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -55,26 +35,11 @@ spring:
   redis:
     database: 5
 
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
   partitionSize:
     mtr: 1
 
-mtr:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-pemc-uat-sit.yml

@@ -4,39 +4,21 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: false
-    generate-ddl: true
-    open-in-view: false
     properties:
       hibernate:
         generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -56,15 +38,9 @@ spring:
   redis:
     database: 4
 
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
+
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
   partitionSize:
     mtr: 1
 
@@ -73,9 +49,5 @@ mtr:
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-pemc-uat.yml

@@ -4,39 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
   profiles:
     include: mesos
   cloud:
@@ -54,28 +34,12 @@ spring:
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
   partitionSize:
     mtr: 1
 
-mtr:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-qa.yml

@@ -4,39 +4,20 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
+
   profiles:
     include: mesos
   cloud:
@@ -56,26 +37,7 @@ spring:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
 
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  chunkSize: 1
-  maxWorkers: 10
-  partitionSize:
-    mtr: 1000
-
-mtr:
-  directory: /tmp/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /upload

crss-mtr/crss-mtr-qaoracle.yml

@@ -6,7 +6,6 @@ spring:
       password: crss_dataflow
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-main:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,17 +13,12 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true
-    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: update
         hbm2ddl:
-          import_files:
-logging:
-  level:
-    com.pemc: debug
+          import_files:

crss-mtr/crss-mtr.yml

@@ -45,6 +45,10 @@ spring:
     initializer:
       enabled: true
 
+  redis:
+    host: localhost
+    port: 6379
+
 logging:
   level:
     com.pemc: debug
@@ -58,7 +62,7 @@ batch:
     mtr: 1000
 
 mtr:
-  directory: /tmp
+  directory: /tmp/
 
 sftp:
   credentials:

crss-settlement-app/crss-settlement-app-dev-reg.yml

@@ -4,74 +4,14 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/reg_crss_settlements
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-    jpa:
-      show-sql: false
-      generate-ddl: true
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQL81Dialect
-          ddl-auto: validate
-          hbm2ddl:
-            import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

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

@@ -4,74 +4,14 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_settlement
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-    jpa:
-      show-sql: false
-      generate-ddl: true
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQL81Dialect
-          ddl-auto: validate
-          hbm2ddl:
-            import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

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

@@ -4,74 +4,14 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-    jpa:
-      show-sql: false
-      generate-ddl: true
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQL81Dialect
-          ddl-auto: validate
-          hbm2ddl:
-            import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-pemc-uat-bcq.yml

@@ -4,74 +4,14 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/bcq_crss_settlement
       username: bcq_crss_settlement
       password: bcq_crss_settlement
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-pemc-uat-default.yml

@@ -4,76 +4,17 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
+
   redis:
     database: 5
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-pemc-uat-sit.yml

@@ -4,76 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
+
   redis:
     database: 4
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
 
 dataflow:
   url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
-report:
-  directory:
-    base: report/
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl