treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source 
# Conflicts:
#	clearing-parent/account-service/pom.xml
#	clearing-parent/backend-api/pom.xml
#	clearing-parent/balance-service/pom.xml
#	clearing-parent/classes/pom.xml
#	clearing-parent/cleaning-builders/pom.xml
#	clearing-parent/clearing-service/pom.xml
#	clearing-parent/clearing-validation/pom.xml
#	clearing-parent/company-service/pom.xml
#	clearing-parent/db-scripts/pom.xml
#	clearing-parent/dbf-exporter/pom.xml
#	clearing-parent/dbf-importer/pom.xml
#	clearing-parent/dictionary/pom.xml
#	clearing-parent/extdb-importer/pom.xml
#	clearing-parent/gateway-api/pom.xml
#	clearing-parent/imdg-hist/pom.xml
#	clearing-parent/imdg/pom.xml
#	clearing-parent/lim-exporter/pom.xml
#	clearing-parent/pom.xml
#	clearing-parent/registry-service/pom.xml
#	clearing-parent/reports-service/pom.xml
#	clearing-parent/scheduler-service/pom.xml
#	clearing-parent/securities-service/pom.xml
#	clearing-parent/security-util/pom.xml
#	clearing-parent/swt-exporter/pom.xml
#	clearing-parent/swt-importer/pom.xml
#	clearing-parent/test-clearing/pom.xml
#	clearing-parent/trade-importer/pom.xml
#	clearing-parent/utility-service/pom.xml
#	platform-parent/pom.xml
#	pom.xml
#	z-distr/pom.xml
This commit is contained in:
akulikov 2024-09-09 12:38:40 +03:00
commit 9701877672
32 changed files with 69 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

15
clearing-parent/backend-api/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
@ -233,19 +233,6 @@
</fileMapper> </fileMapper>
</fileMappers> </fileMappers>
</transformationSet> </transformationSet>
<!-- <transformationSet>
<dir>src/main/resources/meta</dir>
<includes>
<include>data_register_code.xml</include>
</includes>
<stylesheet>src/main/resources/meta/xsl/data.xsl</stylesheet>
<fileMappers>
<fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>data_register_code.sql</targetExtension>
</fileMapper>
</fileMappers>
</transformationSet> -->
</transformationSets> </transformationSets>
</configuration> </configuration>
</execution> </execution>

2
clearing-parent/balance-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
clearing-parent/classes/pom.xml
View file

@ -12,7 +12,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>

6
clearing-parent/cleaning-builders/pom.xml
View file

@ -6,13 +6,13 @@
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<artifactId>cleaning-builders</artifactId> <artifactId>cleaning-builders</artifactId>
<name>cleaning-builders</name> <name>cleaning-builders</name>
<description>Cleaning builders module</description> <description>Cleaning builders module</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
clearing-parent/clearing-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

8
clearing-parent/clearing-validation/pom.xml
View file

@ -8,12 +8,12 @@
<name>clearing-validation</name> <name>clearing-validation</name>
<description>Clearing-module, dependency version of platform-utils</description> <description>Clearing-module, dependency version of platform-utils</description>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>
@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId> <artifactId>dictionary</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
clearing-parent/company-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
clearing-parent/db-scripts/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>db-scripts</artifactId> <artifactId>db-scripts</artifactId>
<name>db-scripts</name> <name>db-scripts</name>
<description>db-scripts for PostgreSQL</description> <description>db-scripts for PostgreSQL</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<build> <build>

4
clearing-parent/dbf-exporter/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>dbf-exporter</artifactId> <artifactId>dbf-exporter</artifactId>
<name>dbf-exporter</name> <name>dbf-exporter</name>
<description>DBF exporter for DBF files</description> <description>DBF exporter for DBF files</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<dependencies> <dependencies>

