Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
d56f4f82fb | |||
adc5caf1c2 | |||
cf03dc8808 | |||
f4f8fa8704 | |||
8a0e38f078 | |||
87a0cb879c | |||
6ed4974f3f | |||
3df287166d | |||
1412e66768 | |||
0c50627eae | |||
5b7a8f1463 | |||
8a77c5a01d | |||
45099b8e8b | |||
9ed1f8454a | |||
eaedecb5a7 | |||
1c9b4e98a2 | |||
88f8d8d3f8 | |||
3b26e76b06 | |||
4514c3cc33 | |||
481321020d | |||
84d8e949bc | |||
24f8257920 | |||
f2468fa6a2 | |||
974d46775f |
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -30,6 +30,23 @@
|
|||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<version>3.2.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>module-snapshot-timestamp</id>
|
||||||
|
<phase>initialize</phase>
|
||||||
|
<goals><goal>timestamp-property</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<name>module.timestamp</name>
|
||||||
|
<timeSource>build</timeSource>
|
||||||
|
<pattern>yyyyMMddHHmmss</pattern>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.inteligr8</groupId>
|
<groupId>com.inteligr8</groupId>
|
||||||
<artifactId>regex-maven-plugin</artifactId>
|
<artifactId>regex-maven-plugin</artifactId>
|
||||||
@@ -41,12 +58,12 @@
|
|||||||
<goals><goal>replace-text</goal></goals>
|
<goals><goal>replace-text</goal></goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<text>${project.version}</text>
|
<text>${project.version}</text>
|
||||||
<newProperty>project.moduleVersion</newProperty>
|
<newProperty>module.version</newProperty>
|
||||||
<regexes>
|
<regexes>
|
||||||
<!-- turn -SNAPSHOT into A0 -->
|
<!-- turn -SNAPSHOT into ATIMESTAMP -->
|
||||||
<regex>
|
<regex>
|
||||||
<pattern>^(.*)-SNAPSHOT$</pattern>
|
<pattern>^(.*)-SNAPSHOT$</pattern>
|
||||||
<replacement>$1-A0</replacement>
|
<replacement>$1-A${module.timestamp}</replacement>
|
||||||
</regex>
|
</regex>
|
||||||
<!-- all others are just a copy -->
|
<!-- all others are just a copy -->
|
||||||
<regex>
|
<regex>
|
||||||
@@ -246,7 +263,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.inteligr8.alfresco</groupId>
|
<groupId>com.inteligr8.alfresco</groupId>
|
||||||
<artifactId>amp-maven-plugin</artifactId>
|
<artifactId>amp-maven-plugin</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.1.4</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>build-amp-file</id>
|
<id>build-amp-file</id>
|
||||||
@@ -303,7 +320,7 @@
|
|||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-amp</id>
|
<id>attach-amp</id>
|
||||||
<phase>verify</phase>
|
<phase>post-integration-test</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>attach-artifact</goal>
|
<goal>attach-artifact</goal>
|
||||||
</goals>
|
</goals>
|
||||||
@@ -319,7 +336,7 @@
|
|||||||
</execution>
|
</execution>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-amp-classifier</id>
|
<id>attach-amp-classifier</id>
|
||||||
<phase>verify</phase>
|
<phase>post-integration-test</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>attach-artifact</goal>
|
<goal>attach-artifact</goal>
|
||||||
</goals>
|
</goals>
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -149,7 +149,7 @@
|
|||||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||||
<alias>acs-platform-ha</alias>
|
<alias>acs-platform-ha</alias>
|
||||||
<run>
|
<run>
|
||||||
<skip>false</skip>
|
<skip>${beedk.deploy.acs-ha.skip}</skip>
|
||||||
<env>
|
<env>
|
||||||
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
|
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
|
||||||
<ENABLE_JDWP>false</ENABLE_JDWP>
|
<ENABLE_JDWP>false</ENABLE_JDWP>
|
||||||
@@ -228,18 +228,10 @@
|
|||||||
<image>
|
<image>
|
||||||
<name>postgres:${acs-postgres.version}</name>
|
<name>postgres:${acs-postgres.version}</name>
|
||||||
<alias>acs-db</alias>
|
<alias>acs-db</alias>
|
||||||
<links>
|
|
||||||
<link>acs-platform</link>
|
|
||||||
<link>acs-platform-ha</link>
|
|
||||||
</links>
|
|
||||||
</image>
|
</image>
|
||||||
<image>
|
<image>
|
||||||
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
||||||
<alias>acs-mq</alias>
|
<alias>acs-mq</alias>
|
||||||
<links>
|
|
||||||
<link>acs-platform</link>
|
|
||||||
<link>acs-platform-ha</link>
|
|
||||||
</links>
|
|
||||||
</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>
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<aps.version>2.4.1</aps.version>
|
<aps.version>2.4.6</aps.version>
|
||||||
<!-- add properties here -->
|
<!-- add properties here -->
|
||||||
<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
|
<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
|
||||||
</properties>
|
</properties>
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<maven.compiler.release>11</maven.compiler.release>
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
|
|
||||||
<aps.version>2.4.1</aps.version>
|
<aps.version>2.4.6</aps.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -94,13 +94,20 @@
|
|||||||
</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>--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>
|
${aps.tomcat.opts}</CATALINA_OPTS>
|
||||||
</env>
|
</env>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -118,8 +125,8 @@
|
|||||||
<bind>
|
<bind>
|
||||||
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
|
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
|
||||||
<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war: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.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||||
<volume>${beedk.deploy.aps.testClassesDirectory}:/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>
|
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||||
</bind>
|
</bind>
|
||||||
</volumes>
|
</volumes>
|
||||||
@@ -184,8 +191,8 @@
|
|||||||
|
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<aps-postgres.version>12</aps-postgres.version>
|
<aps-postgres.version>12</aps-postgres.version>
|
||||||
<aps.version>2.4.4</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>
|
||||||
|
@@ -53,7 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
|||||||
| `aps.timeout` | | 60000 | The time to wait for the startup to complete, in milliseconds. |
|
| `aps.timeout` | | 60000 | The time to wait for the startup to complete, in milliseconds. |
|
||||||
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
|
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
|
||||||
| `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
|
| `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
|
||||||
| `aps.version` | | 1.11.1.1 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
|
| `aps.docker-tag` | | `alfresco/process-services` | The Docker image tag for APS. |
|
||||||
|
| `aps.version` | | 2.4.6 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
|
||||||
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
|
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
|
||||||
|
|
||||||
### Other APIs
|
### Other APIs
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -58,7 +58,7 @@
|
|||||||
</run>
|
</run>
|
||||||
</image>
|
</image>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/process-services:${aps.version}</name>
|
<name>${aps.docker-tag}:${aps.version}</name>
|
||||||
<alias>aps-app</alias>
|
<alias>aps-app</alias>
|
||||||
<run>
|
<run>
|
||||||
<env>
|
<env>
|
||||||
@@ -111,7 +111,8 @@
|
|||||||
|
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<aps-postgres.version>9.6</aps-postgres.version>
|
<aps-postgres.version>9.6</aps-postgres.version>
|
||||||
<aps.version>1.11.1.1</aps.version>
|
<aps.docker-tag>alfresco/process-services</aps.docker-tag>
|
||||||
|
<aps.version>2.4.6</aps.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.inteligr8.ootbee</groupId>
|
<groupId>com.inteligr8.ootbee</groupId>
|
||||||
<artifactId>beedk-parent</artifactId>
|
<artifactId>beedk-parent</artifactId>
|
||||||
<version>1.1.5</version>
|
<version>1.1.12</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Order of the Bee Development Kit</name>
|
<name>Order of the Bee Development Kit</name>
|
||||||
|
Reference in New Issue
Block a user