diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 5ec040cc3..4b38fdcc0 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index bab1e7850..d20ff2309 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.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 60cd0b43e..e1a8cd5d6 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 77704bbe8..092d4873b 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index a361d9780..9f0da10d3 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.12.4 + SPCEX-3.12.6 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.12.4 + SPCEX-3.12.6 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index ad1b818a2..6a6e3948e 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index d6399fdd1..39733ccd5 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile ru.spcex.clearing dictionary - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 5224dcbea..3ecc5eb0d 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 70bacc7ba..4f75bf609 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 8b2c1d589..a4c8adfdc 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 654aac67c..6f67bb38b 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index de7b2db57..0c8ea4917 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index dd86bdf8f..dfc5b52d3 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.12.4 + SPCEX-3.12.6 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.12.4 + SPCEX-3.12.6 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index e7aa9f8ed..33115ae3f 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 379d12efa..1460f3b62 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile ru.spcex.clearing dictionary - SPCEX-3.12.4 + SPCEX-3.12.6 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index c00510e98..8040d7e16 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile ru.spcex.clearing dictionary - SPCEX-3.12.4 + SPCEX-3.12.6 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 981c38dda..d2ea5441b 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.12.4 + SPCEX-3.12.6 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 6db03af95..07134e92b 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.12.4 + SPCEX-3.12.6 clearing ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index c955604b0..70a13e816 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/loaders/RegistryLoader.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/loaders/RegistryLoader.java index 0f8426c83..393334dea 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/loaders/RegistryLoader.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/loaders/RegistryLoader.java @@ -77,7 +77,7 @@ public class RegistryLoader extends IDBLoader { protected String sqlQuery() { RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T, RegistryTradingParams.OS_T); return ("select * from REGISTRY where SETTLEMENT_DATE >= :startDate and SETTLEMENT_DATE < :endDate " + - "and %s and REGISTRY_STATUS='%s'") // and TRADING_CLEARING_REGISTRY is not null + "and (%s) and REGISTRY_STATUS='%s'") // and TRADING_CLEARING_REGISTRY is not null .formatted(registryCodeSqlBuilder.buildSql(), RegistryStatus.CLRD.getKey()); } diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index e0761fe35..dee0b8d6f 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 7333bb608..09cb2afa2 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.12.4 + SPCEX-3.12.6 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index c10ae9f0b..2a5b47f2d 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 7faec70c3..add21e012 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.12.4 + SPCEX-3.12.6 clearing-parent ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile ru.spcex.clearing dictionary - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 3af262348..302165849 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.12.4 + SPCEX-3.12.6 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.4 + SPCEX-3.12.6 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 64a842b4e..1374cd8d2 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index f79c5318a..15bbdb8c2 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.12.4 + SPCEX-3.12.6 test-clearing Test-clearing - SPCEX-3.12.4 + SPCEX-3.12.6 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index b9816c699..f555dc2b6 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.12.4 + SPCEX-3.12.6 trade-importer trade-importer Trade importer module - SPCEX-3.12.4 + SPCEX-3.12.6 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.12.4 + SPCEX-3.12.6 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 53f32748b..975ee3406 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.12.4 + SPCEX-3.12.6 4.0.0 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 5c7ae87f3..59fb02435 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.12.4 + SPCEX-3.12.6 diff --git a/pom.xml b/pom.xml index 4d898fddc..276c892d1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.12.4 + SPCEX-3.12.6 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.12.4 + SPCEX-3.12.6 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 84d3e1691..3fcdd2e51 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.12.4 + SPCEX-3.12.6 4.0.0