removing unused cxf.version property

pom.xml

@@ -6,10 +6,10 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-client</artifactId>
-	<version>2.0.3-jersey</version>
-	
+	<version>3.0-SNAPSHOT-cxf</version>
+
 	<name>Alfresco Content Services ReST API Client for Java</name>
-	<description>An ACS Client library for building Jersey-based REST API clients</description>
+	<description>An ACS Client library for building CXF-based REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/acs-public-rest-client</url>
 
 	<licenses>
@@ -39,34 +39,34 @@
 
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 
-		<acs.platform.tag>acs7</acs.platform.tag>
-
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.3.6</spring.version>
-		<jersey.version>2.39.1</jersey.version>
-		<jackson.version>2.15.1</jackson.version>
+		<acs.platform.tag>acs26</acs.platform.tag>
+		
+		<!-- for testing only -->
+		<spring.version>6.2.18</spring.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.4-jersey</version>
+			<version>3.0.4-cxf</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>acs-public-rest-api</artifactId>
-			<version>2.1-SNAPSHOT-${acs.platform.tag}</version>
+			<version>3.0.2-${acs.platform.tag}</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
+
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.version}</version>
+			<version>5.14.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -84,44 +84,40 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.19.0</version>
+			<version>2.25.4</version>
 			<scope>test</scope>
 		</dependency>
-		
-		<!-- Jersey libraries -->
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		
-		<!-- Jersey library fallout -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 	</dependencies>
 	
 	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>3.5.5</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>3.5.5</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>3.6.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>add-jaxrs-src</id>
 						<goals><goal>add-source</goal></goals>
 						<configuration>
 							<sources>
-								<source>src/main/jersey</source>
+								<source>src/main/cxf</source>
 							</sources>
 						</configuration>
 					</execution>
@@ -130,40 +126,18 @@
 						<goals><goal>add-test-source</goal></goals>
 						<configuration>
 							<sources>
-								<source>src/test/jersey</source>
+								<source>src/test/cxf</source>
 							</sources>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.1.0</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.1.0</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
 		</plugins>
 	</build>
 
 	<profiles>
 		<profile>
-			<id>ossrh-release</id>
+			<id>central-publish</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
@@ -181,7 +155,6 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>javadoc</id>
@@ -205,19 +178,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.10.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>

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java

@@ -18,11 +18,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import com.inteligr8.rs.ClientJerseyConfiguration;
+import com.inteligr8.rs.ClientCxfConfiguration;
 
 /**
  * This class provides a POJO & Spring-based implementation of the
- * ClientJerseyConfiguration interface.  You can use it outside of the Spring
+ * ClientCxfConfiguration interface.  You can use it outside of the Spring
  * context, but you will need the spring-context and spring-beans libraries in
  * your non-Spring application.
  * 
@@ -30,17 +30,17 @@ import com.inteligr8.rs.ClientJerseyConfiguration;
  */
 @Configuration
 @ComponentScan
