Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
d56f4f82fb | |||
adc5caf1c2 | |||
cf03dc8808 | |||
f4f8fa8704 | |||
8a0e38f078 | |||
87a0cb879c |
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -94,13 +94,20 @@
|
||||
</image>
|
||||
<image>
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
<alias>aps</alias>
|
||||
<alias>aps-app</alias>
|
||||
<run>
|
||||
<env>
|
||||
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
|
||||
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
|
||||
<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>--add-opens java.base/java.net=ALL-UNNAMED \
|
||||
-Djava.awt.headless=true \
|
||||
-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
|
||||
-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \
|
||||
-Dbeans.whitelisting.enabled=false \
|
||||
-Del.whitelisting.enabled=false \
|
||||
-Dshell.whitelisting.enabled=false \
|
||||
-Dservice.task.class.whitelisting.enabled=false \
|
||||
${aps.tomcat.opts}</CATALINA_OPTS>
|
||||
</env>
|
||||
<ports>
|
||||
@@ -118,8 +125,8 @@
|
||||
<bind>
|
||||
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
|
||||
<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>
|
||||
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
@@ -185,7 +192,7 @@
|
||||
<!-- versions -->
|
||||
<aps-postgres.version>12</aps-postgres.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 -->
|
||||
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.11</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
Reference in New Issue
Block a user