Merge branch 'develop-acs71' into stable-acs71

pom.xml

@@ -6,11 +6,11 @@
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>cxf-jaxrs-platform-module</artifactId>
-	<version>1.1-SNAPSHOT-acs62</version>
+	<version>1.1.0-acs71</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
-	<description>An Alfresco Content Service v6.2.x module providing the missing components for JAX-RS-based client libraries.</description>
+	<description>An Alfresco Content Service v7.1.x module providing the missing components for JAX-RS-based client libraries.</description>
 	<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
 
 	<licenses>
@@ -40,14 +40,16 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 		
-		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
+		<alfresco.sdk.version>5.1.0</alfresco.sdk.version>
-		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
+		<alfresco.platform.version>7.1.0</alfresco.platform.version>
-		<cxf.version>3.3.2</cxf.version>
+		<cxf.version>3.4.4</cxf.version>
-		<jackson.version>2.9.9</jackson.version>
+		<jackson.version>2.12.3</jackson.version>
 		<unimportant.version>[1.0.0,)</unimportant.version>
+
 	</properties>
 
 	<dependencyManagement>
@@ -133,9 +135,18 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.xml.ws</groupId>
+			<groupId>jakarta.jws</groupId>
-			<artifactId>jaxws-api</artifactId>
+			<artifactId>jakarta.jws-api</artifactId>
-			<version>${unimportant.version}</version>
+			<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>
@@ -144,18 +155,6 @@
 			<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>
 
 	<build>