Merge branch 'develop' into stable

pom.xml

@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.alfresco</groupId>
 		<artifactId>acs-community-packaging</artifactId>
-		<version>23.4.1</version>
+		<version>25.1.0</version>
 		<relativePath></relativePath>
 	</parent>
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>cxf-jaxrs-platform-module</artifactId>
-	<version>1.3.2-acs-v${acs.version.major}.${acs.version.minor}</version>
+	<version>1.4.0-acs-v${acs.version.major}.${acs.version.minor}</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
@@ -67,6 +67,7 @@
 			</dependency>
 			
 			<!-- Provided by ACS -->
+			<!-- versions need to be explicit for central-publishing-maven-plugin -->
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-core</artifactId>
@@ -76,11 +77,13 @@
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
+				<version>${dependency.cxf.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.module</groupId>
 				<artifactId>jackson-module-jaxb-annotations</artifactId>
+				<version>${dependency.jackson.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -98,21 +101,26 @@
 			<dependency>
 				<groupId>jakarta.jws</groupId>
 				<artifactId>jakarta.jws-api</artifactId>
+				<version>${dependency.jakarta-jws-api.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.ws.rs</groupId>
 				<artifactId>jakarta.ws.rs-api</artifactId>
+				<!-- unimportant.version tries to download a milestone release that doesn't exist -->
+				<version>4.0.0</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.activation</groupId>
 				<artifactId>jakarta.activation</artifactId>
+				<version>${dependency.jakarta-ee-activation.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.annotation</groupId>
 				<artifactId>jakarta.annotation-api</artifactId>
+				<version>${dependency.jakarta-annotation-api.version}</version>
 				<scope>provided</scope>
 			</dependency>
 		</dependencies>
@@ -132,18 +140,20 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
-			<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-rs-client</artifactId>
 		</dependency>
 
+		<!-- Included in ACS v25.x+ -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
+			<version>${dependency.jackson.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
@@ -185,7 +195,7 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>ossrh-release</id>
+			<id>central-publish</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
@@ -202,19 +212,20 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>0.8.0</version>
+						<extensions>true</extensions>
 						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+							<publishingServerId>central</publishingServerId>
+							<autoPublish>true</autoPublish>
 						</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>