diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 2b7bd9a56..82d748b97 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index a4b7e1bfc..dac4894e6 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.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index d8236ee74..dd48b24f0 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index b29a15f3e..47f801a8a 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index e1f7358d4..6005758a9 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.17.223 + SPCEX-3.17.224 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.17.223 + SPCEX-3.17.224 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 336c235e2..2d8c71c21 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 4728e98d4..5564eb19c 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile ru.spcex.clearing dictionary - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 88583cfa7..88df43469 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index f8b114d2d..fdb1e975b 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 463ac0e58..de7b279e8 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 226b28d69..f5489a4be 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 4c23734a4..f561c4798 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index c0087691b..09cce1d17 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.17.223 + SPCEX-3.17.224 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.17.223 + SPCEX-3.17.224 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 056313b8c..799ef8570 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 277335b92..11d127fb8 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile ru.spcex.clearing dictionary - SPCEX-3.17.223 + SPCEX-3.17.224 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index b4cdbcd25..c1b5cc054 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile ru.spcex.clearing dictionary - SPCEX-3.17.223 + SPCEX-3.17.224 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 492931d9e..82198d3b9 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.17.223 + SPCEX-3.17.224 jar ru.spcex.clearing clearing-parent - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 129117120..8d3b679ad 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.17.223 + SPCEX-3.17.224 clearing ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index f5fe2d49d..e00360711 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 0e7ef8a6f..613609fa2 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 91f76134c..c32468607 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.17.223 + SPCEX-3.17.224 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 88148328c..9d556bbd8 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index ef4fee779..784d1c036 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile ru.spcex.clearing dictionary - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 08d5fc53e..01c700ef1 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.17.223 + SPCEX-3.17.224 jar ru.spcex.clearing clearing-parent - SPCEX-3.17.223 + SPCEX-3.17.224 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index eaeed5031..82f65d946 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 7cd50841a..1731233c9 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.17.223 + SPCEX-3.17.224 test-clearing Test-clearing - SPCEX-3.17.223 + SPCEX-3.17.224 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index bb9f0ec1b..11dc47d8c 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.17.223 + SPCEX-3.17.224 trade-importer trade-importer Trade importer module - SPCEX-3.17.223 + SPCEX-3.17.224 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.17.223 + SPCEX-3.17.224 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 1500b6b69..c74167c72 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.17.223 + SPCEX-3.17.224 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 5c873ff45..ebb63368b 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index a1b987bca..aad4c9791 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.17.223 + SPCEX-3.17.224 clearing-parent ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFile.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFile.java index 98bf5b38d..2f7e61a13 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFile.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFile.java @@ -80,8 +80,6 @@ public class ReadXMLFile { lostField.add("REMAINDER"); if (row.getDat() == null) lostField.add("DAT"); - if (isEmpty(row.getMarket())) - lostField.add("MARKET"); if (isEmpty(row.getAccType())) lostField.add("ACC_TYPE"); } else { @@ -98,8 +96,6 @@ public class ReadXMLFile { lostField.add("Account"); if (row.getSum() == null) lostField.add("Sum"); - if (isEmpty(row.getMarket())) - lostField.add("Market"); if (isEmpty(row.getDeal())) lostField.add("DEAL"); if (isEmpty(row.getSpec())) diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index c529a61f5..d31be74aa 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.17.223 + SPCEX-3.17.224 diff --git a/pom.xml b/pom.xml index 22384321f..699128b65 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.17.223 + SPCEX-3.17.224 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.17.223 + SPCEX-3.17.224 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 6588d0d32..60999771b 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.17.223 + SPCEX-3.17.224 4.0.0