4
clearing-parent/dbf-importer/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>dbf-importer</artifactId> <artifactId>dbf-importer</artifactId>
<name>dbf-importer</name> <name>dbf-importer</name>
<description>DBF loader for DBF files</description> <description>DBF loader for DBF files</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<dependencies> <dependencies>

4
clearing-parent/dictionary/pom.xml
View file

@ -8,12 +8,12 @@
<name>Clearing dictionary</name> <name>Clearing dictionary</name>
<description>Clearing dictionary</description> <description>Clearing dictionary</description>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>

4
clearing-parent/extdb-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<artifactId>extdb-importer</artifactId> <artifactId>extdb-importer</artifactId>
<name>extdb-importer</name> <name>extdb-importer</name>
<description>Extdb importer module. Аналог trade-importer.</description> <description>Extdb importer module. Аналог trade-importer.</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

2
clearing-parent/gateway-api/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

10
clearing-parent/imdg-hist/pom.xml
View file

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>imdg-hist</artifactId> <artifactId>imdg-hist</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
@ -36,13 +36,13 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId> <artifactId>dictionary</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -82,7 +82,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId> <artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

10
clearing-parent/imdg/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>imdg</artifactId> <artifactId>imdg</artifactId>
<name>Clearing in memory data grid</name> <name>Clearing in memory data grid</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>
@ -32,13 +32,13 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId> <artifactId>dictionary</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -89,7 +89,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId> <artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
clearing-parent/lim-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>lim-exporter</artifactId> <artifactId>lim-exporter</artifactId>
<name>Lim exporter</name> <name>Lim exporter</name>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>
@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
clearing-parent/pom.xml
View file

@ -7,12 +7,12 @@
<name>_parent_clearing</name> <name>_parent_clearing</name>
<description>Clearing parent module</description> <description>Clearing parent module</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing</artifactId> <artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modules> <modules>
@ -43,8 +43,6 @@
<module>swt-importer</module> <module>swt-importer</module>
<module>gateway-api</module> <module>gateway-api</module>
<module>imdg-hist</module> <module>imdg-hist</module>
<module>xml-importer</module>
<module>xml-exporter</module>
</modules> </modules>
<properties> <properties>

2
clearing-parent/registry-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

19
clearing-parent/reports-service/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>reports-service</artifactId> <artifactId>reports-service</artifactId>
<name>reports-service</name> <name>reports-service</name>
<description>Service for creating reports</description> <description>Service for creating reports</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<dependencies> <dependencies>
<!-- Spring boot --> <!-- Spring boot -->
@ -51,12 +51,6 @@
<version>1.4.19</version> <version>1.4.19</version>
</dependency> </dependency>
<!-- JDBC -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- DOC --> <!-- DOC -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
@ -132,15 +126,6 @@
<artifactId>spring-boot-test</artifactId> <artifactId>spring-boot-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.3</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -93,7 +93,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
registryPredicate, registryPredicate,
pb.greatEqual("refundDate", nowDate), pb.greatEqual("refundDate", nowDate),
pb.lessEqual("valueDate", nowDate), pb.lessEqual("valueDate", nowDate),
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey()) pb.or(
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey()),
pb.and(
pb.equals("sessionType", SessionType.UNIT.getKey()),
pb.equals("section", Section.MKR.getKey()))
)
); );
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate); log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate);

4
clearing-parent/scheduler-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId> <artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
clearing-parent/securities-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

8
clearing-parent/security-util/pom.xml
View file

@ -8,12 +8,12 @@
<name>security-util clearing</name> <name>security-util clearing</name>
<description>Clearing misc util for verify user roles</description> <description>Clearing misc util for verify user roles</description>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>
@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId> <artifactId>dictionary</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
clearing-parent/swt-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>swt-exporter</artifactId> <artifactId>swt-exporter</artifactId>
<name>Swt exporter</name> <name>Swt exporter</name>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<properties> <properties>
@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
clearing-parent/swt-importer/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
clearing-parent/test-clearing/pom.xml
View file

