Merge branch 'develop' into stable

pom.xml

@@ -3,13 +3,19 @@
 		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>25.2.0</version>
+	</parent>
+	
 	<groupId>com.inteligr8.activiti</groupId>
-	<artifactId>cxf-activiti-ext</artifactId>
+	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.1-SNAPSHOT-aps-v1.11.4</version>
+	<version>1.3.0-aps-v25.2</version>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
-	<description>An Alfresco Process Service App v1.11.4 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>
 
 	<licenses>
@@ -41,24 +47,19 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-				
+		
-		<!-- APS provided versions -->
+		<unimportant.version>[1.0.0,)</unimportant.version>
-		<aps.cxf.version>3.3.8</aps.cxf.version>
+		<license.skip>true</license.skip>
-		<aps.spring.version>4.3.30.RELEASE</aps.spring.version>
-		<aps.jackson.version>2.12.3</aps.jackson.version>
 	</properties>
 	
 	<dependencyManagement>
+		<!-- versions need to be explicit for central-publishing-maven-plugin -->
 		<dependencies>
 			<!-- APS provided libraries -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<scope>provided</scope>
-			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
+				<version>${javax-jaxb.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -66,11 +67,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>
 			
@@ -78,11 +81,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>
 			
@@ -90,16 +95,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>
 			
@@ -107,79 +115,80 @@
 			<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.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>4.2.2</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>
 			
 			<!-- ******************** -->
-			<!-- APS v1.11.4 specific -->
+			<!-- APS v2.x specific -->
 
-			<!-- APS provided libraries -->
+			<!-- APS/Chemistry provided libraries -->
 			<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>
-				<scope>provided</scope>
+				<version>${cxf.version}</version>
-			</dependency>
-			
-			<!-- APS v1.11.3-v1.11.4 provided libraries -->
-			<dependency>
-				<groupId>org.jacorb</groupId>
-				<artifactId>jacorb-omgapi</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
 				<scope>provided</scope>
 			</dependency>
 			
@@ -187,51 +196,76 @@
 			<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>
 	</dependencyManagement>
 
 	<dependencies>
+		<!-- Package CXF JAX-RS support -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${aps.cxf.version}</version>
+			<version>${cxf.version}</version>
+			<scope>runtime</scope>
 		</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>
+			<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>${aps.jackson.version}</version>
+			<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>${aps.jackson.version}</version>
+			<version>${jackson.version}</version>
-		</dependency>
+			<scope>runtime</scope>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${aps.spring.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -250,6 +284,7 @@
 						<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>
@@ -287,7 +322,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>assemble-jar</id>
@@ -325,7 +359,7 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.21</version>
+				<version>2.40</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
@@ -350,35 +384,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>
@@ -390,19 +401,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>
@@ -410,4 +422,11 @@
 			</build>
 		</profile>
 	</profiles>
+	
+	<repositories>
+		<repository>
+			<id>activiti-releases</id>
+			<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
+		</repository>
+	</repositories>
 </project>

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 {
-
-}