APS SDK 1.x: added support for APS 1.11.4.1, 1.11.4.2, 1.11.4.3 and 1…

….11.5 (#67), added jpda debug feature on port 5005 (#36), updated Maven plugins (#66), removed extensions JAR from tomcat/lib (#65)
OpenPj · Feb 9, 2023 · 028e222 · 028e222
1 parent 23c327a
commit 028e222
Show file tree

Hide file tree

Showing 28 changed files with 204 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,9 @@
 /activiti_data_dev/
 /target/www/**
 /src/test/javascript/coverage/
-
+/license/activiti.lic
+/license/Aspose.Total.Java.lic
+/aps-extensions-jar/src/test/resources/Aspose.Total.Java.lic
 ######################
 # Node
 ######################

diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>1.7.5</version>
+		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

diff --git a/...-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/...-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
@@ -54,7 +54,7 @@ public class FourEyesAppIT {
 	protected static final String BASE_CONTEXT_PATH = "/activiti-app/api";
 	protected static final int BASE_PATH_PORT = 8080;
 
-	protected static final String appZipFile = "aps-extensions-jar-1.7.5-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-1.8.0-SNAPSHOT-App.zip";
 
 	protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
 			+ BASE_PATH_PORT + BASE_CONTEXT_PATH;

diff --git a/activiti-app-overlay-docker/pom.xml b/activiti-app-overlay-docker/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>activiti-app-overlay-docker</artifactId>
 	<packaging>jar</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>1.7.5</version>
+		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -67,6 +65,9 @@
 
 		<docker.activiti.time.test>720000</docker.activiti.time.test>
 
+		<aps.debug.port>5005</aps.debug.port>
+		<catalina.opts.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:${aps.debug.port}</catalina.opts.debug>
+
 	</properties>
 
 	<build>
@@ -216,7 +217,6 @@
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 				<configuration>
-					<extensions>true</extensions>
 					<keepRunning>false</keepRunning>
 					<skip>false</skip>
 					<showLogs>true</showLogs>
@@ -242,12 +242,16 @@
 								</tags>
 							</build>
 							<run>
+								<env>
+									<CATALINA_OPTS>${catalina.opts.debug}</CATALINA_OPTS>
+								</env>
 								<network>
 									<name>aps-network</name>
 									<alias>aps-current-project</alias>
 								</network>
 								<ports>
 									<port>${docker.tomcat.port.external}:${docker.tomcat.port.internal}</port>
+									<port>${aps.debug.port}:${aps.debug.port}</port>
 								</ports>
 								<wait>
 									<http>
@@ -334,24 +338,24 @@
 							<driver>local</driver>
 						</volume>
 					</volumes>
-					<executions>
-						<execution>
-							<id>start-docker</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>build</goal>
-								<goal>start</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>stop-docker</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>stop</goal>
-							</goals>
-						</execution>
-					</executions>
 				</configuration>
+				<executions>
+					<execution>
+						<id>start-docker</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>build</goal>
+							<goal>start</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>stop-docker</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -504,7 +508,6 @@
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
 						<configuration>
-							<extensions>true</extensions>
 							<keepRunning>false</keepRunning>
 							<skip>false</skip>
 							<showLogs>true</showLogs>
@@ -559,12 +562,16 @@
 										</tags>
 									</build>
 									<run>
+										<env>
+											<CATALINA_OPTS>${catalina.opts.debug}</CATALINA_OPTS>
+										</env>
 										<network>
 											<name>aps-network</name>
 											<alias>aps-current-project</alias>
 										</network>
 										<ports>
 											<port>${docker.tomcat.port.external}:${docker.tomcat.port.internal}</port>
+											<port>${aps.debug.port}:${aps.debug.port}</port>
 										</ports>
 										<wait>
 											<http>
@@ -651,28 +658,28 @@
 									<driver>local</driver>
 								</volume>
 							</volumes>
-							<executions>
-								<execution>
-									<id>start-docker</id>
-									<phase>pre-integration-test</phase>
-									<goals>
-										<goal>build</goal>
-										<goal>start</goal>
-									</goals>
-								</execution>
-								<execution>
-									<id>stop-docker</id>
-									<phase>post-integration-test</phase>
-									<goals>
-										<goal>stop</goal>
-									</goals>
-								</execution>
-							</executions>
 						</configuration>
+						<executions>
+							<execution>
+								<id>start-docker</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>build</goal>
+									<goal>start</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>stop-docker</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>stop</goal>
+								</goals>
+							</execution>
+						</executions>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
 
-</project>
+</project>
diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile b/activiti-app-overlay-docker/src/main/docker/Dockerfile
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0.1 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0.1
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0.1-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.10.0.1-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.0 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.0
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.0-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.0-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1.1 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1.1
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1.1-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.1.1-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.2 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.2
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.2-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.2-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.3 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.3
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.3-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.3-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.4 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.4
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.4-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.11.4-arm64
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.9.0.5 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.9.0.5
@@ -17,7 +17,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib
 

diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.9.0.5-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-1.9.0.5-arm64
@@ -16,7 +16,7 @@ USER root
 
 RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
 COPY logging/logback.xml $TOMCAT_DIR/lib