diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 89a8dd67e..b3a66871d 100644 --- a/clearing-parent/account-service/pom.xml +++ b/clearing-parent/account-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 7779ba371..1451d8d39 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -11,7 +11,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index e98d5541a..64e1a1ee2 100644 --- a/clearing-parent/balance-service/pom.xml +++ b/clearing-parent/balance-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 35961d681..40832cb51 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 8885b87e1..a884131d9 100644 --- a/clearing-parent/cleaning-builders/pom.xml +++ b/clearing-parent/cleaning-builders/pom.xml @@ -6,13 +6,13 @@ ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.14.106 + SPCEX-3.15.207 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 77c99ea1e..be499cb55 100644 --- a/clearing-parent/clearing-service/pom.xml +++ b/clearing-parent/clearing-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 64f1f0703..c77a4e57d 100644 --- a/clearing-parent/clearing-validation/pom.xml +++ b/clearing-parent/clearing-validation/pom.xml @@ -8,12 +8,12 @@ clearing-validation Clearing-module, dependency version of platform-utils jar - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 79e26f13e..648cc3165 100644 --- a/clearing-parent/company-service/pom.xml +++ b/clearing-parent/company-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 2f5e9612b..b1080e2ca 100644 --- a/clearing-parent/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,12 @@ db-scripts db-scripts db-scripts for PostgreSQL - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 50617d50c..8e3878ac9 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.14 +-- DB version: 3.15 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -5181,4 +5181,4 @@ GRANT ALL PRIVILEGES ON TABLE BLACKLIST_MARKET TO clearing; -- Data types -INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.14') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.15') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql new file mode 100644 index 000000000..d53284757 --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql @@ -0,0 +1,37 @@ +-- DB version: 3.14 -> 3.15 + +-- == alter exist tables == + +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS NAME varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS ADDRESS varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ADDRESS varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_SWIFT_CODE varchar(12); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ACCOUNT varchar(35); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_NAME1 varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ADDRESS1 varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ACCOUNT1 varchar(35); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_NAME2 varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ADDRESS2 varchar(255); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS INTERMEDIARY_SWIFT_CODE2 varchar(12); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BANK_ACCOUNT2 varchar(35); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS PERSONAL_ACCOUNT varchar(20); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS BUDGET_CLASSIFICATION_CODE varchar(20); +ALTER TABLE BANK_ACCOUNT ADD COLUMN IF NOT EXISTS OKTMO varchar(20); +COMMENT ON COLUMN BANK_ACCOUNT.NAME IS ' '; +COMMENT ON COLUMN BANK_ACCOUNT.ADDRESS IS ' ( )'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ADDRESS IS ' '; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_SWIFT_CODE IS 'SWIFT '; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ACCOUNT IS ' '; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_NAME1 IS ' - 1 ( )'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ADDRESS1 IS ' - 1 ( )'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ACCOUNT1 IS ' - 1'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_NAME2 IS ' - 2'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ADDRESS2 IS ' - 2'; +COMMENT ON COLUMN BANK_ACCOUNT.INTERMEDIARY_SWIFT_CODE2 IS 'SWIFT - 2'; +COMMENT ON COLUMN BANK_ACCOUNT.BANK_ACCOUNT2 IS ' - 2'; +COMMENT ON COLUMN BANK_ACCOUNT.PERSONAL_ACCOUNT IS ' '; +COMMENT ON COLUMN BANK_ACCOUNT.BUDGET_CLASSIFICATION_CODE IS ''; +COMMENT ON COLUMN BANK_ACCOUNT.OKTMO IS ' '; + + +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.15') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 42c83c208..7289b33ac 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -7,12 +7,12 @@ dbf-exporter dbf-exporter DBF exporter for DBF files - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 4fba378ba..2af88ffec 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -8,12 +8,12 @@ dbf-importer dbf-importer DBF loader for DBF files - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index f2c5a50cb..f28883261 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index c14342bba..68e62a50a 100644 --- a/clearing-parent/extdb-importer/pom.xml +++ b/clearing-parent/extdb-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.14.106 + SPCEX-3.15.207 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 0c2e6edbb..97b74c497 100644 --- a/clearing-parent/gateway-api/pom.xml +++ b/clearing-parent/gateway-api/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index a7c1d0326..0872d7b5a 100644 --- a/clearing-parent/imdg-hist/pom.xml +++ b/clearing-parent/imdg-hist/pom.xml @@ -5,12 +5,12 @@ 4.0.0 imdg-hist jar - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.15.207 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 8835e9581..c0321681c 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -7,12 +7,12 @@ imdg Clearing in memory data grid jar - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.15.207 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 16902e0be..48614d05d 100644 --- a/clearing-parent/lim-exporter/pom.xml +++ b/clearing-parent/lim-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lim-exporter Lim exporter - SPCEX-3.14.106 + SPCEX-3.15.207 jar ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 4dcd5195a..1537daa9f 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.14.106 + SPCEX-3.15.207 clearing ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 225065c9a..b387bfd1a 100644 --- a/clearing-parent/registry-service/pom.xml +++ b/clearing-parent/registry-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index a6fb9cdf4..31dbe442a 100644 --- a/clearing-parent/reports-service/pom.xml +++ b/clearing-parent/reports-service/pom.xml @@ -8,12 +8,12 @@ reports-service reports-service Service for creating reports - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index c44193adb..53c2da460 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 0d6cc041e..1ab940fb3 100644 --- a/clearing-parent/securities-service/pom.xml +++ b/clearing-parent/securities-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 55420004e..41eb88517 100644 --- a/clearing-parent/security-util/pom.xml +++ b/clearing-parent/security-util/pom.xml @@ -8,12 +8,12 @@ security-util clearing Clearing misc util for verify user roles jar - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index e9c0f3940..e8a89e6b9 100644 --- a/clearing-parent/swt-exporter/pom.xml +++ b/clearing-parent/swt-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 swt-exporter Swt exporter - SPCEX-3.14.106 + SPCEX-3.15.207 jar ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 841d75f5f..17408cf21 100644 --- a/clearing-parent/swt-importer/pom.xml +++ b/clearing-parent/swt-importer/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index f8741d938..a51608b73 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -4,11 +4,11 @@ ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 test-clearing Test-clearing - SPCEX-3.14.106 + SPCEX-3.15.207 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 09266c813..296b36fab 100644 --- a/clearing-parent/trade-importer/pom.xml +++ b/clearing-parent/trade-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.15.207 trade-importer trade-importer Trade importer module - SPCEX-3.14.106 + SPCEX-3.15.207 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.15.207 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 565dd0d7c..ac04ce93e 100644 --- a/clearing-parent/utility-service/pom.xml +++ b/clearing-parent/utility-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index fb9069127..118d724c7 100644 --- a/clearing-parent/xml-exporter/pom.xml +++ b/clearing-parent/xml-exporter/pom.xml @@ -7,12 +7,12 @@ xml-exporter xml-exporter XML exporter for XML files - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index d82774e8e..2ac984b15 100644 --- a/clearing-parent/xml-importer/pom.xml +++ b/clearing-parent/xml-importer/pom.xml @@ -8,12 +8,12 @@ xml-importer xml-importer XML loader for XML files - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index b4b87d2e4..d41a69959 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.14.106 + SPCEX-3.15.207 diff --git a/pom.xml b/pom.xml index e357538ea..2ad22450c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.14.106 + SPCEX-3.15.207 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.14.106 + SPCEX-3.15.207 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 5e9bb1d30..e6234289d 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.15.207 4.0.0