Merge branch 'develop-v24.2' into develop-v24.3

.gitignore

@@ -1,6 +1,7 @@
 # Maven
 pom.xml.versionsBackup
 target
+*-pom.xml
 
 # Eclipse
 .project

.mvn/extensions.xml

@@ -0,0 +1,10 @@
+<extensions
+		xmlns="http://maven.apache.org/EXTENSIONS/1.1.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.1.0 https://maven.apache.org/xsd/core-extensions-1.1.0.xsd">
+	<extension>
+		<groupId>com.inteligr8</groupId>
+		<artifactId>provided-scope-maven-extension</artifactId>
+		<version>1.0.1</version>
+	</extension>
+</extensions>

autoversion.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Configuring the next version ..."
+CURRENT_FULL_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=project.version`
+echo "Detected the current version: ${CURRENT_FULL_VERSION}"
+CURRENT_MINOR_VERSION=`echo "${CURRENT_FULL_VERSION}" | sed 's~^\([^\.]\+\.[^\.\-]\+\).*~\1~'`
+echo "Computed the current minor version: ${CURRENT_MINOR_VERSION}"
+
+CURRENT_APS_MAJOR_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=aps.majorVersion`
+echo "Detected the current APS major version: ${CURRENT_APS_MAJOR_VERSION}"
+
+set +e
+LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}*-aps-v${CURRENT_APS_MAJOR_VERSION} | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\([^\.\-]\+\).*~\1~"`
+set -e
+echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION}.#-aps-v${CURRENT_APS_MAJOR_VERSION} => ${LATEST_SERVICE_VERSION}"
+if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
+	LATEST_SERVICE_VERSION=-1
+fi
+NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))-aps-v${CURRENT_APS_MAJOR_VERSION}"
+echo "Computed the next version: ${NEXT_FULL_VERSION}"
+
+mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}

pom.xml

@@ -3,20 +3,14 @@
 		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>24.1.0</version>
-	</parent>
-	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.3.SNAPSHOT-aps-v24.1</version>
+	<version>1.4-SNAPSHOT</version>
 	<packaging>jar</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-app-ext</url>
 
 	<licenses>
 		<license>
@@ -26,9 +20,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-app-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-app-ext.git</developerConnection>
-		<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
+		<url>https://git.inteligr8.com/inteligr8/cxf-activiti-app-ext</url>
 	</scm>
 	<organization>
 		<name>Inteligr8</name>
@@ -48,163 +42,34 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<license.skip>true</license.skip>
+		<aps.majorVersion>24.3</aps.majorVersion>
+		<aps.version>${aps.majorVersion}.0</aps.version>
+		<!-- APS v24.3.0 uses CXF v4.0.5 -->
+		<cxf.version>4.0.5</cxf.version>
 	</properties>
 	
 	<dependencyManagement>
+		<!-- versions need to be explicit for central-publishing-maven-plugin -->
 		<dependencies>
-			<!-- APS provided libraries -->
 			<dependency>
