From 9fa49205099b7728628640c4db02a7075698643c Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 30 Jul 2024 11:47:21 +0300 Subject: [PATCH 1/2] up pom version SPCEX-3.12.101 --- clearing-parent/account-service/pom.xml | 2 +- clearing-parent/backend-api/pom.xml | 2 +- clearing-parent/balance-service/pom.xml | 2 +- clearing-parent/classes/pom.xml | 2 +- clearing-parent/cleaning-builders/pom.xml | 6 +++--- clearing-parent/clearing-service/pom.xml | 2 +- clearing-parent/clearing-validation/pom.xml | 8 ++++---- clearing-parent/company-service/pom.xml | 2 +- clearing-parent/db-scripts/pom.xml | 4 ++-- clearing-parent/dbf-exporter/pom.xml | 4 ++-- clearing-parent/dbf-importer/pom.xml | 4 ++-- clearing-parent/dictionary/pom.xml | 4 ++-- clearing-parent/extdb-importer/pom.xml | 4 ++-- clearing-parent/gateway-api/pom.xml | 2 +- clearing-parent/imdg-hist/pom.xml | 10 +++++----- clearing-parent/imdg/pom.xml | 10 +++++----- clearing-parent/lim-exporter/pom.xml | 6 +++--- clearing-parent/pom.xml | 4 ++-- clearing-parent/registry-service/pom.xml | 2 +- clearing-parent/reports-service/pom.xml | 4 ++-- clearing-parent/scheduler-service/pom.xml | 4 ++-- clearing-parent/securities-service/pom.xml | 2 +- clearing-parent/security-util/pom.xml | 8 ++++---- clearing-parent/swt-exporter/pom.xml | 6 +++--- clearing-parent/swt-importer/pom.xml | 2 +- clearing-parent/test-clearing/pom.xml | 4 ++-- clearing-parent/trade-importer/pom.xml | 6 +++--- clearing-parent/utility-service/pom.xml | 2 +- clearing-parent/xml-exporter/pom.xml | 4 ++-- clearing-parent/xml-importer/pom.xml | 4 ++-- platform-parent/pom.xml | 2 +- pom.xml | 4 ++-- z-distr/pom.xml | 2 +- 33 files changed, 67 insertions(+), 67 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 6a37f36b1..87eb9c90f 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 7e239f070..f891d2def 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.100 + SPCEX-3.12.101 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 060b5c41e..a1b729949 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index c0dab78be..418ba61c1 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.100 + SPCEX-3.12.101 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 9c0519343..0f752b64d 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.100 + SPCEX-3.12.101 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.12.100 + SPCEX-3.12.101 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 70c66ebb5..45af5a064 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 538f63f38..90e41d764 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile ru.spcex.clearing dictionary - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 393959959..dae69f07d 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index b92e259fe..0a253042a 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index a2ee1394e..bd46569b2 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 430d51e52..b9784c7af 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 8638a8628..827b533c9 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index a3d5d8603..471174b2d 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.100 + SPCEX-3.12.101 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.12.100 + SPCEX-3.12.101 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 4f715951b..6d2af226a 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index b3f4fd748..cfc1c1ea4 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile ru.spcex.clearing dictionary - SPCEX-3.12.100 + SPCEX-3.12.101 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index dcce4ab47..377c40313 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile ru.spcex.clearing dictionary - SPCEX-3.12.100 + SPCEX-3.12.101 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 17e0ff1b4..999df69b2 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.100 + SPCEX-3.12.101 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 367d53ea5..a93d12051 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.12.100 + SPCEX-3.12.101 clearing ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index dfadf444c..ebf15f192 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 48bfc8844..b36a54936 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index c69028189..626af9c18 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.100 + SPCEX-3.12.101 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index bbb14ec5d..7facaacb5 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 4e6da2ed1..720ce681c 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.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile ru.spcex.clearing dictionary - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 84e6c11e1..769b2baae 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.100 + SPCEX-3.12.101 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.100 + SPCEX-3.12.101 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 2be418274..a2e88d873 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index af27ef295..d10acaa1c 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.100 + SPCEX-3.12.101 test-clearing Test-clearing - SPCEX-3.12.100 + SPCEX-3.12.101 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 749420445..4a4b6c79e 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.100 + SPCEX-3.12.101 trade-importer trade-importer Trade importer module - SPCEX-3.12.100 + SPCEX-3.12.101 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.12.100 + SPCEX-3.12.101 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index d98177fa7..4e187afaf 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.100 + SPCEX-3.12.101 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 1af5ef918..f385023b6 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.12.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index 58f112d74..1412930bb 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.12.100 + SPCEX-3.12.101 clearing-parent ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 43c531b74..154641908 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.12.100 + SPCEX-3.12.101 diff --git a/pom.xml b/pom.xml index c43569c0e..d4eb785ff 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.12.100 + SPCEX-3.12.101 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.12.100 + SPCEX-3.12.101 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index ba8bce414..3548e056c 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.12.100 + SPCEX-3.12.101 4.0.0 From 80f61e36cd686b635dffab0eb9524b9f281a446b Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 30 Jul 2024 12:01:58 +0300 Subject: [PATCH 2/2] securities-service http://jira.mfd.msk:8088/browse/CLS-709 (bug fix CLS-612) --- .../securities/service/cud/CurrencyPairSecurityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java index 1492c5e89..654f05539 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java @@ -168,7 +168,7 @@ public class CurrencyPairSecurityService extends QueueConsumer implements Initia currencyPairSecurity.setFullName(req.getFullName()); // currencyPairSecurity.setShortNameEng(req.getShortNameEng()); // currencyPairSecurity.setFullNameEng(req.getFullNameEng()); - if (req.getWorkflowStatus() == null) { + if (req.getWorkflowStatus() != null) { currencyPairSecurity.setWorkflowStatus(req.getWorkflowStatus()); }