Merge branch 'develop' into stable

pom.xml

@@ -6,17 +6,17 @@
 	<parent>
 		<groupId>com.activiti</groupId>
 		<artifactId>activiti-app-root</artifactId>
-		<version>25.2.0</version>
+		<version>25.3.0</version>
 	</parent>
 	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.3.0-aps-v25.2</version>
+	<version>1.3.0-aps-v25.3</version>
 	<packaging>pom</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
 	<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>
+	<url>https://git.inteligr8.com/inteligr8/cxf-activiti-ext</url>
 
 	<licenses>
 		<license>
@@ -26,9 +26,9 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:https://bitbucket.org/inteligr8/cxf-activiti-ext.git</connection>
-		<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-activiti-ext.git</developerConnection>
-		<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
+		<connection>scm:git:https://git.inteligr8.com/inteligr8/cxf-activiti-ext.git</connection>
+		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/cxf-activiti-ext.git</developerConnection>
+		<url>https://git.inteligr8.com/inteligr8/cxf-activiti-ext</url>
 	</scm>
 	<organization>
 		<name>Inteligr8</name>
@@ -50,6 +50,9 @@
 		
 		<unimportant.version>[1.0.0,)</unimportant.version>
 		<license.skip>true</license.skip>
+
+		<!-- Jackson v2.20+ uses a different version number for jackson-annotations -->
+		<jackson-annotations.version>2.20</jackson-annotations.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -140,7 +143,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
+				<version>${jackson-annotations.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>