Update develop to production version to avoid merge conflicts

This commit is contained in:
root 2024-09-23 16:56:30 +03:00
parent 1e0e9d0913
commit 26eb6fa040
6 changed files with 6 additions and 6 deletions

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
</parent> </parent>
<groupId>ru.micord.ervu.dashboard</groupId> <groupId>ru.micord.ervu.dashboard</groupId>
<artifactId>backend</artifactId> <artifactId>backend</artifactId>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
</parent> </parent>
<groupId>ru.micord.ervu.dashboard</groupId> <groupId>ru.micord.ervu.dashboard</groupId>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
</parent> </parent>
<groupId>ru.micord.ervu.dashboard</groupId> <groupId>ru.micord.ervu.dashboard</groupId>

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>backend</module> <module>backend</module>

View file

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
</parent> </parent>
<groupId>ru.micord.ervu.dashboard</groupId> <groupId>ru.micord.ervu.dashboard</groupId>

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ru.micord.ervu</groupId> <groupId>ru.micord.ervu</groupId>
<artifactId>dashboard</artifactId> <artifactId>dashboard</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.4.0</version>
</parent> </parent>
<groupId>ru.micord.ervu.dashboard</groupId> <groupId>ru.micord.ervu.dashboard</groupId>