Merge branch 'stable' into stable-cxf

pom.xml

@@ -5,11 +5,11 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-client</artifactId>
-	<version>2.0.4-cxf</version>
-	
+	<version>3.0.3-cxf</version>
+
 	<name>Alfresco Process Services ReST API Client for Java</name>
 	<description>An APS Client library for building CXF-based REST API clients</description>
-	<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
+	<url>https://git.inteligr8.com/inteligr8/aps-public-rest-client</url>
 
 	<licenses>
 		<license>
@@ -19,9 +19,9 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:https://bitbucket.org/inteligr8/aps-public-rest-client.git</connection>
-		<developerConnection>scm:git:git@bitbucket.org:inteligr8/aps-public-rest-client.git</developerConnection>
-		<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
+		<connection>scm:git:https://git.inteligr8.com/inteligr8/aps-public-rest-client.git</connection>
+		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/aps-public-rest-client.git</developerConnection>
+		<url>https://git.inteligr8.com/inteligr8/aps-public-rest-client</url>
 	</scm>
 	<organization>
 		<name>Inteligr8</name>
@@ -38,31 +38,30 @@
 
 	<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.debuglevel>lines,vars,source</maven.compiler.debuglevel>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.3.6</spring.version>
-		<cxf.version>3.5.6</cxf.version>
+		<spring.version>6.2.18</spring.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.2-cxf</version>
+			<version>3.0.4-cxf</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>aps-public-rest-api</artifactId>
-			<version>2.0.8</version>
+			<version>3.1.0</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>
@@ -80,25 +79,33 @@
 		<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>
-		
-		<!-- Apache CXF libraries -->
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-			<scope>provided</scope>
-		</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>
@@ -120,34 +127,12 @@
 					</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>
@@ -165,7 +150,6 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>javadoc</id>
@@ -189,19 +173,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/activiti/ApsProtectedRestApiCxfImpl.java

@@ -0,0 +1,39 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the Apache CXF client to the JAX-RS API for the Activiti
+ * & APS public ReST APIs and some non-public APS ReST APIs.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("aps.protected-api.cxf")
+@Lazy
+public class ApsProtectedRestApiCxfImpl extends ApsProtectedRestApiImpl implements ApsProtectedRestCxfApi {
+
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public ApsProtectedRestApiCxfImpl(ApsClientCxfImpl client) {
+		super(client);
+	}
+
+}

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;
 	}
@@ -148,5 +154,23 @@ public abstract class ApsClientConfiguration 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/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApiImpl.java

@@ -0,0 +1,41 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.rs.Client;
+
+/**
+ * This class serves as the entrypoint to the JAX-RS API for the APS Public
+ * ReST API.
+ * 
+ * @author brian@inteligr8.com
+ */
+public class ApsProtectedRestApiImpl implements ApsProtectedRestApi {
+	
+	private Client client;
+	
+	public ApsProtectedRestApiImpl(Client client) {
+		this.client = client;
+	}
+	
+	public Client getClient() {
+		return this.client;
+	}
+	
+	public final <T> T getApi(Class<T> apiClass) {
+		return this.client.getApi(apiClass);
+	}
+
+}