Merge branch 'develop' into stable

beedk-acs-allinone-archetype/pom.xml

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

beedk-acs-lts-it-tile/pom.xml

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

beedk-acs-lts-rad-tile/pom.xml

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

beedk-acs-module-tile/pom.xml

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

beedk-acs-module-tile/tile.xml

@@ -30,6 +30,51 @@
 			</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>
+				<version>1.0.5</version>
+				<executions>
+					<execution>
+						<id>acs-module-version</id>
+						<phase>initialize</phase>
+						<goals><goal>replace-text</goal></goals>
+						<configuration>
+							<text>${project.version}</text>
+							<newProperty>module.version</newProperty>
+							<regexes>
+								<!-- turn -SNAPSHOT into ATIMESTAMP -->
+								<regex>
+									<pattern>^(.*)-SNAPSHOT$</pattern>
+									<replacement>$1-A${module.timestamp}</replacement>
+								</regex>
+								<!-- all others are just a copy -->
+								<regex>
+									<pattern>^(.*)$</pattern>
+									<replacement>$1</replacement>
+								</regex>
+							</regexes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
@@ -218,7 +263,7 @@
 			<plugin>
 				<groupId>com.inteligr8.alfresco</groupId>
 				<artifactId>amp-maven-plugin</artifactId>
-				<version>1.1.1</version>
+				<version>1.1.4</version>
 				<executions>
 					<execution>
 						<id>build-amp-file</id>
@@ -275,7 +320,7 @@
 				<executions>
 					<execution>
 						<id>attach-amp</id>
-						<phase>verify</phase>
+						<phase>post-integration-test</phase>
 						<goals>
 							<goal>attach-artifact</goal>
 						</goals>
@@ -291,7 +336,7 @@
 					</execution>
 					<execution>
 						<id>attach-amp-classifier</id>
-						<phase>verify</phase>
+						<phase>post-integration-test</phase>
 						<goals>
 							<goal>attach-artifact</goal>
 						</goals>

beedk-acs-platform-artifact-it-tile/pom.xml

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

beedk-acs-platform-artifact-rad-tile/pom.xml

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

beedk-acs-platform-it-tile/README.md

@@ -48,6 +48,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
 | Maven Property             | Required | Default         | Description |
 | -------------------------- |:--------:| --------------- | ----------- |
 | `acs-platform.port`        |          | 8080            | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
+| `acs-platform-ha.port`     |          | 8081            | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
 | `acs-postgres.port`        |          | 5432            | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
 | `acs-activemq.port`        |          | 8161            | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
 | `acs-platform.tomcat.opts` |          |                 | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
@@ -67,6 +68,7 @@ The following properties are only intended to be defined by BeeDK components.
 | `beedk.deploy.platform.testClassesDirectory` |  |                    | An additional test classpath directory to sideload into the web application. |
 | `beedk.deploy.platform.extDirectory` |          |                    | An additional directory of JARs to sideload into the web application. |
 | `beedk.deploy.platform.dataDirectory` |  | `${project.build.directory}/alf_data`  | The temporary binary storage location for ACS. |