-public class AcsClientJerseyConfiguration extends AcsClientConfiguration implements ClientJerseyConfiguration {
+public class AcsClientCxfConfiguration extends AcsClientConfiguration implements ClientCxfConfiguration {
+
+	@Value("${content.service.cxf.defaultBusEnabled:true}")
+	private boolean defaultBusEnabled;
 	
-	@Value("${content.service.jersey.putBodyRequired:true}")
-	private boolean putBodyRequired;
-	
-	public boolean isPutBodyRequired() {
-		return this.putBodyRequired;
+	public boolean isDefaultBusEnabled() {
+		return this.defaultBusEnabled;
 	}
 
-	public void setPutBodyRequired(boolean putBodyRequired) {
-		this.putBodyRequired = putBodyRequired;
+	public void setDefaultBusEnabled(boolean defaultBusEnabled) {
+		this.defaultBusEnabled = defaultBusEnabled;
 	}
 
 }

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java

@@ -18,25 +18,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.inteligr8.rs.ClientJerseyImpl;
+import com.inteligr8.rs.ClientCxfImpl;
 
 /**
- * This class provides a POJO & Spring-based implementation of the Jersey
- * client configured for APS.  You can use it outside of the Spring context,
- * but you will need the spring-context and spring-beans libraries in your
- * non-Spring application.
+ * This class provides a POJO & Spring-based implementation of the Apache
+ * CXF client.  You can use it outside of the Spring context, but you will need
+ * the spring-context and spring-beans libraries in your non-Spring
+ * application.
  * 
  * @author brian@inteligr8.com
  */
-@Component("acs.client.jersey")
+@Component("acs.client.cxf")
 @Lazy
-public class AcsClientJerseyImpl extends ClientJerseyImpl {
+public class AcsClientCxfImpl extends ClientCxfImpl {
 	
 	/**
-	 * This constructor is for Spring and POJO use
+	 * This constructor is for Spring or POJO use
 	 */
 	@Autowired
-	public AcsClientJerseyImpl(AcsClientJerseyConfiguration config) {
+	public AcsClientCxfImpl(AcsClientCxfConfiguration config) {
 		super(config);
 	}
 

src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java

@@ -19,20 +19,20 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
- * This class provides the Jersey client to the JAX-RS API for the ACS Public
- * ReST API.
+ * This class provides the Apache CXF client to the JAX-RS API for the ACS
+ * Public ReST API.
  * 
  * @author brian@inteligr8.com
  */
-@Component("acs.api.jersey")
+@Component("acs.api.cxf")
 @Lazy
-public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApiImpl implements AcsPublicRestJerseyApi {
+public class AcsPublicRestApiCxfImpl extends AcsPublicRestApiImpl implements AcsPublicRestCxfApi {
 
 	/**
 	 * This constructor is for Spring or POJO use
 	 */
 	@Autowired
-	public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
+	public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
 		super(client);
 	}
 

src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java

@@ -61,6 +61,12 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	@Value("${content.service.security.oauth.grantPassword:#{null}}")
 	private String oAuthPassword;
 
+    @Value("${content.service.http.connectTimeout:#{null}}")
+    private Integer connectTimeoutInMillis;
+
+    @Value("${content.service.http.responseTimeout:#{null}}")
+    private Integer responseTimeoutInMillis;
+
 	public String getBaseUrl() {
 		return this.baseUrl;
 	}
@@ -148,5 +154,23 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	public void setOAuthPassword(String oAuthPassword) {
 		this.oAuthPassword = oAuthPassword;
 	}
+	
+	@Override
+	public Integer getConnectTimeoutInMillis() {
+	    return this.connectTimeoutInMillis;
+	}
+	
+	public void setConnectTimeoutInMillis(Integer connectTimeoutInMillis) {
+        this.connectTimeoutInMillis = connectTimeoutInMillis;
+    }
+	
+	@Override
+	public Integer getResponseTimeoutInMillis() {
+	    return this.responseTimeoutInMillis;
+	}
+	
+	public void setResponseTimeoutInMillis(Integer responseTimeoutInMillis) {
+        this.responseTimeoutInMillis = responseTimeoutInMillis;
+    }
 
 }

src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder

@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl

src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java

@@ -22,11 +22,11 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
-public class ConnectionJerseyClientIT extends ConnectionClientIT {
+@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
+public class ConnectionCxfClientIT extends ConnectionClientIT {
 	
 	@Autowired
-	@Qualifier("acs.api.jersey")
+	@Qualifier("acs.api.cxf")
 	private AcsPublicRestApiImpl api;
 	
 	@Override

src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java

@@ -16,7 +16,6 @@ package com.inteligr8.alfresco.acs;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.Collections;
 
 import org.junit.jupiter.api.Assertions;
@@ -29,16 +28,16 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import com.inteligr8.alfresco.acs.model.Node;
 import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartJersey;
+import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
-public class JerseyUploadIT extends UploadIT {
+@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
+public class CxfUploadIT extends UploadIT {
 	
 	@Autowired
-	@Qualifier("acs.api.jersey")
-	private AcsPublicRestApiJerseyImpl api;
+	@Qualifier("acs.api.cxf")
+	private AcsPublicRestApiCxfImpl api;
 	
 	@Override
 	public AcsPublicRestApi getApi() {
@@ -52,14 +51,14 @@ public class JerseyUploadIT extends UploadIT {
 	
 	@Test
 	@EnabledIf("hostExists")
-	public void uploadFile() throws IOException, ParseException {
+	public void uploadFile() throws IOException {
 		String folderNodeId = this.getSharedFolder();
 		
 		NodeBodyCreate nodeBody = new NodeBodyCreate().nodeType("trx:transferReport").name("test-name1.txt")
 				.properties(Collections.singletonMap("cm:author", "Brian"));
 		
 		ByteArrayInputStream istream = new ByteArrayInputStream("This is a test".getBytes());
-		NodeBodyCreateMultipartJersey body = NodeBodyCreateMultipartJersey.from(nodeBody, "test-name2.txt", istream, true, null, null);
+		NodeBodyCreateMultipartCxf body = NodeBodyCreateMultipartCxf.from(nodeBody, "test-name2.txt", istream, true, null, null);
 		
 		Node newNode = this.api.getNodesExtApi().createNode(folderNodeId, body).getEntry();
 		Assertions.assertNotNull(newNode);

src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java

@@ -17,7 +17,7 @@ package com.inteligr8.alfresco.acs;
 import java.util.List;
 import java.util.UUID;
 
-import javax.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotFoundException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder

@@ -1 +0,0 @@
-org.glassfish.jersey.client.JerseyClientBuilder

src/test/resources/log4j2.properties

@@ -1,17 +1,17 @@
-rootLogger.level=trace
+rootLogger.level=info
 rootLogger.appenderRef.stdout.ref=STDOUT
 
 logger.spring.name=org.springframework
 logger.spring.level=info
 
 logger.common-rest-api.name=com.inteligr8.rs
-logger.common-rest-api.level=trace
+logger.common-rest-api.level=info
 
 logger.this.name=com.inteligr8.alfresco.acs
-logger.this.level=trace
+logger.this.level=info
 
 logger.jaxrslog.name=jaxrs.request
-logger.jaxrslog.level=trace
+logger.jaxrslog.level=info
 
 appender.stdout.type=Console
 appender.stdout.name=STDOUT