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

Merge branch 'hotfix/1.9.6' into develop

Browse source 
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/package-lock.json
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
This commit is contained in:
kochetkov 2025-01-16 12:48:58 +03:00
commit a2e1e43e83
124 changed files with 250 additions and 250 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.187.1</webbpm-platform.version>
<webbpm-platform.version>3.187.2</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout>
</properties>
<dependencyManagement>
@ -41,7 +41,7 @@
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>backend</artifactId>
<version>3.187.1</version>
<version>3.187.2</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>