+| `beedk.deploy.acs-ha.enabled`        |          | false              | Start an additional instance of the ACS platform for cluster-related testing. |
 | `beedk.deploy.acs-search.enabled`    |          | false              | **Do not** set explicitly; just include the [`beedk-acs-search-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-it-tile) tile **AFTER** this tile. |
 | `beedk.deploy.alts.enabled`          |          | false              | **Do not** set explicitly; just include the [`beedk-acs-lts-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-it-tile) tile **AFTER** this tile. |
 | `beedk.deploy.ats.enabled`           |          | false              | **Do not** set explicitly; just include the [`beedk-ats-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-it-tile) tile **AFTER** this tile. |

beedk-acs-platform-it-tile/pom.xml

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

beedk-acs-platform-it-tile/tile.xml

@@ -31,6 +31,7 @@
 						<phase>pre-integration-test</phase>
 						<goals><goal>start</goal></goals>
 						<configuration>
+							<startParallel>true</startParallel>
 							<images>
 								<image>
 									<name>postgres:${acs-postgres.version}</name>
@@ -115,6 +116,10 @@
 										<ports>
 											<port>${acs-platform.port}:8080</port>
 										</ports>
+										<links>
+											<link>acs-db</link>
+											<link>acs-mq</link>
+										</links>
 										<network>
 											<mode>custom</mode>
 											<name>${project.artifactId}</name>
@@ -123,7 +128,8 @@
 											<bind>
 												<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
 												<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
-												<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
+												<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
+												<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
 												<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
 												<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
 												<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
@@ -139,6 +145,77 @@
 										</wait>
 									</run>
 								</image>
+								<image>
+									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
+									<alias>acs-platform-ha</alias>
+									<run>
+										<skip>${beedk.deploy.acs-ha.skip}</skip>
+										<env>
+											<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
+											<ENABLE_JDWP>false</ENABLE_JDWP>
+											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
+											<CATALINA_OPTS>--add-opens=java.base/java.net=ALL-UNNAMED \
+												-Dencryption.keystore.location=/tmp/metadata.keystore \
+												-Dmetadata-keystore.password=alfresco \
+												-Dmetadata-keystore.aliases=metadata \
+												-Dmetadata-keystore.metadata.password=alfresco \
+												-Dmetadata-keystore.metadata.algorithm=AES \
+												-Ddir.root=/tmp/alf_data \
+												-Ddb.driver=org.postgresql.Driver \
+												-Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
+												-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
+												-Dmessaging.broker.username=alfresco \
+												-Dmessaging.broker.password=alfresco \
+												-Dtransform.service.enabled=${beedk.deploy.ats.enabled} \
+												-Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \
+												-Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
+												-Dlocal.transform.service.enabled=${beedk.deploy.alts.enabled} \
+												-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \
+												-DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
+												-Djodconverter.enabled=false \
+												-Dsystem.workflow.engine.activiti.enabled=false \
+												-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \
+												-Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \
+												-Dimg.url=http://${project.artifactId}-ate-aio:8090 \
+												-Dtika.url=http://${project.artifactId}-ate-aio:8090 \
+												-Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
+												-Dindex.subsystem.name=${beedk.deploy.platform.index} \
+												-Dsolr.host=${project.artifactId}-acs-search \
+												-Dsolr.secureComms=secret \
+												-Dsolr.sharedSecret=alfresco-secret \
+												${acs-platform-ha.tomcat.opts}</CATALINA_OPTS>
+										</env>
+										<ports>
+											<port>${acs-platform-ha.port}:8080</port>
+										</ports>
+										<links>
+											<link>acs-db</link>
+											<link>acs-mq</link>
+										</links>
+										<network>
+											<mode>custom</mode>
+											<name>${project.artifactId}</name>
+										</network>
+										<volumes>
+											<bind>
+												<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
+												<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
+												<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
+												<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
+												<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
+												<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
+											</bind>
+										</volumes>
+										<wait>
+											<http>
+												<url>http://localhost:${acs-platform-ha.port}/alfresco/service/api/server</url>
+												<method>GET</method>
+												<status>200..399</status>
+											</http>
+											<time>${acs-platform.timeout}</time>
+										</wait>
+									</run>
+								</image>
 							</images>
 						</configuration>
 					</execution>
@@ -160,6 +237,10 @@
 									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
 									<alias>acs-platform</alias>
 								</image>
+								<image>
+									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
+									<alias>acs-platform-ha</alias>
+								</image>
 							</images>
 						</configuration>
 					</execution>
@@ -169,6 +250,28 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>acs-ha-disabled</id>
+			<activation>
+				<property>
+					<name>!beedk.deploy.acs-ha.enabled</name>
+				</property>
+			</activation>
+			<properties>
+				<beedk.deploy.acs-ha.skip>true</beedk.deploy.acs-ha.skip>
+			</properties>
+		</profile>
+		<profile>
+			<id>acs-ha-enabled</id>
+			<activation>
+				<property>
+					<name>beedk.deploy.acs-ha.enabled</name>
+				</property>
+			</activation>
+			<properties>
+				<beedk.deploy.acs-ha.skip>${skipTests}</beedk.deploy.acs-ha.skip>
+			</properties>
+		</profile>
 		<profile>
 			<id>acs-search-disabled</id>
 			<activation>
@@ -236,6 +339,7 @@
 			</activation>
 			<properties>
 				<!-- configurable -->
+				<beedk.deploy.platform.classesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.classesDirectory>
 				<beedk.deploy.platform.testClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.testClassesDirectory>
 				<beedk.deploy.platform.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.extDirectory>
 				<beedk.deploy.platform.dataDirectory>${project.build.directory}/alf_data</beedk.deploy.platform.dataDirectory>
@@ -248,6 +352,7 @@
 				<acs-postgres.port>5432</acs-postgres.port>
 				<acs-activemq.port>8161</acs-activemq.port>
 				<acs-platform.port>8080</acs-platform.port>
+				<acs-platform-ha.port>8081</acs-platform-ha.port>
 				
 				<!-- versions -->
 				<acs-postgres.version>12</acs-postgres.version>

beedk-acs-platform-module-archetype/pom.xml

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

beedk-acs-platform-module-tile/pom.xml

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

beedk-acs-platform-rad-tile/pom.xml

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

beedk-acs-platform-rad-tile/tile.xml

@@ -156,6 +156,7 @@
 														-Dsolr.host=${project.artifactId}-acs-search \
 														-Dsolr.secureComms=secret \
 														-Dsolr.sharedSecret=alfresco-secret \
+														-Dcsrf.filter.enabled=false \
 														${acs-platform.tomcat.opts}</CATALINA_OPTS>
 												</env>
 												<ports>

beedk-acs-platform-self-it-tile/pom.xml

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

beedk-acs-platform-self-it-tile/tile.xml

@@ -103,6 +103,7 @@
 				
 				<!-- configuring beedk-acs-platform-it-tile -->
 				<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
+				<beedk.deploy.platform.classesDirectory>${project.build.outputDirectory}</beedk.deploy.platform.classesDirectory>
 				<beedk.deploy.platform.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.platform.testClassesDirectory>
 				<beedk.deploy.platform.extDirectory>${project.build.extDirectory}</beedk.deploy.platform.extDirectory>
 

beedk-acs-platform-self-rad-tile/pom.xml

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

beedk-acs-platform-sibling-it-tile/pom.xml

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

beedk-acs-platform-sibling-rad-tile/pom.xml

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

beedk-acs-platform-webapp-docker-tile/pom.xml

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

beedk-acs-platform-webapp-tile/pom.xml

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

beedk-acs-search-it-tile/pom.xml

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

beedk-acs-search-rad-tile/pom.xml

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

beedk-acs-search-test-tile/pom.xml

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

beedk-acs-share-artifact-rad-tile/pom.xml

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

beedk-acs-share-module-archetype/pom.xml

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

beedk-acs-share-module-tile/pom.xml

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

beedk-acs-share-rad-tile/pom.xml

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

beedk-acs-share-self-it-tile/pom.xml

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

beedk-acs-share-self-rad-tile/pom.xml

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

beedk-acs-share-webapp-docker-tile/pom.xml

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

beedk-acs-share-webapp-tile/pom.xml

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

beedk-acs-webapp-artifact-build-tile/pom.xml

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

beedk-acs-webapp-artifact-it-tile/pom.xml

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

beedk-acs-webapp-artifact-rad-tile/pom.xml

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

beedk-acs-webapp-artifact-tile/pom.xml

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

beedk-acs-webapp-docker-tile/pom.xml

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

beedk-activiti-ext-archetype/pom.xml

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

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/pom.xml

@@ -60,7 +60,7 @@
 				</property>
 			</activation>
 			<properties>
-				<aps.version>2.4.1</aps.version>
+				<aps.version>2.4.6</aps.version>
 				<!-- add properties here -->
 				<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
 			</properties>

beedk-amp-check-tile/pom.xml

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

beedk-aps-ext-archetype/pom.xml

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

beedk-aps-ext-archetype/src/main/resources/archetype-resources/pom.xml

@@ -16,7 +16,7 @@
     	<maven.compiler.target>11</maven.compiler.target>
     	<maven.compiler.release>11</maven.compiler.release>
 
-		<aps.version>2.4.1</aps.version>
+		<aps.version>2.4.6</aps.version>
     </properties>
 
     <dependencies>

beedk-aps-ext-it-tile/.gitignore

@@ -0,0 +1,9 @@
+# Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+pom.xml.versionsBackup
+target
+

beedk-aps-ext-it-tile/README.md

@@ -0,0 +1,84 @@
+# BeeDK APS Extension Maven Tile for Integration Tests
+
+This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk).  It is considered to be part of the **Public API** of the BeeDK.
+
+## Purpose
+
+This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for integration testing any APS extension.
+
+## Usage
+
+To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet.  Do not forget the `extensions` element in the *plugin* configuration.
+
+```xml
+<project ...>
+	...
+	<build>
+		...
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>[2.0,3.0)</version>
+				<extensions>true</extensions>
+				<configuration>
+					<tiles>
+						...
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-it-tile -->
+						<tile>com.inteligr8.ootbee:beedk-aps-ext-it-tile:[1.1.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+			...
+		</plugins>
+		...
+	</build>
+	...
+</project>
+```
+
+## Configuration
+
+In your Maven project, set the following properties to define the behavior of this Maven Tile.  Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile.
+
+### Public API
+
+The following properties are intended to be exposed by inheriting Public API Maven Tiles.
+
+| Maven Property             | Required | Default         | Description |
+| -------------------------- |:--------:| --------------- | ----------- |
+| `aps.war.groupId`          |          | `org.alfresco`  | |
+| `aps.war.artifactId`       |          | `activiti-app`  | |
+| `aps.war.version`          | **Yes**  |                 | |
+| `aps.port`                 |          | 8080            | The port to expose on `localhost` for the developer; not for other applications or users. |
+| `aps-postgres.port`        |          | 5432            | The port to expose on `localhost` for the developer; not for other applications or users. |
+| `aps.debugger.port`        |          | 8000            | The port to expose on `localhost` for the developer; not for other applications or users. |
+| `aps.tomcat.opts`          |          |                 | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
+| `aps.timeout`              |          | 120000          | 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. |
+| `aps.license.directory`    |  | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
+| `tomcat-rad.version`       |          | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
+| `aps-postgres.version`     |          | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
+
+### Private API
+
+The following properties are only intended to be defined by BeeDK components.
+
+| Maven Property                       | Required | Default            | Description |
+| ------------------------------------ |:--------:| ------------------ | ----------- |
+| `beedk.deploy.aps.warFile`           | **Yes**  |                    | The WAR file to deploy in the Apache Tomcat instance. |
+| `beedk.deploy.aps.classesDirectory`  |          |                    | An additional classpath directory to sideload into the web application. |
+| `beedk.deploy.aps.testClassesDirectory` |       |                    | An additional test classpath directory to sideload into the web application. |
+| `beedk.deploy.aps.extDirectory`      |          |                    | An additional directory of JARs to sideload into the web application. |
+| `beedk.deploy.aps.warDirectory`      |  | `${project.build.warDirectory}` | A build directory for WAR files. |
+| `beedk.deploy.aps.dataDirectory`     |  | `${project.build.directory}/alf_data`  | The temporary binary storage location for ACS. |
+
+### Other APIs
+
+Additional less important configurations are inherited from the following Maven Tiles.
+
+*   [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile)
+
+## Results
+
+The APS app and database will be started and stopped during the `pre-integration-test` and `post-integration-test` Maven phases, respectively.

beedk-aps-ext-it-tile/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>beedk-aps-ext-it-tile</artifactId>
+	<packaging>tile</packaging>
+
+	<parent>
+		<groupId>com.inteligr8.ootbee</groupId>
+		<artifactId>beedk-parent</artifactId>
+		<version>1.1.13</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<name>Order of the Bee Development Kit: Integration Testing for APS Extensions</name>
+	<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+
+	<licenses>
+		<license>
+			<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
+		</license>
+	</licenses>
+
+	<scm>
+		<connection>scm:git:https://bitbucket.org/inteligr8/ootbee-beedk.git</connection>
+		<developerConnection>scm:git:git@bitbucket.org:inteligr8/ootbee-beedk.git</developerConnection>
+		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+	</scm>
+	<organization>
+		<name>Order of the Bee</name>
+		<url>https://orderofthebee.net</url>
+	</organization>
+	<developers>
+		<developer>
+			<id>brian.long</id>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<organization>Inteligr8</organization>
+			<organizationUrl>https://www.inteligr8.com</organizationUrl>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

beedk-aps-ext-it-tile/tile.xml

@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+-->
+<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
+ 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
+
+	<build>
+		<testResources>
+			<!-- need to split certain test resources to load before webapp -->
+			<testResource>
+				<directory>src/test/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>activiti/**/*</exclude>
+					<exclude>**/README*</exclude>
+				</excludes>
+			</testResource>
+			<testResource>
+				<directory>src/test/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>activiti/**/*</include>
+				</includes>
+				<targetPath>${project.build.directory}/rt-test-resources</targetPath>
+			</testResource>
+		</testResources>
+		<plugins>
+			<!-- This plugin downloads the parameterized WAR -->
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.6.1</version>
+				<executions>
+					<!-- This execution downloads the dependency JARs, including JAR modules -->
+					<execution>
+						<id>download-jars</id>
+						<phase>pre-integration-test</phase>
+						<goals><goal>copy-dependencies</goal></goals>
+						<configuration>
+							<excludeScope>provided</excludeScope>
+							<includeTypes>jar</includeTypes>
+							<outputDirectory>${beedk.deploy.aps.extDirectory}</outputDirectory>
+						</configuration>
+					</execution>
+					<!-- This execution downloads the parameterized WAR -->
+					<execution>
+						<id>download-webapp</id>
+						<phase>pre-integration-test</phase>
+						<goals><goal>copy</goal></goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${aps.war.groupId}</groupId>
+									<artifactId>${aps.war.artifactId}</artifactId>
+									<version>${aps.war.version}</version>
+									<type>war</type>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${beedk.deploy.aps.warDirectory}</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- Using Docker to host the web application -->
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-aps-app</id>
+						<phase>pre-integration-test</phase>
+						<goals><goal>start</goal></goals>
+						<configuration>
+							<startParallel>true</startParallel>
+							<images>
+								<image>
+									<name>postgres:${aps-postgres.version}</name>
+									<alias>aps-db</alias>
+									<run>
+										<skip>${skipTests}</skip>
+										<env>
+											<POSTGRES_PASSWORD>alfresco</POSTGRES_PASSWORD>
+											<POSTGRES_USER>alfresco</POSTGRES_USER>
+											<POSTGRES_DB>activiti</POSTGRES_DB>
+										</env>
+										<ports>
+											<port>${aps-postgres.port}:5432</port>
+										</ports>
+										<network>
+											<mode>custom</mode>
+											<name>${project.artifactId}</name>
+										</network>
+									</run>
+								</image>
+								<image>
+									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
+									<alias>aps-app</alias>
+									<run>
+										<skip>${skipTests}</skip>
+										<env>
+											<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
+											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
+											<ENABLE_JDWP>false</ENABLE_JDWP>
+											<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>
+											<port>${aps.port}:8080</port>
+											<port>${aps.debugger.port}:8000</port>
+										</ports>
+										<dependsOn>
+											<container>aps-db</container>
+										</dependsOn>
+										<network>
+											<mode>custom</mode>
+											<name>${project.artifactId}</name>
+										</network>
+										<volumes>
+											<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>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
+												<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
+												<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1: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>
+										<wait>
+											<http>
+												<url>http://admin%40app.activiti.com:admin@localhost:${aps.port}/activiti-app/api/management/engine</url>
+												<method>GET</method>
+												<status>200</status>
+											</http>
+											<time>${aps.timeout}</time>
+										</wait>
+									</run>
+								</image>
+							</images>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-aps-app</id>
+						<phase>post-integration-test</phase>
+						<goals><goal>stop</goal></goals>
+						<configuration>
+							<images>
+								<image>
+									<name>postgres:${acs-postgres.version}</name>
+									<alias>acs-db</alias>
+								</image>
+								<image>
+									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
+									<alias>acs-platform</alias>
+								</image>
+							</images>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<!-- allow downstream tiles to default this before this tile does -->
+		<profile>
+			<id>tomcat-opts-unspecified</id>
+			<activation>
+				<property>
+					<name>!aps.tomcat.opts</name>
+				</property>
+			</activation>
+			<properties>
+				<aps.tomcat.opts></aps.tomcat.opts>
+			</properties>
+		</profile>
+		<profile>
+			<id>default-props</id>
+			<activation>
+				<property>
+					<name>!some-prop-that-never-exists</name>
+				</property>
+			</activation>
+			<properties>
+				<!-- configurable -->
+				<aps.war.groupId>com.activiti</aps.war.groupId>
+				<aps.war.artifactId>activiti-app</aps.war.artifactId>
+				<aps.war.version>${aps.version}</aps.war.version>
+				<project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory>
+				<beedk.deploy.aps.classesDirectory>${project.build.outputDirectory}</beedk.deploy.aps.classesDirectory>
+				<beedk.deploy.aps.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.aps.testClassesDirectory>
+				<beedk.deploy.aps.extDirectory>${project.build.directory}/ext</beedk.deploy.aps.extDirectory>
+				<beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory>
+				<aps.timeout>60000</aps.timeout>
+				<aps.memory>512m</aps.memory>
+				<aps.debugger.enabled>true</aps.debugger.enabled>
+				<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
+				<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
+
+				<!-- ports -->
+				<aps-postgres.port>5433</aps-postgres.port>
+				<aps.port>8080</aps.port>
+				<aps.debugger.port>8000</aps.debugger.port>
+				
+				<!-- versions -->
+				<aps-postgres.version>12</aps-postgres.version>
+				<aps.version>2.4.6</aps.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>
+			</properties>
+		</profile>
+	</profiles>
+	
+	<tiles>
+		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-run-tile -->
+		<tile>@project.groupId@:beedk-run-tile:@project.version@</tile>
+	</tiles>
+
+</project>

beedk-aps-ext-rad-tile/README.md

@@ -85,4 +85,4 @@ Additional less important configurations are inherited from the following Maven
 
 ## Results
 
-The ACS Platform, database, and MQ components will be started during the `process-classes` Maven phase.
+The APS app and database will be started during the `process-classes` Maven phase.

beedk-aps-ext-rad-tile/pom.xml

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

beedk-aps-ext-rad-tile/tile.xml

@@ -27,6 +27,25 @@
 				</property>
 			</activation>
 			<build>
+				<testResources>
+					<!-- need to split certain test resources to load before webapp -->
+					<testResource>
+						<directory>src/test/resources</directory>
+						<filtering>true</filtering>
+						<excludes>
+							<exclude>activiti/**/*</exclude>
+							<exclude>**/README*</exclude>
+						</excludes>
+					</testResource>
+					<testResource>
+						<directory>src/test/resources</directory>
+						<filtering>true</filtering>
+						<includes>
+							<include>activiti/**/*</include>
+						</includes>
+						<targetPath>${project.build.directory}/rt-test-resources</targetPath>
+					</testResource>
+				</testResources>
 				<plugins>
 					<!-- This plugin downloads the parameterized WAR -->
 					<plugin>
@@ -94,13 +113,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 +144,10 @@
 													<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>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
+														<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
+														<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1: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>
@@ -184,8 +212,8 @@
 				
 				<!-- versions -->
 				<aps-postgres.version>12</aps-postgres.version>
-				<aps.version>2.4.4</aps.version>
-				<tomcat-rad.version>9-2.1</tomcat-rad.version>
+				<aps.version>2.4.6</aps.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>

beedk-aps-rad-tile/README.md

@@ -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. |
 | `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.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. |
 
 ### Other APIs

beedk-aps-rad-tile/pom.xml

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

beedk-aps-rad-tile/tile.xml

@@ -58,7 +58,7 @@
 											</run>
 										</image>
 										<image>
-											<name>alfresco/process-services:${aps.version}</name>
+											<name>${aps.docker-tag}:${aps.version}</name>
 											<alias>aps-app</alias>
 											<run>
 												<env>
@@ -111,7 +111,8 @@
 				
 				<!-- versions -->
 				<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>
 		</profile>
 	</profiles>

beedk-ate-archetype/pom.xml

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

beedk-ate-docker-tile/pom.xml

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

beedk-ate-it-tile/pom.xml

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

beedk-ate-self-rad-tile/pom.xml

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

beedk-ate-sibling-rad-tile/pom.xml

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

beedk-ate-springboot-test/pom.xml

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

beedk-ate-springboot-tile/pom.xml

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

beedk-ate-springboot/pom.xml

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

beedk-ate-test-tile/pom.xml

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

beedk-ats-it-tile/pom.xml

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

beedk-ats-rad-tile/pom.xml

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

beedk-ats-test-tile/pom.xml

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

beedk-run-tile/pom.xml

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

beedk-run-tile/tile.xml

@@ -43,7 +43,7 @@
 			</activation>
 			<properties>
 				<!-- versions -->
-				<beedk.plugins.fabric8.docker.version>0.34.1</beedk.plugins.fabric8.docker.version>
+				<beedk.plugins.fabric8.docker.version>0.45.0</beedk.plugins.fabric8.docker.version>
 			</properties>
 		</profile>
 	</profiles>

beedk-springboot-api-archetype/pom.xml

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

beedk-springboot-docker-base-tile/pom.xml

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

beedk-springboot-docker-tile/pom.xml

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

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-parent</artifactId>
-	<version>1.1.3</version>
+	<version>1.1.13</version>
 	<packaging>pom</packaging>
 
 	<name>Order of the Bee Development Kit</name>
@@ -101,6 +101,7 @@
 		<module>beedk-acs-platform-artifact-it-tile</module>
 		<module>beedk-acs-share-self-it-tile</module>
 		<module>beedk-ate-it-tile</module>
+		<module>beedk-aps-ext-it-tile</module>
 		
 		<module>beedk-acs-module-tile</module>
 		<module>beedk-acs-platform-module-tile</module>