From f5293e1079f86ae03166fa9b5eb98a7e9b02dc2f Mon Sep 17 00:00:00 2001
From: Piergiorgio Lucidi <plucidi@ziaconsulting.com>
Date: Sat, 24 Feb 2024 14:28:06 +0100
Subject: [PATCH] Added support for APS 2.4.3 (#81) and Maven plugins upgraded
 (#82)

---
 README.md                                     |  7 +--
 activiti-app-integration-tests/pom.xml        |  2 +-
 .../sdk/integrationtests/FourEyesAppIT.java   |  2 +-
 activiti-app-overlay-docker/pom.xml           |  2 +-
 .../src/main/docker/Dockerfile-2.4.3          | 39 ++++++++++++++++
 .../src/main/docker/Dockerfile-2.4.3-arm64    | 42 +++++++++++++++++
 .../main/docker/admin/Dockerfile-admin-2.4.3  | 14 ++++++
 .../docker/admin/Dockerfile-admin-2.4.3-arm64 | 18 ++++++++
 .../docker/properties/activiti-app.properties |  4 ++
 activiti-app-overlay-war/pom.xml              |  2 +-
 aps-extensions-jar/pom.xml                    |  2 +-
 .../activiti/2.4.3/version.properties         |  5 ++
 .../resources/activiti/version.properties     |  2 +-
 pom.xml                                       | 46 +++++++++++++++++--
 run.sh                                        |  2 +-
 15 files changed, 174 insertions(+), 15 deletions(-)
 create mode 100644 activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3
 create mode 100644 activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3-arm64
 create mode 100644 activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3
 create mode 100644 activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3-arm64
 create mode 100644 aps-extensions-jar/src/test/resources/activiti/2.4.3/version.properties

diff --git a/README.md b/README.md
index f3441d9..72177ac 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 2.4.0
+# Alfresco Process Services SDK Project 2.4.1
 
 The project consists of the following Maven submodules:
 
@@ -204,7 +204,8 @@ 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:
 
- * `aps2.4.2` (APS 2.4.2 - default)
+ * `aps2.4.3` (APS 2.4.3 - default)
+ * `aps2.4.2` (APS 2.4.2)
  * `aps2.4.1` (APS 2.4.1)
  * `aps2.4.0` (APS 2.4.0)
  * `aps2.3.9` (APS 2.3.9)
@@ -223,7 +224,7 @@ In order to build the project, you can declare a Maven profile related to a spec
  * `aps2.0.1` (APS 2.0.1)
  * `aps2.0.0` (APS 2.0.0) 
 
-Build and test with unit tests execution for APS 2.4.2 with:
+Build and test with unit tests execution for APS 2.4.3 with:
 `mvn clean test`
 
 Build and test with unit tests execution for APS 2.3.1 with:
diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml
index cf07705..60c614c 100644
--- a/activiti-app-integration-tests/pom.xml
+++ b/activiti-app-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.4.0</version>
+		<version>2.4.1</version>
 	</parent>
 
 	<properties>
diff --git a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
index 0153dd3..523a9ad 100644
--- a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
+++ b/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.4.0-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-2.4.1-App.zip";
 
 	protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
 			+ BASE_PATH_PORT;
diff --git a/activiti-app-overlay-docker/pom.xml b/activiti-app-overlay-docker/pom.xml
index c9e491f..a30d596 100644
--- a/activiti-app-overlay-docker/pom.xml
+++ b/activiti-app-overlay-docker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.4.0</version>
+		<version>2.4.1</version>
 	</parent>
 
 	<properties>
diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3
new file mode 100644
index 0000000..5817cbf
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3
@@ -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}
\ No newline at end of file
diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3-arm64
new file mode 100644
index 0000000..e02574e
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.3-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}
\ No newline at end of file
diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3
new file mode 100644
index 0000000..5cc9cde
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3
@@ -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}
diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3-arm64 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3-arm64
new file mode 100644
index 0000000..c62eb7f
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.3-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}
\ No newline at end of file
diff --git a/activiti-app-overlay-docker/src/main/docker/properties/activiti-app.properties b/activiti-app-overlay-docker/src/main/docker/properties/activiti-app.properties
index 010c30e..93a3878 100644
--- a/activiti-app-overlay-docker/src/main/docker/properties/activiti-app.properties
+++ b/activiti-app-overlay-docker/src/main/docker/properties/activiti-app.properties
@@ -4,6 +4,10 @@
 # If you customize this file you are recommended to make changes at the end of the file after the END DEFAULT CONFIGURATION marker
 #
 
+#Migrating from APS 1.x
+activiti5.migration.enabled=false
+activiti.engine5.enabled=false
+
 #server.onpremise=true
 #server.stencil.custom.allowed=true
 #server.contextroot=/activiti-app
diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml
index 78c43ff..fc8acae 100644
--- a/activiti-app-overlay-war/pom.xml
+++ b/activiti-app-overlay-war/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.4.0</version>
+		<version>2.4.1</version>
 	</parent>
 
 	<dependencies>
diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml
index 9e87db5..e170f97 100644
--- a/aps-extensions-jar/pom.xml
+++ b/aps-extensions-jar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.4.0</version>
+		<version>2.4.1</version>
 	</parent>
 
 	<dependencyManagement>
diff --git a/aps-extensions-jar/src/test/resources/activiti/2.4.3/version.properties b/aps-extensions-jar/src/test/resources/activiti/2.4.3/version.properties
new file mode 100644
index 0000000..b64b8fe
--- /dev/null
+++ b/aps-extensions-jar/src/test/resources/activiti/2.4.3/version.properties
@@ -0,0 +1,5 @@
+type=bpmSuite
+version.major=2
+version.minor=4
+version.revision=3
+version.edition=Alfresco Process Services (powered by Activiti)
diff --git a/aps-extensions-jar/src/test/resources/activiti/version.properties b/aps-extensions-jar/src/test/resources/activiti/version.properties
index 8e523c7..b64b8fe 100644
--- a/aps-extensions-jar/src/test/resources/activiti/version.properties
+++ b/aps-extensions-jar/src/test/resources/activiti/version.properties
@@ -1,5 +1,5 @@
 type=bpmSuite
 version.major=2
 version.minor=4
-version.revision=2
+version.revision=3
 version.edition=Alfresco Process Services (powered by Activiti)
diff --git a/pom.xml b/pom.xml
index a6a07e7..bc17c8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.alfresco.activiti</groupId>
 	<artifactId>aps-project</artifactId>
-	<version>2.4.0</version>
+	<version>2.4.1</version>
 	<packaging>pom</packaging>
 	<name>APS - SDK Project</name>
 
@@ -26,7 +26,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
 		<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-		<docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
+		<docker-maven-plugin.version>0.44.0</docker-maven-plugin.version>
 		<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
 		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
 		<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
@@ -35,9 +35,9 @@
 		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
 		<maven-eclipse-lifecycle-mapping.version>1.0.0</maven-eclipse-lifecycle-mapping.version>
 		<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
-		<junit-jupiter.version>5.10.1</junit-jupiter.version>
+		<junit-jupiter.version>5.10.2</junit-jupiter.version>
 		<skip.integration.test>false</skip.integration.test>
-		<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
+		<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
 		<maven-build-helper.plugin.version>3.5.0</maven-build-helper.plugin.version>
 		<gmaven-plugin.version>2.1.1</gmaven-plugin.version>
 		<integration.test.httpclient5.version>5.2.3</integration.test.httpclient5.version>
@@ -659,7 +659,7 @@
 		<profile>
 			<id>aps2.4.2</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<activeByDefault>false</activeByDefault>
 			</activation>
 
 			<properties>
@@ -691,6 +691,42 @@
 				<docker-maven-plugin.build.save>false</docker-maven-plugin.build.save>
 			</properties>
 		</profile>
+		
+		<profile>
+			<id>aps2.4.3</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+
+			<properties>
+				<!-- APS 2.4.3 -->
+				<maven.compiler.source>17</maven.compiler.source>
+				<maven.compiler.target>17</maven.compiler.target>
+				<aps.version>2.4.3</aps.version>
+				<aps.docker.version>2.4.3</aps.docker.version>
+				<aps.version.major>2</aps.version.major>
+				<aps.version.minor>4</aps.version.minor>
+				<aps.version.revision>3</aps.version.revision>
+				<aps.2x.client.version>v2.3.7</aps.2x.client.version>
+				<opencsv.version>5.8</opencsv.version>
+				<jackson.version>2.14.1</jackson.version>
+				<bcprov.version>1.70</bcprov.version>
+				<activiti.version>7.11.1-alpha.7</activiti.version>
+				<spring.version>5.3.29.RELEASE</spring.version>
+				<spring-boot.version>2.7.14</spring-boot.version>
+				<spring-security.version>5.8.5</spring-security.version>
+				<elasticsearch.version>7.17.14</elasticsearch.version>
+				<elasticsearch-rest-client.version>7.17.14</elasticsearch-rest-client.version>
+				<hibernate.version>5.4.32.Final</hibernate.version>
+				<h2.version>2.2.220</h2.version>
+				<postgresql.version>13.1</postgresql.version>
+				<skipITs>false</skipITs>
+				<skip.integration.test>false</skip.integration.test>
+				<skip.swagger.client.generation>false</skip.swagger.client.generation>
+				<docker-maven-plugin.skip.save>false</docker-maven-plugin.skip.save>
+				<docker-maven-plugin.build.save>false</docker-maven-plugin.build.save>
+			</properties>
+		</profile>
 	</profiles>
 
 	<build>
diff --git a/run.sh b/run.sh
index bfb8552..7bbb200 100755
--- a/run.sh
+++ b/run.sh
@@ -53,7 +53,7 @@ down_admin() {
 purge() {
     docker volume rm aps-db-volume
     docker volume rm aps-contentstore-volume
-	  docker volume rm aps-es-volume
+	docker volume rm aps-es-volume
 }
 
 purge_admin() {