Remove per service hikari setting (adjust it when needed)

crss-admin/crss-admin-top.yml

@@ -25,5 +25,4 @@ crss:
     username-field: "userPrincipalName"
     domain: "wesmsys.local"
     embedded: false
-    passwordOpEnabled: true
-
+    passwordOpEnabled: true

crss-data/crss-data-dev.yml

@@ -3,12 +3,6 @@ spring:
     url: jdbc:postgresql://localhost:5432/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: CrssDataExtraction
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
 server:
   port: 8086
 kettle:
@@ -17,18 +11,11 @@ kettle:
   mainJob: ./kettle/download/main/main.kjb
 
 crss:
-  # TODO: renaming of datasource name must also update the binding in data-extraction service and kettle files
   metadata:
     datasource:
       url: jdbc:postgresql://localhost:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: CrssDataExtraction
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: oracle
@@ -36,18 +23,8 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:postgresql://localhost:5432/crss?currentSchema=registration
        username: crss_registration
-       password: CrssRegistration
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: CrssRegistration

crss-data/crss-data-pemc-uat.yml

@@ -3,26 +3,12 @@ spring:
     url: jdbc:postgresql://10.176.23.24:5432/crss_data
     username: crss_data
     password: crss_data
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
-
 crss:
-  # TODO: renaming of datasource name must also update the binding in data-extraction service and kettle files
   metadata:
     datasource:
       url: jdbc:postgresql://10.176.23.24:5432/crss_data
       username: crss_data
       password: crss_data
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: oracle
@@ -30,18 +16,8 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:postgresql://10.176.23.24:5432/crss_reg
        username: crss_reg
-       password: crss_reg
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: crss_reg

crss-data/crss-data-ss-combined.yml

@@ -3,24 +3,12 @@ spring:
     url: jdbc:postgresql://192.168.233.9:5432/crss_data
     username: crss_data
     password: crss_data
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
 crss:
   metadata:
     datasource:
       url: jdbc:postgresql://192.168.233.9:5432/crss_data
       username: crss_data
       password: crss_data
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: oracle
@@ -28,18 +16,8 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:postgresql://192.168.233.9:5432/crss_reg
        username: crss_reg
-       password: crss_reg
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: crss_reg

crss-data/crss-data-staging.yml

@@ -3,25 +3,12 @@ spring:
     url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: CrssDataExtraction
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
-
 crss:
   metadata:
     datasource:
       url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: CrssDataExtraction
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: oracle
@@ -29,18 +16,8 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=registration
        username: crss_registration
-       password: CrssRegistration
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: CrssRegistration

crss-data/crss-data-top.yml

@@ -3,13 +3,6 @@ spring:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: xgZx2FqM
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
-
 crss:
   # TODO: renaming of datasource name must also update the binding in data-extraction service and kettle files
   metadata:
@@ -17,30 +10,14 @@ crss:
       url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: xgZx2FqM
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: postgresql
       url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
       username: crss_dw
       password: etPyY3k8
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
        username: crss_registration
-       password: 51UF3JA9
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: 51UF3JA9

crss-data/crss-data-uat.yml

@@ -6,26 +6,12 @@ spring:
 #    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
     username: crss_data
     password: crss_data
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
-
 crss:
-  # TODO: renaming of datasource name must also update the binding in data-extraction service and kettle files
   metadata:
     datasource:
       url: jdbc:postgresql://192.168.235.6:5432/crss_data
       username: crss_data
       password: crss_data
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-        idleTimeout: 180000 # 3 min
-        maxLifetime: 600000 # 10 min
   datawarehouse:
     datasource:
       platform: oracle
@@ -33,18 +19,8 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
   registration:
      datasource:
        url: jdbc:postgresql://192.168.235.6:5432/crss_reg
        username: crss_reg
-       password: crss_reg
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+       password: crss_reg

crss-data/crss-data.yml

@@ -2,4 +2,28 @@ spring:
 kettle:
   rootDir: /kettle/download
   jndiDir: /kettle/jndi
-  mainJob: /kettle/download/main/main.kjb
+  mainJob: /kettle/download/main/main.kjb
+
+crss:
+  metadata:
+    datasource:
+      hikari:
+        connectionTimeout: 10000
+        maximumPoolSize: 5
+        minimumIdle: 2
+        idleTimeout: 180000 # 3 min
+        maxLifetime: 600000 # 10 min
+  datawarehouse:
+    datasource:
+      hikari:
+        connectionTimeout: 10000
+        maximumPoolSize: 5
+        minimumIdle: 2
+  registration:
+     datasource:
+       hikari:
+         connectionTimeout: 10000
+         maximumPoolSize: 5
+         minimumIdle: 2
+         idleTimeout: 180000 # 3 min
+         maxLifetime: 600000 # 10 min

