diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 89a8dd67e..608438565 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.12.12 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 7779ba371..b3a1eaac9 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.12.12 @@ -233,19 +233,6 @@ - diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index e98d5541a..4a3f8915f 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.12.12 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 35961d681..c232fd29c 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.12.12 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 8885b87e1..86a17be17 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.12.12 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.14.106 + SPCEX-3.12.12 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 77c99ea1e..55edbced9 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.12.12 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 64f1f0703..f6209eeb0 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 79e26f13e..cdd93d420 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.12.12 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 2f5e9612b..8336e3dd4 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 42c83c208..34622bebf 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 4fba378ba..066552f0f 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index f2c5a50cb..e1b1e8953 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index c14342bba..6199068cd 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.12.12 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.14.106 + SPCEX-3.12.12 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 0c2e6edbb..6418559b2 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.12.12 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index a7c1d0326..eea089092 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.12.12 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 8835e9581..555467c65 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.12.12 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 16902e0be..40a5b2725 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.12.12 jar ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 4dcd5195a..bc7076645 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.12.12 clearing ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -43,8 +43,6 @@ swt-importer gateway-api imdg-hist - xml-importer - xml-exporter diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 225065c9a..c4e9ee304 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.12.12 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index a6fb9cdf4..210e5d749 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -51,12 +51,6 @@ 1.4.19 - - - org.springframework.boot - spring-boot-starter-jdbc - - org.apache.poi @@ -132,15 +126,6 @@ spring-boot-test test - - com.mchange - c3p0 - - - org.postgresql - postgresql - 42.7.3 - diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java index ad9fb91aa..59fd03832 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java @@ -93,7 +93,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate); diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index c44193adb..313d1845e 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.12.12 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 0d6cc041e..4eb900e3a 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.12.12 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 55420004e..c03fcb7c5 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.12.12 clearing-parent ru.spcex.clearing - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile ru.spcex.clearing dictionary - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index e9c0f3940..44067f90f 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.12.12 jar ru.spcex.clearing clearing-parent - SPCEX-3.14.106 + SPCEX-3.12.12 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 841d75f5f..598e58d75 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.12.12 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index f8741d938..bad011401 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.12.12 test-clearing Test-clearing - SPCEX-3.14.106 + SPCEX-3.12.12 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 09266c813..8345377ae 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.12.12 trade-importer trade-importer Trade importer module - SPCEX-3.14.106 + SPCEX-3.12.12 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.14.106 + SPCEX-3.12.12 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 565dd0d7c..eaf5fc7c8 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.12.12 4.0.0 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index b4b87d2e4..51478a3b7 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.12.12 diff --git a/pom.xml b/pom.xml index e357538ea..cdb207657 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.14.106 + SPCEX-3.12.12 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.14.106 + SPCEX-3.12.12 2.6.3 @@ -53,8 +53,6 @@ ${folder_root_clearing}/clearing-parent/registry-service ${folder_root_clearing}/clearing-parent/scheduler-service ${folder_root_clearing}/clearing-parent/gateway-api - ${folder_root_clearing}/clearing-parent/xml-exporter - ${folder_root_clearing}/clearing-parent/xml-importer 3.12.4 1.7.33 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 5e9bb1d30..038dca656 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.12.12 4.0.0 @@ -568,52 +568,6 @@ - - copy-xml-exporter-bin - prepare-package - - copy - - - - - ${folder_root_xml-exporter}/target/xml-exporter.jar - ${folder.clearing.distr.bin}/xml-exporter.jar - - - ${folder_root_xml-exporter}/target/xml-exporter.jar - ${folder.clearing.distr.services}/xml-exporter/xml-exporter.jar - - - ${folder_root_xml-exporter}/src/main/resources/application.properties - ${folder.clearing.distr.settings}/xml-exporter/application.properties - - - - - - copy-xml-importer-bin - prepare-package - - copy - - - - - ${folder_root_xml-importer}/target/xml-importer.jar - ${folder.clearing.distr.bin}/xml-importer.jar - - - ${folder_root_xml-importer}/target/xml-importer.jar - ${folder.clearing.distr.services}/xml-importer/xml-importer.jar - - - ${folder_root_xml-importer}/src/main/resources/application.properties - ${folder.clearing.distr.settings}/xml-importer/application.properties - - - -