Merge branch 'develop' into feature/SUPPORT-8412-8413_new_request_format

# Conflicts:
#	backend/src/main/java/ervu_lkrp_fl/ervu_lkrp_fl/controller/ProfileController.java
#	config/patches/default.cli
#	frontend/src/ts/modules/app/app.module.ts
#	frontend/src/ts/modules/app/component/app-header.component.ts
#	frontend/src/ts/modules/app/service/app-jivo-chat.service.ts
#	resources/src/main/resources/business-model/LK RP FL/restriction.page

config/Dockerfile

@@ -19,4 +19,4 @@ RUN chmod -R +x patches && \
 ENV SERVER_START=true
 COPY --chown=jboss *.ear $JBOSS_HOME/standalone/deployments/
 
-HEALTHCHECK --timeout=3s --start-period=3600s CMD curl --fail 127.0.0.1:8080/backend/version || exit 1
+HEALTHCHECK --timeout=3s --start-period=3600s CMD curl --fail 127.0.0.1:8080/fl/version || exit 1

config/context.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+    <!-- Default set of monitored resources. If one of these changes, the    -->
+    <!-- web application will be reloaded.                                   -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+    <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    <!--
+    <Manager pathname="" />
+    -->
+
+    <Resource name="java:/webbpm/AppDS" auth="Container"
+          type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
+          url="jdbc:postgresql://10.10.31.119:5432/ervu-lkrp-fl"
+          username="ervu-lkrp-fl" password="ervu-lkrp-fl" maxTotal="20" maxIdle="10" maxWaitMillis="-1"/>
+</Context>

config/patches/default.cli

@@ -16,41 +16,6 @@ xa-data-source add \
   --query-timeout=300 \
   --xa-datasource-properties=ServerName=${env.DB_APP_HOST:db},PortNumber=${env.DB_APP_PORT:5432},DatabaseName=${env.DB_APP_NAME:app}
 
-xa-data-source add \
-  --name=JBPMDS \
-  --enabled=true \
-  --driver-name=postgresql \
-  --jndi-name=java:jboss/datasources/jbpmDS \
-  --user-name=${env.DB_JBPM_USERNAME:jbpm} \
-  --password=${env.DB_JBPM_PASSWORD:jbpmpassword} \
-  --use-ccm=true \
-  --valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
-  --validate-on-match=false \
-  --background-validation=true \
-  --background-validation-millis=5000 \
-  --exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
-  --statistics-enabled=true \
-  --max-pool-size=50 \
-  --query-timeout=300 \
-  --xa-datasource-properties=ServerName=${env.DB_JBPM_HOST:db},PortNumber=${env.DB_JBPM_PORT:5432},DatabaseName=${env.DB_JBPM_NAME:jbpm}
-
-xa-data-source add \
-   --name=SECURITYDS \
-   --enabled=true \
-   --driver-name=postgresql \
-   --jndi-name=java:/webbpm/security-ds \
-   --user-name=${env.DB_SEC_USERNAME:security_user} \
-   --password=${env.DB_SEC_PASSWORD:secpassword} \
-   --max-pool-size=70 \
-   --valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
-   --validate-on-match=false \
-   --background-validation=true \
-   --background-validation-millis=5000 \
-   --exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
-   --statistics-enabled=true \
-   --query-timeout=300 \
-   --xa-datasource-properties=ServerName=${env.DB_SEC_HOST:db},PortNumber=${env.DB_SEC_PORT:5432},DatabaseName=${env.DB_SEC_NAME:app}
-
 /system-property=ldap.mapping.login.param:add(value=${env.WEBBPM_LDAP_LOGIN_ATTR:uid})
 /system-property=ldap.mapping.org.code.param:add(value=${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou})
 /system-property=jboss.as.management.blocking.timeout:add(value=900)
@@ -62,6 +27,7 @@ xa-data-source add \
 /system-property=gar.enable:add(value=false)
 /system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$")
 /system-property=fias.enable:add(value=false)
+/system-property=bpmn.enable:add(value=false)
 /system-property=kafka.ervu.send.url:add(value="http://10.10.31.11:32609")
 /system-property=kafka.ervu.security.protocol:add(value="SASL_PLAINTEXT")
 /system-property=kafka.ervu.doc.login.module:add(value="org.apache.kafka.common.security.scram.ScramLoginModule")