crss-metering/crss-metering-dev.yml

@@ -4,8 +4,5 @@ spring:
     url: jdbc:postgresql://localhost:5432/crss?currentSchema=metering
     username: crss_metering
     password: CrssMetering
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
 server:
   port: 8084

crss-metering/crss-metering-ss-combined.yml

@@ -3,7 +3,4 @@ spring:
   datasource:
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering
     username: crss_metering
-    password: crss_metering
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
+    password: crss_metering

crss-metering/crss-metering-staging.yml

@@ -3,7 +3,4 @@ spring:
   datasource:
     url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=metering
     username: crss_metering
-    password: CrssMetering
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
+    password: CrssMetering

crss-metering/crss-metering-top.yml

@@ -3,7 +3,4 @@ spring:
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
     username: crss_metering
-    password: Fh7UcXpW
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
+    password: Fh7UcXpW

crss-metering/crss-metering-uat.yml

@@ -3,7 +3,4 @@ spring:
   datasource:
     url: jdbc:postgresql://192.168.235.6:5432/crss_metering
     username: crss_metering
-    password: crss_metering
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
+    password: crss_metering

crss-reg/crss-reg-pemc-staging.yml

@@ -9,7 +9,4 @@ spring:
     url: jdbc:oracle:thin:@//192.168.43.62:1522/STLDB1
     username: CRSS_REGISTRATION
     password: CRSS_REGISTRATION
-    driverClassName: oracle.jdbc.OracleDriver
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
+    driverClassName: oracle.jdbc.OracleDriver

crss-reg/crss-reg-ss-combined.yml

@@ -3,7 +3,6 @@ spring:
     url: jdbc:postgresql://192.168.233.9:5432/crss_reg
     username: crss_reg
     password: crss_reg
-
 crss:
   docmgt:
     root-dir: /crss/docmgt

crss-reg/crss-reg-staging.yml

@@ -3,9 +3,6 @@ spring:
     url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=registration
     username: crss_registration
     password: CrssRegistration
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
   xdf-control:
     datasource:
       url: jdbc:oracle:thin:@//192.168.241.62:1521/ORCL

crss-reg/crss-reg-uat.yml

@@ -3,9 +3,6 @@ spring:
     url: jdbc:postgresql://192.168.235.6:5432/crss_reg
     username: crss_reg
     password: crss_reg
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
 crss:
   xdf:
     client-type: sftp

crss-reg/crss-reg.yml

@@ -1,6 +1,5 @@
 spring:
   profiles.include: audit
-
   jpa:
     properties:
       hibernate:

crss-sched/crss-sched-dev.yml

@@ -4,11 +4,5 @@ spring:
     url: jdbc:postgresql://localhost:5432/crss?currentSchema=scheduler
     username: crss_scheduler
     password: CrssScheduler
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
 server:
   port: 8085

crss-sched/crss-sched-pemc-uat.yml

@@ -3,10 +3,4 @@ spring:
   datasource:
     url: jdbc:postgresql://10.176.23.24:5432/crss_sched
     username: crss_sched
-    password: crss_sched
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: crss_sched

crss-sched/crss-sched-ss-combined.yml

@@ -3,10 +3,4 @@ spring:
   datasource:
     url: jdbc:postgresql://192.168.233.9:5432/crss_sched
     username: crss_sched
-    password: crss_sched
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: crss_sched

crss-sched/crss-sched-staging.yml

@@ -3,10 +3,4 @@ spring:
   datasource:
     url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=scheduler
     username: crss_scheduler
-    password: CrssScheduler
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: CrssScheduler

crss-sched/crss-sched-top.yml

@@ -2,10 +2,4 @@ spring:
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=scheduler
     username: crss_scheduler
-    password: 5Q4AY59T
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: 5Q4AY59T

crss-sched/crss-sched-uat.yml

@@ -3,10 +3,4 @@ spring:
   datasource:
     url: jdbc:postgresql://192.168.235.6:5432/crss_sched
     username: crss_sched
-    password: crss_sched
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 5
-      minimumIdle: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: crss_sched