remove excess properties

.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-SNAPSHOT</version>
+	</extension>
+</extensions>

pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<groupId>com.inteligr8.activiti</groupId>
-	<artifactId>cxf-activiti-ext</artifactId>
+	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.1-SNAPSHOT-aps20</version>
+	<version>1.4.SNAPSHOT-aps-v24.1</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
-	<description>An Alfresco Process Service App v2.0.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>
+	<url>https://git.inteligr8.com/inteligr8/cxf-activiti-app-ext</url>
 
 	<licenses>
 		<license>
@@ -20,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>
@@ -42,198 +42,78 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<aps.cxf.version>3.4.4</aps.cxf.version>
+		<aps.version>24.1.0</aps.version>
-		<aps.spring.version>5.3.9</aps.spring.version>
+		<!-- APS v24.1.0 uses CXF v3.5.5 -->
-		<aps.jackson.version>2.12.4</aps.jackson.version>
+		<cxf.version>3.5.5</cxf.version>
 	</properties>
 	
 	<dependencyManagement>
+		<!-- versions need to be explicit for central-publishing-maven-plugin -->
 		<dependencies>
-			<!-- APS provided libraries -->
 			<dependency>
-				<groupId>org.springframework</groupId>
+				<groupId>com.activiti</groupId>
-				<artifactId>spring-context</artifactId>
+				<artifactId>activiti-app-root</artifactId>
-				<scope>provided</scope>
+				<version>${aps.version}</version>
-			</dependency>
+				<type>pom</type>
-			<dependency>
+				<scope>import</scope>
-				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-impl</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			
-			<!-- 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 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>
 
 	<dependencies>
+		<!-- Package CXF JAX-RS support -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${aps.cxf.version}</version>
 		</dependency>
+		<!-- Package JackSON JAX-RS support -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
-			<version>${aps.jackson.version}</version>
 		</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>
+			<scope>runtime</scope>
 		</dependency>
+
+		<!-- Provided by APS -->
 		<dependency>
-			<groupId>org.springframework</groupId>
+			<groupId>com.activiti</groupId>
-			<artifactId>spring-context</artifactId>
+			<artifactId>activiti-app</artifactId>
-			<version>${aps.spring.version}</version>
+			<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>
 
@@ -247,11 +127,20 @@
 			<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>
 						<goals><goal>unpack-dependencies</goal></goals>
 						<configuration>
+							<includeTypes>jar</includeTypes>
 							<includeScope>runtime</includeScope>
 							<includes>META-INF/cxf/bus-extensions.txt</includes>
 							<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
@@ -264,7 +153,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>
@@ -288,17 +177,29 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.6.2</version>
 				<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>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
-								<descriptorRef>jar-with-dependencies</descriptorRef>
+							<transformers>
-							</descriptorRefs>
+								<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>
@@ -318,7 +219,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 +228,12 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.21</version>
+				<version>2.44</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>
@@ -352,35 +253,12 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>ossrh-release</id>
+			<id>central-publish</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
 			<build>
 				<plugins>
-					<plugin>
-						<artifactId>maven-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>source</id>
-								<phase>package</phase>
-								<goals><goal>jar-no-fork</goal></goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>javadoc</id>
-								<phase>package</phase>
-								<goals><goal>jar</goal></goals>
-								<configuration>
-									<show>public</show>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
 						<executions>
@@ -392,19 +270,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>
@@ -412,4 +291,11 @@
 			</build>
 		</profile>
 	</profiles>
+	
+	<repositories>
+		<repository>
+			<id>activiti-enterprise-releases</id>
+			<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
+		</repository>
+	</repositories>
 </project>

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() {

src/main/java/com/activiti/extension/conf/CxfActivitiExtSpringComponentScanner.java

@@ -1,29 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.activiti.extension.conf;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * A means for injecting packages to scan for the Spring context.
- * 
- * @author brian@inteligr8.com
- */
-@Configuration
-@ComponentScan(basePackages = "${activiti-ext.scan.packages}")
-public class CxfActivitiExtSpringComponentScanner {
-
-}