15 Commits

56 changed files with 78 additions and 69 deletions

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -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>
@@ -303,7 +320,7 @@
<executions>
<execution>
<id>attach-amp</id>
<phase>verify</phase>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
@@ -319,7 +336,7 @@
</execution>
<execution>
<id>attach-amp-classifier</id>
<phase>verify</phase>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -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>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.10</version>
<packaging>pom</packaging>
<name>Order of the Bee Development Kit</name>