micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/update/3.185' into feateure/SUPPORT-8653_fixes

Browse source 
# Conflicts:
#	frontend/package.json
This commit is contained in:
kochetkov 2024-11-08 08:49:47 +03:00
commit 63eb5497ef
124 changed files with 252 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -20,7 +20,7 @@
<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>3.183.1</webbpm-platform.version>
<webbpm-platform.version>3.185.0</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout>
</properties>
<dependencyManagement>
@ -62,7 +62,7 @@
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>backend</artifactId>
<version>3.183.1</version>
<version>3.185.0</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>