v1.1.12 poms

beedk-acs-allinone-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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,9 +128,11 @@
 											<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>
 											</bind>
 										</volumes>
 										<wait>
@@ -138,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>
@@ -159,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>
@@ -168,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>
@@ -235,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>
@@ -247,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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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-rad-tile/pom.xml

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

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

@@ -94,13 +94,20 @@
 										</image>
 										<image>
 											<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
-											<alias>aps</alias>
+											<alias>aps-app</alias>
 											<run>
 												<env>
 													<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
 													<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
 													<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
-													<CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
+													<CATALINA_OPTS>--add-opens java.base/java.net=ALL-UNNAMED \
+														-Djava.awt.headless=true \
+														-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
+														-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \
+														-Dbeans.whitelisting.enabled=false \
+														-Del.whitelisting.enabled=false \
+														-Dshell.whitelisting.enabled=false \
+														-Dservice.task.class.whitelisting.enabled=false \
 														${aps.tomcat.opts}</CATALINA_OPTS>
 												</env>
 												<ports>
@@ -118,8 +125,8 @@
 													<bind>
 														<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
 														<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
-														<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
-														<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
+														<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
+														<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>
 														<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
 													</bind>
 												</volumes>
@@ -184,8 +191,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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</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.2</version>
+		<version>1.1.12</version>
 		<relativePath>..</relativePath>
 	</parent>
 

pom.xml

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