Added support for APS 24.x (#83)

README.md

@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 2.4.1
+# Alfresco Process Services SDK Project 3.0.0
 
 The project consists of the following Maven submodules:
 
@@ -13,8 +13,7 @@ The project consists of the following Maven submodules:
  * Two different quickstarts: run scripts or using Full Maven lifecycle
 
 # Prerequisites
- * OpenJDK 17 for APS >= 2.4.x
- * OpenJDK 11 for APS <= 2.3.9
+ * OpenJDK 17
  * Apache Maven 3.9.6
  * 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 
@@ -204,37 +203,15 @@ 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.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)
- * `aps2.3.8` (APS 2.3.8)
- * `aps2.3.7` (APS 2.3.7)
- * `aps2.3.6` (APS 2.3.6)
- * `aps2.3.5` (APS 2.3.5)
- * `aps2.3.4` (APS 2.3.4)
- * `aps2.3.3` (APS 2.3.3)
- * `aps2.3.2` (APS 2.3.2)
- * `aps2.3.1` (APS 2.3.1)
- * `aps2.3.0` (APS 2.3.0)
- * `aps2.2.0.1` (APS 2.2.0.1)
- * `aps2.2.0` (APS 2.2.0)
- * `aps2.1.0` (APS 2.1.0)
- * `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.3 with:
+ * `aps24.2` (APS 24.2 - default)
+ * `aps24.1` (APS 24.1)
+
+
+Build and test with unit tests execution for APS 24.2 with:
 `mvn clean test`
 
 Build and test with unit tests execution for APS 2.3.1 with:
-`mvn clean test -Paps2.3.1`
-
-Build and test with unit tests execution for APS 2.2.0 with:
-`mvn clean test -Paps2.2.0`
-
-Build and test with unit tests execution for APS 2.1.0 with:
-`mvn clean test -Paps2.1.0`
+`mvn clean test -Paps24.1`
 
 Build your Docker container with:
 `mvn docker:build`
@@ -252,7 +229,7 @@ Skip the build of the Activiti Admin container with:
 `mvn clean install docker:build docker:start -Pactiviti-admin,skip.admin`
 
 # Building your Docker container (optional)
- * Update if you need  _logback.xml_  in `/activiti-app-overlay-war/src/main/webapp/WEB-INF/classes`
+ * Update if you need  _log4j2-dev.properties_ and _log4j2.properties_ in `/activiti-app-overlay-war/src/main/webapp/WEB-INF/classes`
  * Update if you need your  _activiti-app.properties_  in `/activiti-app-overlay-docker/src/main/docker/properties`
 
 # Few things to notice

activiti-app-integration-tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.4.1</version>
+		<version>3.0.0-SNAPSHOT</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.4.1-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-3.0.0-SNAPSHOT-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.4.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -39,6 +39,7 @@
 		<docker.aps.es.cluster.name>elasticsearch</docker.aps.es.cluster.name>
 		<docker.aps.es.discovery.type>single-node</docker.aps.es.discovery.type>
 		<docker.aps.es.memory.settings>-Xms512m -Xmx512m</docker.aps.es.memory.settings>
+		<docker.aps.es.xpack.security.enabled>false</docker.aps.es.xpack.security.enabled>
 
 		<!-- Docker APS Extensions JAR properties -->
 		<docker.aps.extension-jar.volume.internal>/aps-extensions-jar/target/aps-extensions-${project.version}.jar</docker.aps.extension-jar.volume.internal>
@@ -410,6 +411,7 @@
 								<env>
 									<discovery.type>${docker.aps.es.discovery.type}</discovery.type>
 									<ES_JAVA_OPTS>${docker.aps.es.memory.settings}</ES_JAVA_OPTS>
+									<xpack.security.enabled>${docker.aps.es.xpack.security.enabled}</xpack.security.enabled>
 								</env>
 								<ports>
 									<port>${docker.es.service.port.internal}:${docker.es.service.port.external}</port>
@@ -629,7 +631,6 @@
 											<runCmd>chown 33007:33007 -R /act_data</runCmd>
 										</runCmds>
 									</build>
-
 									<run>
 										<env>
 											<CATALINA_OPTS>${catalina.opts.debug}</CATALINA_OPTS>
@@ -677,7 +678,6 @@
 											<log>database system is ready to accept connections</log>
 											<time>20000</time>
 										</wait>
-
 										<volumes>
 											<bind>aps-db-volume:/var/lib/postgresql/data</bind>
 										</volumes>
@@ -694,6 +694,7 @@
 										<env>
 											<discovery.type>${docker.aps.es.discovery.type}</discovery.type>
 											<ES_JAVA_OPTS>${docker.aps.es.memory.settings}</ES_JAVA_OPTS>
+											<xpack.security.enabled>${docker.aps.es.xpack.security.enabled}</xpack.security.enabled>
 										</env>
 										<ports>
 											<port>${docker.es.service.port.internal}:${docker.es.service.port.external}</port>