Merge branch 'develop' into hotfix/1.1.2

# Conflicts:
#	config-data-executor/pom.xml
This commit is contained in:
kochetkov 2025-11-21 10:23:53 +03:00
commit a10e2d7608
162 changed files with 661 additions and 684 deletions

65
pom.xml
View file

@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>backend</module>
<module>config-data-executor</module>
<module>resources</module>
</modules>
<scm>
@ -18,10 +19,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enable.version.in.url>false</enable.version.in.url>
<joda-time.version>2.9.2</joda-time.version>
<webbpm-platform.version>5.8.1</webbpm-platform.version>
<webbpm-platform.version>6.2.4</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jasperreports.version>6.21.4</jasperreports.version>
<spring-boot.version>3.5.6</spring-boot.version>
<enforcer.manageExclusions>true</enforcer.manageExclusions>
</properties>
<dependencyManagement>
@ -33,6 +35,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.12.770</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>backend</artifactId>
@ -244,6 +253,11 @@
<artifactId>httpclient</artifactId>
<version>4.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.5.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@ -259,6 +273,40 @@
<artifactId>odfdom-java</artifactId>
<version>0.8.7</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jta</artifactId>
<version>6.0.0</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jdbc</artifactId>
<version>6.0.0</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
@ -294,10 +342,10 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.14.0</version>
<configuration>
<release>17</release>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<release>21</release>
<parameters>true</parameters>
</configuration>
</plugin>
<plugin>
@ -399,7 +447,7 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>enforce</id>
@ -419,13 +467,14 @@
<failOnViolation>true</failOnViolation>
<regexIgnored>
<regexIgnored>postgresql</regexIgnored>
<regexIgnored>resources-impl-development</regexIgnored>
</regexIgnored>
</requireManagedDeps>
<requireMavenVersion>
<version>[3.6.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[17,)</version>
<version>[21,)</version>
</requireJavaVersion>
<compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer">
<enforcers>MODULE_ORDER,PLUGIN_MANAGEMENT_ORDER</enforcers>
@ -443,12 +492,12 @@
<dependency>
<groupId>org.commonjava.maven.enforcer</groupId>
<artifactId>enforce-managed-deps-rule</artifactId>
<version>1.2</version>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.github.ferstl</groupId>
<artifactId>pedantic-pom-enforcers</artifactId>
<version>2.1.0</version>
<version>2.3.0</version>
</dependency>
</dependencies>
</plugin>