-				<groupId>com.sun.xml.bind</groupId>
+				<groupId>com.activiti</groupId>
-				<artifactId>jaxb-impl</artifactId>
+				<artifactId>activiti-app-root</artifactId>
-				<scope>provided</scope>
+				<version>${aps.version}</version>
-			</dependency>
+				<type>pom</type>
-			
+				<scope>import</scope>
-			<!-- All APS versions v1.11.0 and later have some incarnation of the jaxws-api library; exclude all -->
-			<dependency>
-			    <groupId>javax.xml.ws</groupId>
-			    <artifactId>jaxws-api</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-			    <groupId>jakarta.xml.ws</groupId>
-			    <artifactId>jakarta.xml.ws-api</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			
-			<!-- All APS versions v1.11.0 and later have some incarnation of the activation library; exclude all -->
-			<dependency>
-			    <groupId>javax.annotation</groupId>
-			    <artifactId>javax.annotation-api</artifactId>
-				<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>
-				<scope>provided</scope>  <!-- v1.11.4 and later; exclude in v1.11.3 and earlier for conflict with annotation-api -->
-			</dependency>
-			
-			<!-- All APS versions v1.11.0 and later have some incarnation of the activation library; exclude all -->
-			<dependency>
-			    <groupId>javax.activation</groupId>
-			    <artifactId>activation</artifactId>
-				<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>
-				<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>
-				<scope>provided</scope>  <!-- v1.11.1 and later; exclude in v1.11.2 and earlier for conflict with activation -->
-			</dependency>
-			
-			<!-- All APS versions v1.11.0 and later have some incarnation of the jaxb-api library; exclude all -->
-			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
-				<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>
-				<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>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-yaml</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			
-			<dependency>
-				<groupId>joda-time</groupId>
-				<artifactId>joda-time</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.woodstox</groupId>
-				<artifactId>stax2-api</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.woodstox</groupId>
-				<artifactId>woodstox-core-asl</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ws.xmlschema</groupId>
-				<artifactId>xmlschema-core</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			
-			<!-- ******************** -->
-			<!-- APS v2.x specific -->
-
-			<!-- APS/Chemistry provided libraries -->
-			<dependency>
-				<groupId>org.apache.cxf</groupId>
-				<artifactId>cxf-rt-transports-http</artifactId>
-				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
-				<artifactId>cxf-core</artifactId>
+				<artifactId>cxf-bom</artifactId>
-				<scope>provided</scope>
+				<version>${cxf.version}</version>
-			</dependency>
+				<type>pom</type>
-			
+				<scope>import</scope>
-			<!-- APS v1.11.3 and later provided libraries -->
-			<dependency>
-				<groupId>org.jboss.spec.javax.rmi</groupId>
-				<artifactId>jboss-rmi-api_1.0_spec</artifactId>
-				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>com.fasterxml.woodstox</groupId>
+				<groupId>com.activiti</groupId>
-				<artifactId>woodstox-core</artifactId>
+				<artifactId>activiti-app</artifactId>
-				<scope>provided</scope>
+				<version>${aps.version}</version>
-			</dependency>
+				<classifier>classes</classifier>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jta_1.1_spec</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.xml.messaging.saaj</groupId>
-				<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>
@@ -214,31 +79,108 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-			<scope>runtime</scope>
 		</dependency>
 		<!-- Package JackSON JAX-RS support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
 			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 		<!-- Package JackSON XML support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 		<!-- Package JackSON joda-time support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-			<scope>runtime</scope>
+		</dependency>
+
+		<!-- Provided by APS -->
+		<dependency>
+			<groupId>com.activiti</groupId>
+			<artifactId>activiti-app</artifactId>
+			<classifier>classes</classifier>
+			<scope>provided</scope>
+			<exclusions>
+				<!-- not needed here and requires a separate repository in APS v24.1.0 -->
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-email2-jakarta</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 
 	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.21.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>flatten-maven-plugin</artifactId>
+					<version>1.7.0</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.11.0</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.5.0</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-shade-plugin</artifactId>
+					<version>3.6.2</version>
+				</plugin>
+				<plugin>
+					<groupId>com.inteligr8</groupId>
+					<artifactId>merge-maven-plugin</artifactId>
+					<version>1.0.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>truezip-maven-plugin</artifactId>
+					<version>1.2</version>
+				</plugin>
+				<plugin>
+					<groupId>io.repaint.maven</groupId>
+					<artifactId>tiles-maven-plugin</artifactId>
+					<version>2.44</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<configuration>
+					<property>base.version</property>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<!-- this is required because we are not creating a new POM when shading -->
+						<id>flatten-pom</id>
+						<phase>process-resources</phase>
+						<goals><goal>flatten</goal></goals>
+						<configuration>
+							<flattenMode>ossrh</flattenMode>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- Several CXF libraries have a bus-extensions.txt file that will overwrite each other during the packaging process -->
 			<!-- Only the last one packaged will have its contents in tact -->
 			<!-- We need the contents of all of them and that can be done by simply concatenating them -->
@@ -247,6 +189,14 @@
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
+					<execution>
+						<id>copy-deps</id>
+						<phase>prepare-package</phase>
+						<goals><goal>copy-dependencies</goal></goals>
+						<configuration>
+							<includeScope>runtime</includeScope>
+						</configuration>
+					</execution>
 					<execution>
 						<id>unpack-bus-extensions</id>
 						<phase>prepare-package</phase>
