Merge branch 'develop-aps23' into stable-aps23

pom.xml

@@ -3,13 +3,19 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
+	<parent>
+		<groupId>com.activiti</groupId>
+		<artifactId>activiti-app-root</artifactId>
+		<version>2.3.7</version>
+	</parent>
+	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-ext</artifactId>
-	<version>1.1.1-aps23</version>
+	<version>1.2.0-aps-v2.3.7</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
-	<description>An Alfresco Process Service App v2.3.x extension providing the missing components for JAX-RS-based client libraries.</description>
+	<description>An Alfresco Process Service App extension providing the missing components for JAX-RS-based client libraries.</description>
 	<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
 
 	<licenses>
@@ -41,10 +47,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-		
-		<aps.cxf.version>3.5.5</aps.cxf.version>
-		<aps.spring.version>5.3.25</aps.spring.version>
-		<aps.jackson.version>2.14.1</aps.jackson.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -134,6 +136,7 @@
 				<artifactId>jackson-dataformat-yaml</artifactId>
 				<scope>provided</scope>
 			</dependency>
+			
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
@@ -158,7 +161,7 @@
 			<!-- ******************** -->
 			<!-- APS v2.x specific -->
 
-			<!-- APS provided libraries -->
+			<!-- APS/Chemistry provided libraries -->
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
@@ -210,30 +213,36 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		
+		<!-- Package CXF JAX-RS support -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${aps.cxf.version}</version>
+			<version>${cxf.version}</version>
+			<scope>runtime</scope>
 		</dependency>
+		<!-- Package JackSON JAX-RS support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${aps.jackson.version}</version>
+			<scope>runtime</scope>
 		</dependency>
+		<!-- Package JackSON XML support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${aps.jackson.version}</version>
+			<scope>runtime</scope>
 		</dependency>
+		<!-- Package JackSON joda-time support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-			<version>${aps.jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${aps.spring.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 
@@ -252,6 +261,7 @@
 						<phase>prepare-package</phase>
 						<goals><goal>unpack-dependencies</goal></goals>
 						<configuration>
+							<includeTypes>jar</includeTypes>
 							<includeScope>runtime</includeScope>
 							<includes>META-INF/cxf/bus-extensions.txt</includes>
 							<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
@@ -289,7 +299,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>assemble-jar</id>
@@ -412,4 +421,15 @@
 			</build>
 		</profile>
 	</profiles>
+	
+	<repositories>
+		<repository>
+			<id>alfresco-private</id>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/private/</url>
+		</repository>
+		<repository>
+			<id>activiti-releases</id>
+			<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
+		</repository>
+	</repositories>
 </project>