ACS v7.3.0

pom-release.xml

@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		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>
-	
-	<groupId>com.inteligr8.alfresco</groupId>
-	<artifactId>cxf-jaxrs-platform-module</artifactId>
-	<version>1.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	
-	<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
-	<description>An Alfresco Content Service module providing the missing components for JAX-RS-based clients.</description>
-	<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
-
-	<licenses>
-		<license>
-			<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>
-			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
-		</license>
-	</licenses>
-
-	<scm>
-		<connection>scm:git:https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module.git</connection>
-		<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-jaxrs-platform-module.git</developerConnection>
-		<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
-	</scm>
-	<organization>
-		<name>Inteligr8</name>
-		<url>https://www.inteligr8.com</url>
-	</organization>
-	<developers>
-		<developer>
-			<id>brian.long</id>
-			<name>Brian Long</name>
-			<email>brian@inteligr8.com</email>
-			<url>https://twitter.com/brianmlong</url>
-		</developer>
-	</developers>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-invoker-plugin</artifactId>
-				<version>3.3.0</version>
-				<configuration>
-					<goals><goal>package</goal></goals>
-					<pom>pom.xml</pom>
-					<streamLogs>true</streamLogs>
-				</configuration>
-				<executions>
-					<execution>
-						<id>acs62</id>
-						<phase>package</phase>
-						<goals><goal>run</goal></goals>
-						<configuration>
-							<profiles><profile>acs62</profile></profiles>
-						</configuration>
-					</execution>
-					<execution>
-						<id>acs70</id>
-						<phase>package</phase>
-						<goals><goal>run</goal></goals>
-						<configuration>
-							<profiles><profile>acs70</profile></profiles>
-						</configuration>
-					</execution>
-					<execution>
-						<id>acs71</id>
-						<phase>package</phase>
-						<goals><goal>run</goal></goals>
-						<configuration>
-							<profiles><profile>acs71</profile></profiles>
-						</configuration>
-					</execution>
-					<execution>
-						<id>acs72</id>
-						<phase>package</phase>
-						<goals><goal>run</goal></goals>
-						<configuration>
-							<profiles><profile>acs72</profile></profiles>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.3.0</version>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals><goal>attach-artifact</goal></goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>${project.build.directory}/${project.artifactId}-${project.version}-acs62.amp</file>
-									<classifier>acs62</classifier>
-									<type>amp</type>
-								</artifact>
-								<artifact>
-									<file>${project.build.directory}/${project.artifactId}-${project.version}-acs70.amp</file>
-									<classifier>acs70</classifier>
-									<type>amp</type>
-								</artifact>
-								<artifact>
-									<file>${project.build.directory}/${project.artifactId}-${project.version}-acs71.amp</file>
-									<classifier>acs71</classifier>
-									<type>amp</type>
-								</artifact>
-								<artifact>
-									<file>${project.build.directory}/${project.artifactId}-${project.version}-acs72.amp</file>
-									<classifier>acs72</classifier>
-									<type>amp</type>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-install-plugin</artifactId>
-				<configuration>
-					<pomFile>pom.xml</pomFile>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>ossrh-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<phase>verify</phase>
-								<goals><goal>sign</goal></goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
-						<extensions>true</extensions>
-						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

pom.xml

@@ -4,13 +4,20 @@
 		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>org.alfresco</groupId>
+		<artifactId>acs-community-packaging</artifactId>
+		<version>7.3.0</version>
+		<relativePath></relativePath>
+	</parent>
+	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>cxf-jaxrs-platform-module</artifactId>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.2.0-acs-v${acs.version.major}.${acs.version.minor}.${acs.version.revision}</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
-	<description>An Alfresco Content Service module providing the missing components for JAX-RS-based clients.</description>
+	<description>An Alfresco Content Service Platform module providing the missing components for JAX-RS-based client libraries in ACS v${acs.version.major}.${acs.version.minor}.${acs.version.revision}.</description>
 	<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
 
 	<licenses>
@@ -44,6 +51,7 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.release>11</maven.compiler.release>
 		
+		<alfresco.sdk.version>5.2.0</alfresco.sdk.version>
 		<unimportant.version>[1.0.0,)</unimportant.version>
 	</properties>
 
@@ -52,10 +60,55 @@
 			<dependency>
 				<groupId>org.alfresco</groupId>
 				<artifactId>acs-community-packaging</artifactId>
-				<version>${alfresco.platform.version}</version>
+				<version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			
+			<!-- Provided by ACS -->
+			<dependency>
+				<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-core</artifactId>
+				<version>${dependency.cxf.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-rt-transports-http</artifactId>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.module</groupId>
+				<artifactId>jackson-module-jaxb-annotations</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>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>
 	</dependencyManagement>
 
@@ -64,7 +117,7 @@
 			All 'provided' dependencies are already provided by ACS OOTB
 			They are declared here for one of two reasons:
 			(1) Prevent dependencies of other non-provided depenencies from being included
-			(2) Prevent projects depending on this project from including these dupilcate libraries
+			(2) Prevent projects depending on this project from including these duplicate libraries
 		-->
 
 		<dependency>
@@ -76,68 +129,18 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson.version}</version>
+			<version>${dependency.jackson.version}</version>
 		</dependency>
 		
 		<!-- Version managed by acs-community-packaging, yet not included by ACS -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<artifactId>cxf-rt-rs-client</artifactId>
-		</dependency>
-		
-		<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>
-			<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.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>
@@ -170,135 +173,41 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>acs62</id>
+			<id>ossrh-release</id>
 			<properties>
-				<maven.compiler.source>8</maven.compiler.source>
+				<maven.deploy.skip>true</maven.deploy.skip>
-				<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>
+			<build>
-				<dependency>
+				<plugins>
-					<groupId>javax.xml.ws</groupId>
+					<plugin>
-					<artifactId>jaxws-api</artifactId>
+						<artifactId>maven-gpg-plugin</artifactId>
-					<version>${unimportant.version}</version>
+						<executions>
-					<scope>provided</scope>
+							<execution>
-				</dependency>
+								<id>sign</id>
-				<dependency>
+								<phase>verify</phase>
-					<groupId>org.jboss.spec.javax.rmi</groupId>
+								<goals><goal>sign</goal></goals>
-					<artifactId>jboss-rmi-api_1.0_spec</artifactId>
+							</execution>
-					<version>${unimportant.version}</version>
+						</executions>
-					<scope>provided</scope>
+					</plugin>
-				</dependency>
+					<plugin>
-				<dependency>
+						<groupId>org.sonatype.plugins</groupId>
-					<groupId>org.jacorb</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
-					<artifactId>jacorb-omgapi</artifactId>
+						<version>1.6.13</version>
-					<version>${unimportant.version}</version>
+						<configuration>
-					<scope>provided</scope>
+							<serverId>ossrh</serverId>
-				</dependency>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-				<dependency>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
-					<groupId>com.sun.activation</groupId>
+						</configuration>
-					<artifactId>javax.activation</artifactId>
+						<executions>
-					<version>${unimportant.version}</version>
+							<execution>
-					<scope>provided</scope>
+								<id>ossrh-deploy</id>
-				</dependency>
+								<phase>deploy</phase>
-			</dependencies>
+								<goals><goal>deploy</goal></goals>
-		</profile>
+							</execution>
-		<profile>
+						</executions>
-			<id>acs70</id>
+					</plugin>
-			<properties>
+				</plugins>
-				<alfresco.sdk.version>5.0.0</alfresco.sdk.version>
+			</build>
-				<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>