@@ -265,7 +215,6 @@
 			<plugin>
 				<groupId>com.inteligr8</groupId>
 				<artifactId>merge-maven-plugin</artifactId>
-				<version>1.0.0</version>
 				<executions>
 					<execution>
 						<id>merge-bus-extensions</id>
@@ -289,16 +238,32 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-shade-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>assemble-jar</id>
+						<id>shade-jar</id>
 						<phase>package</phase>
-						<goals><goal>single</goal></goals>
+						<goals><goal>shade</goal></goals>
 						<configuration>
-							<descriptorRefs>
+							<!-- without this, the main artifact is shaded -->
-								<descriptorRef>jar-with-dependencies</descriptorRef>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
-							</descriptorRefs>
+							<!-- this keeps the dependencies in POM, letting downstream projects know what this library provides -->
+							<!-- this is necessary as we are not renaming/relocating any packages -->
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+									<addHeader>false</addHeader>
+								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+								<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+									<resources>
+										<resource>.handlers</resource>
+										<resource>.schemas</resource>
+										<resource>DEPENDENCIES</resource>
+									</resources>
+								</transformer>
+							</transformers>
 						</configuration>
 					</execution>
 				</executions>
@@ -306,7 +271,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>truezip-maven-plugin</artifactId>
-				<version>1.2</version>
 				<executions>
 					<execution>
 						<id>overwrite-bus-extensions</id>
@@ -318,7 +282,7 @@
 								<includes>
 									<include>META-INF/cxf/bus-extensions.txt</include>
 								</includes>
-								<outputDirectory>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</outputDirectory>
+								<outputDirectory>${project.build.directory}/${project.build.finalName}-shaded.jar</outputDirectory>
 							</fileset>
 						</configuration>
 					</execution>
@@ -327,12 +291,11 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.40</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
 						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-rad-tile -->
-						<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.0.3,2.0.0)</tile>
+						<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1.18,2.0.0)</tile>
 					</tiles>
 				</configuration>
 			</plugin>
@@ -357,7 +320,47 @@
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
 			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<artifactId>maven-gpg-plugin</artifactId>
+							<version>3.2.8</version>
+						</plugin>
+						<plugin>
+							<groupId>org.sonatype.central</groupId>
+							<artifactId>central-publishing-maven-plugin</artifactId>
+							<version>0.10.0</version>
+						</plugin>
+					</plugins>
+				</pluginManagement>
 				<plugins>
+					<plugin>
+						<artifactId>maven-jar-plugin</artifactId>
+						<executions>
+							<!-- `source` is required for deploy to maven-central -->
+							<execution>
+								<id>sources-jar</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<classifier>sources</classifier>
+								</configuration>
+							</execution>
+							<!-- `javadoc` is required for deploy to maven-central -->
+							<execution>
+								<id>javadoc-jar</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<classifier>javadoc</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
 						<executions>
@@ -371,12 +374,19 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.8.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<publishingServerId>central</publishingServerId>
 							<autoPublish>true</autoPublish>
 						</configuration>
+						<!-- for some reason this is required... -->
+						<executions>
+							<execution>
+								<id>deploy</id>
+								<phase>deploy</phase>
+								<goals><goal>publish</goal></goals>
+							</execution>
+						</executions>
 					</plugin>
 				</plugins>
 			</build>
@@ -385,7 +395,7 @@
 	
 	<repositories>
 		<repository>
-			<id>activiti-releases</id>
+			<id>activiti-enterprise-releases</id>
 			<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
 		</repository>
 	</repositories>

rad.ps1

@@ -5,17 +5,17 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function start_log {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad "-Ddocker.showLogs" process-classes
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
 }
 
 function stop_ {

rad.sh

@@ -6,17 +6,17 @@ discoverArtifactId() {
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 start_log() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad -Ddocker.showLogs process-classes
+	mvn -Drad -Ddocker.showLogs process-test-classes
 }
 
 stop() {