Merge branch 'develop-acs21' into stable-aps21

pom.xml

@@ -5,11 +5,11 @@
 	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-ext</artifactId>
-	<version>1.1.0-aps-v1.11.4</version>
+	<version>1.1.0-aps21</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
-	<description>An Alfresco Process Service App v1.11.4 extension providing the missing components for JAX-RS-based client libraries.</description>
+	<description>An Alfresco Process Service App v2.1.x extension providing the missing components for JAX-RS-based client libraries.</description>
 	<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
 
 	<licenses>
@@ -41,11 +41,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-				
+		
-		<!-- APS provided versions -->
+		<aps.cxf.version>3.4.4</aps.cxf.version>
-		<aps.cxf.version>3.3.8</aps.cxf.version>
+		<aps.spring.version>5.3.13</aps.spring.version>
-		<aps.spring.version>4.3.30.RELEASE</aps.spring.version>
+		<aps.jackson.version>2.12.4</aps.jackson.version>
-		<aps.jackson.version>2.12.3</aps.jackson.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -157,7 +156,7 @@
 			</dependency>
 			
 			<!-- ******************** -->
-			<!-- APS v1.11.4 specific -->
+			<!-- APS v2.x specific -->
 
 			<!-- APS provided libraries -->
 			<dependency>
@@ -171,18 +170,6 @@
 				<scope>provided</scope>
 			</dependency>
 			
-			<!-- APS v1.11.3-v1.11.4 provided libraries -->
-			<dependency>
-				<groupId>org.jacorb</groupId>
-				<artifactId>jacorb-omgapi</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			
 			<!-- APS v1.11.3 and later provided libraries -->
 			<dependency>
 				<groupId>org.jboss.spec.javax.rmi</groupId>
@@ -204,6 +191,21 @@
 				<artifactId>saaj-impl</artifactId>
 				<scope>provided</scope>
 			</dependency>
+			<dependency>
+				<groupId>jakarta.jws</groupId>
+				<artifactId>jakarta.jws-api</artifactId>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>jakarta.xml.soap</groupId>
+				<artifactId>jakarta.xml.soap-api</artifactId>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.activation</groupId>
+				<artifactId>jakarta.activation</artifactId>
+				<scope>provided</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>