Merge branch 'develop-acs21' into stable-aps21

pom.xml

@@ -3,19 +3,13 @@
 		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.1.0</version>
-	</parent>
-	
 	<groupId>com.inteligr8.activiti</groupId>
-	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.3.0-aps-v25.1</version>
-	<packaging>pom</packaging>
+	<artifactId>cxf-activiti-ext</artifactId>
+	<version>1.1.0-aps21</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>
+	<description>An Alfresco Process Service App v2.1.x extension providing the missing components for JAX-RS-based client libraries.</description>
 	<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
 
 	<licenses>
@@ -48,12 +42,19 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<license.skip>true</license.skip>
+		<aps.cxf.version>3.4.4</aps.cxf.version>
+		<aps.spring.version>5.3.13</aps.spring.version>
+		<aps.jackson.version>2.12.4</aps.jackson.version>
 	</properties>
 	
 	<dependencyManagement>
 		<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>
@@ -133,7 +134,6 @@
 				<artifactId>jackson-dataformat-yaml</artifactId>
 				<scope>provided</scope>
 			</dependency>
-			
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
@@ -158,7 +158,7 @@
 			<!-- ******************** -->
 			<!-- APS v2.x specific -->
 
-			<!-- APS/Chemistry provided libraries -->
+			<!-- APS provided libraries -->
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
@@ -210,30 +210,30 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<!-- Package CXF JAX-RS support -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-			<scope>runtime</scope>
+			<version>${aps.cxf.version}</version>
 		</dependency>
-		<!-- Package JackSON JAX-RS support -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
-			<scope>runtime</scope>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-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>
-			<scope>runtime</scope>
+			<version>${aps.jackson.version}</version>
 		</dependency>
-		<!-- Package JackSON joda-time support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-			<scope>runtime</scope>
+			<version>${aps.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${aps.spring.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -252,7 +252,6 @@
 						<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>
@@ -290,6 +289,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>assemble-jar</id>
@@ -327,7 +327,7 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.40</version>
+				<version>2.21</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
@@ -352,12 +352,35 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>central-publish</id>
+			<id>ossrh-release</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>
@@ -369,24 +392,24 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.central</groupId>
-						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.8.0</version>
-						<extensions>true</extensions>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
 						<configuration>
-							<publishingServerId>central</publishingServerId>
-							<autoPublish>true</autoPublish>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
+						<executions>
+							<execution>
+								<id>ossrh-deploy</id>
+								<phase>deploy</phase>
+								<goals><goal>deploy</goal></goals>
+							</execution>
+						</executions>
 					</plugin>
 				</plugins>
 			</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

@@ -0,0 +1,29 @@
+/*
+ * 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 {
+
+}