Added support for APS 2.4.2.11 and 2.4.2.12 (#88)

activiti-app-integration-tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.5.1</version>
+		<version>2.5.2</version>
 	</parent>
 
 	<properties>

activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java

@@ -55,7 +55,7 @@ public class FourEyesAppIT {
 	protected static final String BASE_PATH_HOSTNAME = "localhost";
 	protected static final int BASE_PATH_PORT = 8080;
 
-	protected static final String appZipFile = "aps-extensions-jar-2.5.1-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-2.5.2-App.zip";
 
 	protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
 			+ BASE_PATH_PORT;

activiti-app-overlay-docker/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.5.1</version>
+		<version>2.5.2</version>
 	</parent>
 
 	<properties>

activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.11

@@ -0,0 +1,39 @@
+FROM alfresco/process-services:${aps.docker.version}
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ENV LC_ALL=C
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.11-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:9-jdk17-openjdk
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ENV LC_ALL=C
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.12

@@ -0,0 +1,39 @@
+FROM alfresco/process-services:${aps.docker.version}
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ENV LC_ALL=C
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.12-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:9-jdk17-openjdk
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ENV LC_ALL=C
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.11

@@ -0,0 +1,14 @@
+FROM alfresco/process-services-admin:${aps.docker.version}
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+
+USER root
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.11-arm64

@@ -0,0 +1,18 @@
+FROM tomcat:9-jdk17-openjdk-slim
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.12

@@ -0,0 +1,14 @@
+FROM alfresco/process-services-admin:${aps.docker.version}
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+
+USER root
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.12-arm64

@@ -0,0 +1,18 @@
+FROM tomcat:9-jdk17-openjdk-slim
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}

activiti-app-overlay-docker/src/main/docker/docker-compose/docker-compose-activiti-admin.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   aps-admin:
     image: aps-sdk/alfresco-process-services-admin:development

activiti-app-overlay-docker/src/main/docker/docker-compose/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   aps-current-project:
     image: aps-sdk/alfresco-process-services:development

activiti-app-overlay-war/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.5.1</version>
+		<version>2.5.2</version>
 	</parent>
 
 	<dependencies>

aps-extensions-jar/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.5.1</version>
+		<version>2.5.2</version>
 	</parent>
 
 	<dependencyManagement>

aps-extensions-jar/src/test/resources/activiti/2.4.2.11/version.properties

@@ -0,0 +1,5 @@
+type=bpmSuite
+version.major=2
+version.minor=4
+version.revision=2.11
+version.edition=Alfresco Process Services (powered by Activiti)

aps-extensions-jar/src/test/resources/activiti/2.4.2.12/version.properties

@@ -0,0 +1,5 @@
+type=bpmSuite
+version.major=2
+version.minor=4
+version.revision=2.12
+version.edition=Alfresco Process Services (powered by Activiti)

aps-extensions-jar/src/test/resources/activiti/version.properties

@@ -1,5 +1,5 @@
 type=bpmSuite
 version.major=2
-version.minor=3
-version.revision=8.7
+version.minor=4
+version.revision=4
 version.edition=Alfresco Process Services (powered by Activiti)