Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
45099b8e8b | |||
9ed1f8454a | |||
eaedecb5a7 | |||
1c9b4e98a2 | |||
88f8d8d3f8 | |||
3b26e76b06 | |||
4514c3cc33 | |||
481321020d | |||
84d8e949bc | |||
24f8257920 | |||
f2468fa6a2 | |||
974d46775f |
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -30,6 +30,23 @@
|
||||
</resource>
|
||||
</resources>
|
||||
<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>
|
||||
<groupId>com.inteligr8</groupId>
|
||||
<artifactId>regex-maven-plugin</artifactId>
|
||||
@@ -41,12 +58,12 @@
|
||||
<goals><goal>replace-text</goal></goals>
|
||||
<configuration>
|
||||
<text>${project.version}</text>
|
||||
<newProperty>project.moduleVersion</newProperty>
|
||||
<newProperty>module.version</newProperty>
|
||||
<regexes>
|
||||
<!-- turn -SNAPSHOT into A0 -->
|
||||
<!-- turn -SNAPSHOT into ATIMESTAMP -->
|
||||
<regex>
|
||||
<pattern>^(.*)-SNAPSHOT$</pattern>
|
||||
<replacement>$1-A0</replacement>
|
||||
<replacement>$1-A${module.timestamp}</replacement>
|
||||
</regex>
|
||||
<!-- all others are just a copy -->
|
||||
<regex>
|
||||
@@ -246,7 +263,7 @@
|
||||
<plugin>
|
||||
<groupId>com.inteligr8.alfresco</groupId>
|
||||
<artifactId>amp-maven-plugin</artifactId>
|
||||
<version>1.1.2</version>
|
||||
<version>1.1.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>build-amp-file</id>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -149,7 +149,7 @@
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
<alias>acs-platform-ha</alias>
|
||||
<run>
|
||||
<skip>false</skip>
|
||||
<skip>${beedk.deploy.acs-ha.skip}</skip>
|
||||
<env>
|
||||
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
|
||||
<ENABLE_JDWP>false</ENABLE_JDWP>
|
||||
@@ -228,18 +228,10 @@
|
||||
<image>
|
||||
<name>postgres:${acs-postgres.version}</name>
|
||||
<alias>acs-db</alias>
|
||||
<links>
|
||||
<link>acs-platform</link>
|
||||
<link>acs-platform-ha</link>
|
||||
</links>
|
||||
</image>
|
||||
<image>
|
||||
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
||||
<alias>acs-mq</alias>
|
||||
<links>
|
||||
<link>acs-platform</link>
|
||||
<link>acs-platform-ha</link>
|
||||
</links>
|
||||
</image>
|
||||
<image>
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.5</version>
|
||||
<version>1.1.9</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
Reference in New Issue
Block a user