Merge branch 'develop' into stable

This commit is contained in:
Brian Long 2025-01-31 17:12:08 -05:00
commit 8a0e38f078

View File

@ -94,13 +94,14 @@
</image> </image>
<image> <image>
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name> <name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
<alias>aps</alias> <alias>aps-app</alias>
<run> <run>
<env> <env>
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX> <JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP> <ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP> <ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \ <CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
-Djava.awt.headless=true \
${aps.tomcat.opts}</CATALINA_OPTS> ${aps.tomcat.opts}</CATALINA_OPTS>
</env> </env>
<ports> <ports>
@ -185,7 +186,7 @@
<!-- versions --> <!-- versions -->
<aps-postgres.version>12</aps-postgres.version> <aps-postgres.version>12</aps-postgres.version>
<aps.version>2.4.6</aps.version> <aps.version>2.4.6</aps.version>
<tomcat-rad.version>9-2.1</tomcat-rad.version> <tomcat-rad.version>9-2.2</tomcat-rad.version>
<!-- results --> <!-- results -->
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile> <project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>