Added support for APS 2.3.8.7 and 2.4.2.10 (#87)

README.md

@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 2.5.0
+# Alfresco Process Services SDK Project 2.5.1
 
 The project consists of the following Maven submodules:
 
@@ -206,6 +206,7 @@ In order to build the project, you can declare a Maven profile related to a spec
 
  * `aps2.4.4` (APS 2.4.4 - default)
  * `aps2.4.3` (APS 2.4.3)
+ * `aps2.4.2.10` (APS 2.4.2.10)
  * `aps2.4.2.9` (APS 2.4.2.9)
  * `aps2.4.2.8` (APS 2.4.2.8)
  * `aps2.4.2.7` (APS 2.4.2.7)
@@ -221,6 +222,7 @@ In order to build the project, you can declare a Maven profile related to a spec
  * `aps2.4.1` (APS 2.4.1)
  * `aps2.4.0` (APS 2.4.0)
  * `aps2.3.9` (APS 2.3.9)
+ * `aps2.3.8.7` (APS 2.3.8.7)
  * `aps2.3.8.6` (APS 2.3.8.6)
  * `aps2.3.8.5` (APS 2.3.8.5)
  * `aps2.3.8.4` (APS 2.3.8.4)

activiti-app-integration-tests/pom.xml

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

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

@@ -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.3.8.7-arm64

@@ -0,0 +1,42 @@
+FROM tomcat:9-jdk11-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.10

@@ -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.10-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.3.8.7

@@ -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.3.8.7-arm64

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

@@ -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.10-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-war/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</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.0</version>
+		<version>2.5.1</version>
 	</parent>
 
 	<dependencyManagement>
@@ -384,34 +384,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>surefire-openjdk-11</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<jdk>11</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skip>${skip.integration.test}</skip>
-					<argLine>
-						--illegal-access=permit
-					</argLine>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 </project>

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

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

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

@@ -0,0 +1,5 @@
+type=bpmSuite
+version.major=2
+version.minor=4
+version.revision=2.10
+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=4
-version.revision=4
+version.minor=3
+version.revision=8.7
 version.edition=Alfresco Process Services (powered by Activiti)