Fixed Aspose and aps-2x-client issue (#64)

OpenPj · Jan 13, 2023 · 767aa7c · 767aa7c
1 parent be7fd97
commit 767aa7c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 2.1.8
+# Alfresco Process Services SDK Project 2.1.9
 
 The project consists of the following Maven submodules:
 
@@ -13,7 +13,7 @@ The project consists of the following Maven submodules:
 
 # Prerequisites
  * OpenJDK 11
- * Apache Maven 3.8.6
+ * Apache Maven 3.8.7
  * 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 
  * Access to the Alfresco Nexus Repositories (credentials provided by Alfresco)

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

diff --git 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.1.8</version>
+		<version>2.1.9</version>
 	</parent>
 
 	<dependencies>

diff --git 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.1.8</version>
+		<version>2.1.9</version>
 	</parent>
 
 	<dependencyManagement>
@@ -157,6 +157,12 @@
 			<artifactId>activiti-app-logic</artifactId>
 			<version>${aps.version}</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.activiti</groupId>
+					<artifactId>aspose-transformation</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.activiti</groupId>

diff --git 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.1.8</version>
+	<version>2.1.9</version>
 	<packaging>pom</packaging>
 	<name>APS - SDK Project</name>
 
@@ -286,7 +286,7 @@
 				<aps.version.major>2</aps.version.major>
 				<aps.version.minor>3</aps.version.minor>
 				<aps.version.revision>1</aps.version.revision>
-				<aps.2x.client.version>2.3.1</aps.2x.client.version>
+				<aps.2x.client.version>v2.3.1</aps.2x.client.version>
 				<opencsv.version>5.5.2</opencsv.version>
 				<jackson.version>2.13.2</jackson.version>
 				<bcprov.version>1.70</bcprov.version>
@@ -320,7 +320,7 @@
 				<aps.version.major>2</aps.version.major>
 				<aps.version.minor>3</aps.version.minor>
 				<aps.version.revision>2</aps.version.revision>
-				<aps.2x.client.version>2.3.2</aps.2x.client.version>
+				<aps.2x.client.version>v2.3.2</aps.2x.client.version>
 				<opencsv.version>5.6</opencsv.version>
 				<jackson.version>2.13.3</jackson.version>
 				<bcprov.version>1.70</bcprov.version>
@@ -354,7 +354,7 @@
 				<aps.version.major>2</aps.version.major>
 				<aps.version.minor>3</aps.version.minor>
 				<aps.version.revision>3</aps.version.revision>
-				<aps.2x.client.version>2.3.3</aps.2x.client.version>
+				<aps.2x.client.version>v2.3.3</aps.2x.client.version>
 				<opencsv.version>5.6</opencsv.version>
 				<jackson.version>2.13.3</jackson.version>
 				<bcprov.version>1.70</bcprov.version>
@@ -388,7 +388,7 @@
 				<aps.version.major>2</aps.version.major>
 				<aps.version.minor>3</aps.version.minor>
 				<aps.version.revision>4</aps.version.revision>
-				<aps.2x.client.version>2.3.4</aps.2x.client.version>
+				<aps.2x.client.version>v2.3.4</aps.2x.client.version>
 				<opencsv.version>5.6</opencsv.version>
 				<jackson.version>2.13.3</jackson.version>
 				<bcprov.version>1.70</bcprov.version>
@@ -421,7 +421,7 @@
 				<aps.version.major>2</aps.version.major>
 				<aps.version.minor>3</aps.version.minor>
 				<aps.version.revision>5</aps.version.revision>
-				<aps.2x.client.version>2.3.5</aps.2x.client.version>
+				<aps.2x.client.version>v2.3.5</aps.2x.client.version>
 				<opencsv.version>5.6</opencsv.version>
 				<jackson.version>2.13.3</jackson.version>
 				<bcprov.version>1.70</bcprov.version>
@@ -553,7 +553,7 @@
 		<repository>
 			<id>AsposeJavaAPI</id>
 			<name>Aspose Java API</name>
-			<url>https://artifact.aspose.com/repo/</url>
+			<url>https://releases.aspose.com/java/repo/</url>
 		</repository>
 	</repositories>