WEBBPMNEXT-9188 fix
This commit is contained in:
kochetkov
parent
1b5d862ba1
commit
6da6ede035
8 changed files with 31 additions and 31 deletions
|
|
@ -3,11 +3,11 @@
|
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<dependencies>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
|
|
|||
|
|
@ -41,4 +41,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/dashboard/version || exit 1
|
||||
|
|
|
|||
|
|
@ -2,27 +2,27 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>distribution</artifactId>
|
||||
<packaging>ear</packaging>
|
||||
|
||||
<properties>
|
||||
<backendContext>/ervu-dashboard</backendContext>
|
||||
<backendContext>/dashboard</backendContext>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
|
|
@ -37,16 +37,16 @@
|
|||
<configuration>
|
||||
<modules>
|
||||
<webModule>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<contextRoot>/</contextRoot>
|
||||
<bundleFileName>frontend.war</bundleFileName>
|
||||
</webModule>
|
||||
<webModule>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<contextRoot>${backendContext}</contextRoot>
|
||||
<bundleFileName>ervu-dashboard.war</bundleFileName>
|
||||
<bundleFileName>dashboard.war</bundleFileName>
|
||||
</webModule>
|
||||
</modules>
|
||||
</configuration>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<profile>
|
||||
<id>enable-version-in-url</id>
|
||||
<properties>
|
||||
<backendContext>/ervu-dashboard-${project.version}</backendContext>
|
||||
<backendContext>/dashboard-${project.version}</backendContext>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"filter_cleanup_check_period_minutes": 30,
|
||||
"auth_method": "form",
|
||||
"enable.version.in.url": "%enable.version.in.url%",
|
||||
"backend.context": "ervu-dashboard",
|
||||
"backend.context": "dashboard",
|
||||
"guard.confirm_exit": false,
|
||||
"message_service_error_timeout": "",
|
||||
"message_service_warning_timeout": "",
|
||||
|
|
|
|||
12
pom.xml
12
pom.xml
|
|
@ -2,8 +2,8 @@
|
|||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<modules>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
|
|
@ -99,19 +99,19 @@
|
|||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<classifier>classes</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>test</artifactId>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue