Merge branch '2.0.x' into 2.0.x-updates

crss-data/crss-data-top.yml

@@ -14,8 +14,8 @@ crss:
     datasource:
       platform: postgresql
       url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
-      username: crss_dw
-      password: etPyY3k8
+      username: crss_dataextraction
+      password: xgZx2FqM
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration

crss-reg/crss-reg-top.yml

@@ -3,11 +3,11 @@ spring:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
     username: crss_registration
     password: 51UF3JA9
-  xdf-control: # TODO: this is just temporary while waiting to oracle conn info
-    datasource:
-      url: jdbc:edb://10.176.11.23:5432/dor_rt
-      username: dor_rt
-      password: dor_rt
+  #xdf-control: # TODO: this is just temporary while waiting to oracle conn info
+    #datasource:
+      #url: jdbc:edb://10.176.11.23:5432/dor_rt
+      #username: dor_rt
+      #password: dor_rt
 crss:
   docmgt:
     root-dir: /crss/docmgt