Merge branch 'develop' into stable

pom.xml

@@ -5,21 +5,19 @@
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>cxf-jaxrs-platform-module</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
-
-		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
-		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
-		<jackson.version>2.9.9</jackson.version>
-
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
+		
 		<aps.port>8081</aps.port>
+		<unimportant.version>[1.0.0,)</unimportant.version>
 	</properties>
 
 	<dependencyManagement>
@@ -35,17 +33,50 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.alfresco</groupId>
+			<artifactId>alfresco-repository</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
 		</dependency>
 		
-		<!-- ACS Provided Libraries -->
+		<!-- Already provided by ACS -->
+		<!--
+			We need to specify versions here, unlike when we list these in the 
+			dependencyManagement block.  However, that block does not get
+			inherited by dependent projects.
+		-->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-core</artifactId>
+			<version>${cxf.version}</version> <!-- version is unused/unimportant, but we already have it defined -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<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>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<version>${unimportant.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
@@ -61,10 +92,21 @@
 			<artifactId>jackson-annotations</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<classifier>${alfresco.module.classifier}</classifier>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
@@ -78,9 +120,6 @@
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-module-tile:[1.0.0,2.0.0)</tile>
 						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-it-tile:[1.0.0,2.0.0)</tile> -->
-						
-						<!-- Distribution Management -->
-						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
 					</tiles>
 				</configuration>
 			</plugin>
@@ -99,11 +138,142 @@
 				<acs-platform.timeout>1200000</acs-platform.timeout>
 			</properties>
 		</profile>
+		<profile>
+			<id>acs62</id>
+			<properties>
+				<maven.compiler.source>8</maven.compiler.source>
+				<maven.compiler.target>8</maven.compiler.target>
+				<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
+				<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
+				<cxf.version>3.3.2</cxf.version>
+				<jackson.version>2.9.9</jackson.version>
+				<alfresco.module.classifier>acs62</alfresco.module.classifier>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.ws</groupId>
+					<artifactId>jaxws-api</artifactId>
+					<version>${unimportant.version}</version>
+					<scope>provided</scope>
+				</dependency>
+				<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>org.jacorb</groupId>
+					<artifactId>jacorb-omgapi</artifactId>
+					<version>${unimportant.version}</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.activation</groupId>
+					<artifactId>javax.activation</artifactId>
+					<version>${unimportant.version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>acs70</id>
+			<properties>
+				<alfresco.sdk.version>5.0.0</alfresco.sdk.version>
+				<alfresco.platform.version>7.0.0</alfresco.platform.version>
+				<cxf.version>3.4.2</cxf.version>
+				<jackson.version>2.12.1</jackson.version>
+				<alfresco.module.classifier>acs70</alfresco.module.classifier>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>jakarta.jws</groupId>
+					<artifactId>jakarta.jws-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.activation</groupId>
+					<artifactId>jakarta.activation</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>jakarta.annotation</groupId>
+					<artifactId>jakarta.annotation-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.jboss.spec.javax.rmi</groupId>
+					<artifactId>jboss-rmi-api_1.0_spec</artifactId>
+					<version>${unimportant.version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>acs71</id>
+			<properties>
+				<alfresco.sdk.version>5.1.0</alfresco.sdk.version>
+				<alfresco.platform.version>7.1.0</alfresco.platform.version>
+				<cxf.version>3.4.4</cxf.version>
+				<jackson.version>2.12.3</jackson.version>
+				<alfresco.module.classifier>acs71</alfresco.module.classifier>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>jakarta.jws</groupId>
+					<artifactId>jakarta.jws-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.activation</groupId>
+					<artifactId>jakarta.activation</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>jakarta.annotation</groupId>
+					<artifactId>jakarta.annotation-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.jboss.spec.javax.rmi</groupId>
+					<artifactId>jboss-rmi-api_1.0_spec</artifactId>
+					<version>${unimportant.version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>acs72</id>
+			<properties>
+				<alfresco.sdk.version>5.2.0</alfresco.sdk.version>
+				<alfresco.platform.version>7.2.0</alfresco.platform.version>
+				<cxf.version>3.5.0</cxf.version>
+				<jackson.version>2.13.1</jackson.version>
+				<alfresco.module.classifier>acs72</alfresco.module.classifier>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>jakarta.jws</groupId>
+					<artifactId>jakarta.jws-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.activation</groupId>
+					<artifactId>jakarta.activation</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>jakarta.annotation</groupId>
+					<artifactId>jakarta.annotation-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 	
 	<repositories>
 		<repository>
-			<id>inteligr8-releases</id>
+			<id>inteligr8-public</id>
 			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
 		</repository>
 		<repository>
@@ -114,8 +284,19 @@
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>inteligr8-releases</id>
+			<id>inteligr8-public</id>
 			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
 		</pluginRepository>
 	</pluginRepositories>
+
+	<distributionManagement>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+		<snapshotRepository>
+			<id>inteligr8-snapshots</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>

src/main/resources/alfresco/module/com.inteligr8.alfresco.cxf-jaxrs-platform-module/alfresco-global.properties

@@ -1,2 +0,0 @@
-
-platform-module.scan.packages=com.inteligr8.preventStartupFailure

src/main/resources/alfresco/module/com.inteligr8.alfresco.cxf-jaxrs-platform-module/module-bootstrap-context.xml

@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Use this file for beans to be loaded in whatever order Alfresco/Spring decides -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
-	<!-- Enable Spring annotation scanning for classes in package -->
-	<context:component-scan base-package="${platform-module.scan.packages}" />
-
-</beans>