Merge branch 'develop-jersey' into stable-jersey

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-client</artifactId>
-	<version>2.0.1-jersey</version>
+	<version>3.0.0-jersey</version>
 	
 	<name>Alfresco Content Services ReST API Client for Java</name>
 	<description>An ACS Client library for building Jersey-based REST API clients</description>
@@ -39,27 +39,29 @@
 
 	<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>
+		<acs.platform.tag>acs23</acs.platform.tag>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.2.14.RELEASE</spring.version>
-		<jersey.version>2.35</jersey.version>
+		<junit.version>5.10.0</junit.version>
+		<spring.version>6.0.19</spring.version>
+		<jersey.version>3.1.8</jersey.version>
+		<jackson.version>2.17.2</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.1-jersey</version>
+			<version>3.0.0-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>acs-public-rest-api</artifactId>
-			<version>2.0.1-${acs.platform.tag}</version>
+			<version>3.0.0-${acs.platform.tag}</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -77,13 +79,13 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.9</version>
+			<version>4.5.14</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.17.2</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -92,13 +94,19 @@
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
 			<version>${jersey.version}</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
 			<version>${jersey.version}</version>
-			<scope>test</scope>
+		</dependency>
+		
+		<!-- Jersey library fallout -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
 		</dependency>
 	</dependencies>
 	
@@ -131,7 +139,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>
@@ -142,7 +150,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>

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/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/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