Merge branch 'develop' into stable

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-client</artifactId>
-	<version>2.0.4</version>
+	<version>3.0.0</version>
 
 	<name>Alfresco Process Services ReST API Client for Java</name>
 	<description>An APS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
@@ -38,24 +38,25 @@
 
 	<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>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.3.6</spring.version>
+		<junit.version>5.10.0</junit.version>
+		<spring.version>6.0.19</spring.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.2</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>aps-public-rest-api</artifactId>
-			<version>2.0.8</version>
+			<version>3.0.0</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -79,7 +80,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.19.0</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java

@@ -61,6 +61,12 @@ public abstract class ApsClientConfiguration implements ClientConfiguration {
 	@Value("${process.service.security.oauth.grantPassword:#{null}}")
 	private String oAuthPassword;
 
+    @Value("${process.service.http.connectTimeout:#{null}}")
+    private Integer connectTimeoutInMillis;
+
+    @Value("${process.service.http.responseTimeout:#{null}}")
+    private Integer responseTimeoutInMillis;
+
 	public String getBaseUrl() {
 		return this.baseUrl;
 	}
@@ -149,4 +155,22 @@ public abstract class ApsClientConfiguration implements ClientConfiguration {
 		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;
+    }
+
 }