Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets

* origin/develop:
  Update for next development version
  fix version
  fix frontend name
  fix dockerfiles
  переименовал проект

backend/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>business-metrics</artifactId>
-    <version>1.8.0</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <groupId>ru.micord.ervu.business-metrics</groupId>
   <artifactId>backend</artifactId>

config/Dockerfile

@@ -38,7 +38,7 @@ RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
 
 USER tomcat
 
-COPY --from=builder /app/backend/target/dashboard.war /var/lib/tomcat/webapps/dashboard.war
+COPY --from=builder /app/backend/target/business-metrics.war /var/lib/tomcat/webapps/business-metrics.war
 
 FROM backend AS combo
 COPY --from=builder /app/frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war

config/Dockerfile.TC

@@ -13,7 +13,7 @@ RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
  && chmod g+rw /var/lib/tomcat/webapps
 
 COPY frontend.war /var/lib/tomcat/webapps/ROOT.war
-COPY dashboard.war /var/lib/tomcat/webapps/dashboard.war
+COPY business-metrics.war /var/lib/tomcat/webapps/business-metrics.war
 
 USER tomcat
 

config/Dockerfile.alt

@@ -40,7 +40,7 @@ RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
  && chmod g+rw /var/lib/tomcat/webapps
 
 COPY --from=builder /app/frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war
-COPY --from=builder /app/backend/target/dashboard*.war /var/lib/tomcat/webapps/dashboard.war
+COPY --from=builder /app/backend/target/business-metrics*.war /var/lib/tomcat/webapps/business-metrics.war
 
 USER tomcat
 

config/Dockerfile.backend

@@ -37,4 +37,4 @@ RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
 
 USER tomcat
 
-COPY --from=builder /app/backend/target/dashboard*.war /var/lib/tomcat/webapps/dashboard.war
+COPY --from=builder /app/backend/target/business-metrics*.war /var/lib/tomcat/webapps/business-metrics.war

db/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>business-metrics</artifactId>
-    <version>1.8.0</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.business-metrics</groupId>

distribution/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>business-metrics</artifactId>
-    <version>1.8.0</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.business-metrics</groupId>

frontend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ervu-dashboard",
+  "name": "ervu-business-metrics",
   "version": "1.0.0",
   "scripts": {
     "lite": "node ./node_modules/lite-server/bin/lite-server",

frontend/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>business-metrics</artifactId>
-    <version>1.8.0</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.business-metrics</groupId>

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>business-metrics</artifactId>
-  <version>1.8.0</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>

resources/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>business-metrics</artifactId>
-    <version>1.8.0</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.business-metrics</groupId>