Merge branch 'develop' into stable

pom.xml

@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>com.activiti</groupId>
 		<artifactId>activiti-app-root</artifactId>
-		<version>25.3.0</version>
+		<version>26.1.0</version>
 	</parent>
 	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.3.0-aps-v25.3</version>
+	<version>1.3.0-aps-v26.1</version>
 	<packaging>pom</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
@@ -51,8 +51,8 @@
 		<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>
+		<!-- Jackson v2.20+ uses a concatenated version number for jackson-annotations -->
+		<jackson-annotations.version>2.21</jackson-annotations.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -162,7 +162,7 @@
 			<dependency>
 				<groupId>org.codehaus.woodstox</groupId>
 				<artifactId>stax2-api</artifactId>
-				<version>4.2.2</version>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -300,7 +300,7 @@
 			<plugin>
 				<groupId>com.inteligr8</groupId>
 				<artifactId>merge-maven-plugin</artifactId>
-				<version>1.0.0</version>
+				<version>1.0.1</version>
 				<executions>
 					<execution>
 						<id>merge-bus-extensions</id>
@@ -362,7 +362,7 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.40</version>
+				<version>2.41</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>