@ -4,11 +4,11 @@
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<artifactId>test-clearing</artifactId> <artifactId>test-clearing</artifactId>
<name>Test-clearing</name> <name>Test-clearing</name>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ru.spcex.platform</groupId> <groupId>ru.spcex.platform</groupId>

6
clearing-parent/trade-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<artifactId>trade-importer</artifactId> <artifactId>trade-importer</artifactId>
<name>trade-importer</name> <name>trade-importer</name>
<description>Trade importer module</description> <description>Trade importer module</description>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId> <artifactId>classes</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
clearing-parent/utility-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing-parent</artifactId> <artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
platform-parent/pom.xml
View file

@ -14,7 +14,7 @@
<parent> <parent>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<artifactId>clearing</artifactId> <artifactId>clearing</artifactId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modules> <modules>

6
pom.xml
View file

@ -9,7 +9,7 @@
<name>__parent_ROOT</name> <name>__parent_ROOT</name>
<description>Clearing main parent</description> <description>Clearing main parent</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
<modules> <modules>
<module>clearing-parent</module> <module>clearing-parent</module>
@ -24,7 +24,7 @@
<project.java.version>17</project.java.version> <project.java.version>17</project.java.version>
<built.by>Maven</built.by> <built.by>Maven</built.by>
<global.project.version>SPCEX-3.14.106</global.project.version> <global.project.version>SPCEX-3.12.12</global.project.version>
<spring-boot.version>2.6.3</spring-boot.version> <spring-boot.version>2.6.3</spring-boot.version>
@ -53,8 +53,6 @@
<folder_root_registry-service>${folder_root_clearing}/clearing-parent/registry-service</folder_root_registry-service> <folder_root_registry-service>${folder_root_clearing}/clearing-parent/registry-service</folder_root_registry-service>
<folder_root_scheduler-service>${folder_root_clearing}/clearing-parent/scheduler-service</folder_root_scheduler-service> <folder_root_scheduler-service>${folder_root_clearing}/clearing-parent/scheduler-service</folder_root_scheduler-service>
<folder_root_gateway-api>${folder_root_clearing}/clearing-parent/gateway-api</folder_root_gateway-api> <folder_root_gateway-api>${folder_root_clearing}/clearing-parent/gateway-api</folder_root_gateway-api>
<folder_root_xml-exporter>${folder_root_clearing}/clearing-parent/xml-exporter</folder_root_xml-exporter>
<folder_root_xml-importer>${folder_root_clearing}/clearing-parent/xml-importer</folder_root_xml-importer>
<!-- IMDG --> <!-- IMDG -->
<external_libraries.hazelcast.version>3.12.4</external_libraries.hazelcast.version> <external_libraries.hazelcast.version>3.12.4</external_libraries.hazelcast.version>
<external_libraries.slf4j.version>1.7.33</external_libraries.slf4j.version> <external_libraries.slf4j.version>1.7.33</external_libraries.slf4j.version>

48
z-distr/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>clearing</artifactId> <artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId> <groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version> <version>SPCEX-3.12.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -568,52 +568,6 @@
</fileSets> </fileSets>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>copy-xml-exporter-bin</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/target/xml-exporter.jar</sourceFile>
<destinationFile>${folder.clearing.distr.bin}/xml-exporter.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/target/xml-exporter.jar</sourceFile>
<destinationFile>${folder.clearing.distr.services}/xml-exporter/xml-exporter.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.settings}/xml-exporter/application.properties</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
<execution>
<id>copy-xml-importer-bin</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${folder_root_xml-importer}/target/xml-importer.jar</sourceFile>
<destinationFile>${folder.clearing.distr.bin}/xml-importer.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-importer}/target/xml-importer.jar</sourceFile>
<destinationFile>${folder.clearing.distr.services}/xml-importer/xml-importer.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-importer}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.settings}/xml-importer/application.properties</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>