From 37b77613cef1885584bf7e881fc095c986da488e Mon Sep 17 00:00:00 2001
From: Piergiorgio Lucidi <plucidi@ziaconsulting.com>
Date: Wed, 24 Apr 2024 14:54:43 +0200
Subject: [PATCH] Fix for license management and excluded some internal
 dependencies of APS (#83)

---
 activiti-app-integration-tests/pom.xml        | 30 +----------
 .../sdk/integrationtests/FourEyesAppIT.java   |  2 +-
 activiti-app-overlay-docker/pom.xml           |  4 +-
 activiti-app-overlay-war/pom.xml              |  2 +-
 aps-extensions-jar/pom.xml                    | 52 ++++++++-----------
 pom.xml                                       |  2 +-
 6 files changed, 27 insertions(+), 65 deletions(-)

diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml
index bcadf3d..5737add 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>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<properties>
@@ -175,34 +175,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>failsafe-openjdk-11</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<jdk>11</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-				<artifactId>maven-failsafe-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>
\ No newline at end of file
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 4784628..7db6a7e 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-3.0.0-SNAPSHOT-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-3.0.0-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 f4189d8..1686035 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>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<properties>
@@ -298,7 +298,7 @@
 					</execution>
 					<execution>
 						<id>copy-license-for-containers-and-ITs</id>
-						<phase>pre-integration-test</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml
index bcbb7c9..4a3f580 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>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<dependencies>
diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml
index b5cdb44..89106e3 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>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<dependencyManagement>
@@ -163,8 +163,12 @@
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
-					<groupId>com.activiti</groupId>
-					<artifactId>aspose-transformation</artifactId>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-jakarta</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -174,6 +178,20 @@
 			<version>${aps.version}</version>
 			<scope>test</scope>
 			<classifier>classes</classifier>
+			<exclusions>
+				<exclusion>
+					<groupId>com.activiti</groupId>
+					<artifactId>aspose-transformation</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-jakarta</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.opencsv</groupId>
@@ -332,34 +350,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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c559926..e0ebe98 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>3.0.0-SNAPSHOT</version>
+	<version>3.0.0</version>
 	<packaging>pom</packaging>
 	<name>APS - SDK Project - 3.x</name>