From 346c156cf59850daa45e45941a15adb77136b308 Mon Sep 17 00:00:00 2001
From: root <root@agent72.asd.center.cg>
Date: Mon, 30 Sep 2024 17:00:49 +0300
Subject: [PATCH] Update develop to production version to avoid merge conflicts

---
 backend/pom.xml      | 2 +-
 distribution/pom.xml | 2 +-
 frontend/pom.xml     | 2 +-
 pom.xml              | 2 +-
 resources/pom.xml    | 2 +-
 test/pom.xml         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 682c1be0..c2c18697 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>dashboard</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </parent>
   <groupId>ru.micord.ervu.dashboard</groupId>
   <artifactId>backend</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 65773c97..e1c293a0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>dashboard</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </parent>
 
   <groupId>ru.micord.ervu.dashboard</groupId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index c9cf52b6..61f6d7e7 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>dashboard</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </parent>
 
   <groupId>ru.micord.ervu.dashboard</groupId>
diff --git a/pom.xml b/pom.xml
index 93d4fc13..247eef6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>dashboard</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.5.0</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index cccc0d3b..477ffc11 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>dashboard</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </parent>
 
   <groupId>ru.micord.ervu.dashboard</groupId>
diff --git a/test/pom.xml b/test/pom.xml
index 5c1e94c4..ef06645d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>dashboard</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </parent>
 
   <groupId>ru.micord.ervu.dashboard</groupId>