Merge branch 'develop' into feature/SUPPORT-8546_cut_unused

This commit is contained in:
Халтобин 2024-10-07 19:32:18 +03:00
commit 9c5c4e8031
5 changed files with 6 additions and 6 deletions

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ru.micord.ervu.lkrp</groupId> <groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId> <artifactId>fl</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
</parent> </parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId> <groupId>ru.micord.ervu.lkrp.fl</groupId>
<artifactId>backend</artifactId> <artifactId>backend</artifactId>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu.lkrp</groupId> <groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId> <artifactId>fl</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
</parent> </parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId> <groupId>ru.micord.ervu.lkrp.fl</groupId>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu.lkrp</groupId> <groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId> <artifactId>fl</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
</parent> </parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId> <groupId>ru.micord.ervu.lkrp.fl</groupId>

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>ru.micord.ervu.lkrp</groupId> <groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId> <artifactId>fl</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>backend</module> <module>backend</module>
@ -424,7 +424,7 @@
<plugin> <plugin>
<groupId>com.amashchenko.maven.plugin</groupId> <groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId> <artifactId>gitflow-maven-plugin</artifactId>
<version>1.19.0-Micord.1</version> <version>1.21.0</version>
<configuration> <configuration>
<useSnapshotInRelease>true</useSnapshotInRelease> <useSnapshotInRelease>true</useSnapshotInRelease>
<useSnapshotInHotfix>true</useSnapshotInHotfix> <useSnapshotInHotfix>true</useSnapshotInHotfix>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu.lkrp</groupId> <groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId> <artifactId>fl</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
</parent> </parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId> <groupId>ru.micord.ervu.lkrp.fl</groupId>