Merge remote-tracking branch 'origin/origin/hotfix/1.9.11' into origin/hotfix/1.9.11

# Conflicts:
#	backend/pom.xml
#	pom.xml
This commit is contained in:
gulnaz 2025-03-28 16:26:42 +03:00
commit 10a14dd37b
11 changed files with 408 additions and 271 deletions

28
pom.xml
View file

@ -21,6 +21,7 @@
<webbpm-platform.version>3.192.4</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout>
<jasperreports.version>6.15.0</jasperreports.version>
<spring-kafka.version>2.9.13</spring-kafka.version>
</properties>
<dependencyManagement>
<dependencies>
@ -312,16 +313,33 @@
<artifactId>spring-retry</artifactId>
<version>2.0.11</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>${spring-kafka.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>3.9.0</version>
<exclusions>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
<version>2.0.11</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>6.2.5</version>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>