Added support for APS 24.4.x releases (#93)

README.md

@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 3.0.3
+# Alfresco Process Services SDK Project 3.0.5
 
 The project consists of the following Maven submodules:
 
@@ -14,7 +14,7 @@ The project consists of the following Maven submodules:
 
 # Prerequisites
  * OpenJDK 17
- * Apache Maven 3.9.8
+ * Apache Maven 3.9.9
  * Docker (optional)
  * Put valid  _activiti.lic_  and  _transform.lic_  (or  _Aspose.Total.Java.lic_  )  in the `/license` folder for running unit / integration tests and for building containers 
  * Access to the Alfresco Nexus Repositories (credentials provided by Alfresco)
@@ -203,13 +203,17 @@ Put your Java test classes in the following package:
 
 In order to build the project, you can declare a Maven profile related to a specific APS version:
 
- * `aps24.3.0` (APS 24.3.0 - default)
+ * `aps24.3.0` (APS 24.4.2 - default)
+ * `aps24.4.1` (APS 24.4.1)
+ * `aps24.4.0` (APS 24.4.0)
+ * `aps24.3.0` (APS 24.4.0)
+ * `aps24.3.0` (APS 24.3.0)
  * `aps24.2.1` (APS 24.2.1)
  * `aps24.2.0` (APS 24.2.0)
  * `aps24.1.0` (APS 24.1.0)
 
 
-Build and test with unit tests execution for APS 24.3.0 with:
+Build and test with unit tests execution for APS 24.4.2 with:
 `mvn clean test`
 
 Build and test with unit tests execution for APS 24.1.0 with:
@@ -249,4 +253,4 @@ Skip the build of the Activiti Admin container with:
  * Stanley Arnold: Fixed the Maven configuration
 
 # Enterprise support
-Official maintenance and support of this project is delivered by Zia Consulting
+This project is mainly made as a community effort, official maintenance and support is delivered by Zia Consulting.

activiti-app-integration-tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.5</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-3.0.3-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-3.0.5-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>3.0.3</version>
+		<version>3.0.5</version>
 	</parent>
 
 	<properties>

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

@@ -0,0 +1,37 @@
+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} 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-24.4.0-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:10-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} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} license/transform.lic $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-24.4.1

@@ -0,0 +1,37 @@
+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} 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-24.4.1-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:10-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} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} license/transform.lic $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-24.4.2

@@ -0,0 +1,37 @@
+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} 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-24.4.2-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:10-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} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} license/transform.lic $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-24.4.0

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

@@ -0,0 +1,18 @@
+FROM tomcat:10-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-24.4.1

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

@@ -0,0 +1,18 @@
+FROM tomcat:10-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}