Merge branch 'develop' into stable

pom.xml

@@ -6,17 +6,17 @@
 	<parent>
 		<groupId>com.activiti</groupId>
 		<artifactId>activiti-app-root</artifactId>
-		<version>24.4.0</version>
+		<version>26.1.0</version>
 	</parent>
 	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.3.0-aps-v24.4</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>
 	<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>
+		<connection>scm:git:https://git.inteligr8.com/inteligr8/cxf-activiti-ext.git</connection>
-		<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-activiti-ext.git</developerConnection>
+		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/cxf-activiti-ext.git</developerConnection>
-		<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
+		<url>https://git.inteligr8.com/inteligr8/cxf-activiti-ext</url>
 	</scm>
 	<organization>
 		<name>Inteligr8</name>
@@ -48,15 +48,21 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
+		<unimportant.version>[1.0.0,)</unimportant.version>
 		<license.skip>true</license.skip>
+
+		<!-- Jackson v2.20+ uses a concatenated version number for jackson-annotations -->
+		<jackson-annotations.version>2.21</jackson-annotations.version>
 	</properties>
 	
 	<dependencyManagement>
+		<!-- versions need to be explicit for central-publishing-maven-plugin -->
 		<dependencies>
 			<!-- APS provided libraries -->
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
+				<version>${javax-jaxb.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -64,11 +70,13 @@
 			<dependency>
 			    <groupId>javax.xml.ws</groupId>
 			    <artifactId>jaxws-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 			    <groupId>jakarta.xml.ws</groupId>
 			    <artifactId>jakarta.xml.ws-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -76,11 +84,13 @@
 			<dependency>
 			    <groupId>javax.annotation</groupId>
 			    <artifactId>javax.annotation-api</artifactId>
+				<version>${javax-annotation.version}</version>
 				<scope>provided</scope>  <!-- v1.11.3 and earlier; exclude in v1.11.4 and later for conflict with jakarta-annotation-api -->
 			</dependency>
 			<dependency>
 			    <groupId>jakarta.annotation</groupId>
 			    <artifactId>jakarta.annotation-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>  <!-- v1.11.4 and later; exclude in v1.11.3 and earlier for conflict with annotation-api -->
 			</dependency>
 			
@@ -88,16 +98,19 @@
 			<dependency>
 			    <groupId>javax.activation</groupId>
 			    <artifactId>activation</artifactId>
+				<version>${javax.activation.version}</version>
 				<scope>provided</scope>  <!-- v1.11.0 and earlier; exclude in v1.11.1 and later for conflict with jakarta-activation-api -->
 			</dependency>
 			<dependency>
 			    <groupId>com.sun.activation</groupId>
 			    <artifactId>javax.activation</artifactId>
+				<version>${javax.activation.version}</version>
 				<scope>provided</scope>  <!-- v1.11.3 and later; exclude in v1.11.2 and earlier for conflict with activation -->
 			</dependency>
 			<dependency>
 			    <groupId>jakarta.activation</groupId>
 			    <artifactId>jakarta.activation-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>  <!-- v1.11.1 and later; exclude in v1.11.2 and earlier for conflict with activation -->
 			</dependency>
 			
@@ -105,53 +118,63 @@
 			<dependency>
 				<groupId>javax.xml.bind</groupId>
 				<artifactId>jaxb-api</artifactId>
+				<version>${javax-jaxb.version}</version>
 				<scope>provided</scope>  <!-- v1.11.0 and earlier; exclude in v1.11.1 and alter for conflict with jakarta.xml.bind-api -->
 			</dependency>
 			<dependency>
 				<groupId>jakarta.xml.bind</groupId>
 				<artifactId>jakarta.xml.bind-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>  <!-- v1.11.3 and later; exclude in v1.11.2 and earlier for conflict with jaxb-api -->
 			</dependency>
 			
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-core</artifactId>
+				<version>${jackson.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
+				<version>${jackson.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
+				<version>${jackson-annotations.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
 				<artifactId>jackson-dataformat-yaml</artifactId>
+				<version>${jackson.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
+				<version>${joda-time.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.woodstox</groupId>
 				<artifactId>stax2-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.woodstox</groupId>
 				<artifactId>woodstox-core-asl</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ws.xmlschema</groupId>
 				<artifactId>xmlschema-core</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -162,11 +185,13 @@
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
+				<version>${cxf.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-core</artifactId>
+				<version>${cxf.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -174,36 +199,43 @@
 			<dependency>
 				<groupId>org.jboss.spec.javax.rmi</groupId>
 				<artifactId>jboss-rmi-api_1.0_spec</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.woodstox</groupId>
 				<artifactId>woodstox-core</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.geronimo.specs</groupId>
 				<artifactId>geronimo-jta_1.1_spec</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.messaging.saaj</groupId>
 				<artifactId>saaj-impl</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.jws</groupId>
 				<artifactId>jakarta.jws-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.xml.soap</groupId>
 				<artifactId>jakarta.xml.soap-api</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.activation</groupId>
 				<artifactId>jakarta.activation</artifactId>
+				<version>${unimportant.version}</version>
 				<scope>provided</scope>
 			</dependency>
 		</dependencies>
@@ -221,18 +253,21 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
 			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
+			<version>${jackson.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<!-- Package JackSON XML support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
+			<version>${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>${jackson.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
@@ -265,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>
@@ -327,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>
@@ -352,7 +387,7 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>ossrh-release</id>
+			<id>central-publish</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
@@ -369,19 +404,20 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
+						<groupId>org.sonatype.central</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>1.6.13</version>
+						<version>0.8.0</version>
+						<extensions>true</extensions>
 						<configuration>
-							<serverId>ossrh</serverId>
+							<publishingServerId>central</publishingServerId>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoPublish>true</autoPublish>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
+						<!-- for some reason this is required... -->
 						<executions>
 							<execution>
-								<id>ossrh-deploy</id>
+								<id>deploy</id>
 								<phase>deploy</phase>
-								<goals><goal>deploy</goal></goals>
+								<goals><goal>publish</goal></goals>
 							</execution>
 						</executions>
 					</plugin>